Merge pull request #707 from abhishek-webkul/update-demo-data

Remove demo data creation if 'Install demo data' is set to 'No' during installation

Author: rohit053

controllers/admin/AdminStatsController.php

@@ -1686,8 +1686,8 @@ public static function getDirectRevenueRatio($dateFrom, $dateTo, $idHotel = null
             WHERE o.`valid` = 1 AND hbi.`active` = 1 AND hbd.`is_refunded` = 0
             AND o.`invoice_date` BETWEEN "'.pSQL($dateFrom).' 00:00:00" AND "'.pSQL($dateTo).' 23:59:59"
             AND o.`source` = "'.pSQL(Configuration::get('PS_SHOP_DOMAIN')).'"'.
-            (!is_null($idHotel) ? HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') : '').
-            'GROUP BY o.`id_order`
+            (!is_null($idHotel) ? HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') : '').'
+            GROUP BY o.`id_order`
         ) AS t';
         $directRevenue = (float) Db::getInstance()->getValue($sql);
 

modules/blocknavigationmenu/blocknavigationmenu.php

@@ -112,7 +112,7 @@ public function install()
             || !$this->callInstallTab()
             || !$this->registerModuleHooks()
             || !Configuration::updateValue('WK_SHOW_FOOTER_NAVIGATION_BLOCK', 1)
-            || !$objCustomNavigationLink->insertDemoData()
+            || !$objCustomNavigationLink->insertDemoData(isset($this->populateData) ? $this->populateData : null)
         ) {
             return false;
         }

modules/blocknavigationmenu/classes/WkCustomNavigationLink.php

@@ -147,7 +147,7 @@ public function cleanPositions()
         return (bool) Db::getInstance()->execute($sql);
     }
 
-    public function insertDemoData($qloInstallData = 0)
+    public function insertDemoData($populateData = null)
     {
         //insert home link to the list
         $languages = Language::getLanguages(false);
@@ -166,8 +166,8 @@ public function insertDemoData($qloInstallData = 0)
 
         // enter modules links
         $modsElems = array();
-        if ($qloInstallData) {
-            // if module is installing or resetting
+        // if module is installing or resetting
+        if (is_null($populateData)) {
             if (Module::isEnabled('wkabouthotelblock')) {
                 $modsElems['Interior'] = 'hotelInteriorBlock';
             }
@@ -181,12 +181,15 @@ public function insertDemoData($qloInstallData = 0)
                 $modsElems['Testimonials'] = 'hotelTestimonialBlock';
             }
         } else {
-            // if QloApps is installing then enter modules links directly
-            $modsElems['Interior'] = 'hotelInteriorBlock';
-            $modsElems['Amenities'] = 'hotelAmenitiesBlock';
-            $modsElems['Rooms'] = 'hotelRoomsBlock';
-            $modsElems['Testimonials'] = 'hotelTestimonialBlock';
+            // if QloApps is installing and $populateData = 1 then enter modules links directly
+            if ($populateData) {
+                $modsElems['Interior'] = 'hotelInteriorBlock';
+                $modsElems['Amenities'] = 'hotelAmenitiesBlock';
+                $modsElems['Rooms'] = 'hotelRoomsBlock';
+                $modsElems['Testimonials'] = 'hotelTestimonialBlock';
+            }
         }
+
         if ($modsElems) {
             $indexLink = Context::getContext()->shop->getBaseURI();
             foreach ($modsElems as $name => $modElm) {

modules/hotelreservationsystem/hotelreservationsystem.php

@@ -598,16 +598,15 @@ public function install()
             || !$this->registerModuleHooks()
             || !$this->callInstallTab()
             || !$objHtlHelper->insertDefaultHotelEntries()
+            || !$objHtlHelper->createHotelRoomDefaultFeatures()
+            || !$objHtlHelper->insertHotelCommonFeatures()
         ) {
             return false;
         }
 
         // if module should be populated while installation
         if (isset($this->populateData) && $this->populateData) {
-            if (!$objHtlHelper->createHotelRoomDefaultFeatures()
-                || !$objHtlHelper->insertHotelCommonFeatures()
-                || !$objHtlHelper->createDummyDataForProject()
-            ) {
+            if (!$objHtlHelper->createDummyDataForProject()) {
                 return false;
             }
         }

modules/wkabouthotelblock/classes/WkHotelInteriorImage.php

@@ -145,7 +145,6 @@ public function insertModuleDemoData()
             $HOTEL_INTERIOR_HEADING[$lang['id_lang']] = 'Interior';
             $HOTEL_INTERIOR_DESCRIPTION[$lang['id_lang']] = 'Families travelling with kids will find Amboseli national park a safari destination matched to no other, with less tourist traffic, breathtaking open space.';
         }
-        Configuration::updateValue('HOTEL_INTERIOR_BLOCK_NAV_LINK', 1);
         // update global configuration values in multilang
         Configuration::updateValue('HOTEL_INTERIOR_HEADING', $HOTEL_INTERIOR_HEADING);
         Configuration::updateValue('HOTEL_INTERIOR_DESCRIPTION', $HOTEL_INTERIOR_DESCRIPTION);

modules/wkabouthotelblock/controllers/admin/AdminAboutHotelBlockSettingController.php

@@ -36,14 +36,6 @@ public function __construct()
                 'title' =>  $this->l('Hotel Interior Description'),
                 'icon' =>   'icon-cogs',
                 'fields' => array(
-                    'HOTEL_INTERIOR_BLOCK_NAV_LINK' => array(
-                        'title' => $this->l('Show link at navigation'),
-                        'hint' => $this->l('Enable, if you want to display a link at navigation menu for the interior block at home page.'),
-                        'validation' => 'isBool',
-                        'cast' => 'intval',
-                        'type' => 'bool',
-                        'required' => true
-                    ),
                     'HOTEL_INTERIOR_HEADING' => array(
                         'title' => $this->l('Interior Block Title'),
                         'type' => 'textLang',

modules/wkabouthotelblock/wkabouthotelblock.php

@@ -85,15 +85,24 @@ public function hookActionObjectLanguageAddAfter($params)
     public function install()
     {
         $objAboutHotelBlockDb = new WkAboutHotelBlockDb();
-        $objHtlInteriorImg = new WkHotelInteriorImage();
         if (!parent::install()
             || !$objAboutHotelBlockDb->createTables()
             || !$this->registerModuleHooks()
             || !$this->callInstallTab()
-            || !$objHtlInteriorImg->insertModuleDemoData()
         ) {
             return false;
         }
+
+        // if module should create demo data during installation
+        if (isset($this->populateData) && $this->populateData) {
+            $objHtlInteriorImg = new WkHotelInteriorImage();
+            if (!$objHtlInteriorImg->insertModuleDemoData()) {
+                return false;
+            }
+        } else {
+            Tools::deleteDirectory($this->local_path.'views/img/dummy_img');
+        }
+
         return true;
     }
 

modules/wkhotelfeaturesblock/classes/WkHotelFeaturesData.php

@@ -138,8 +138,6 @@ public function cleanPositions()
     // enter the default demo data of the module
     public function insertModuleDemoData()
     {
-        Configuration::updateValue('HOTEL_AMENITIES_BLOCK_NAV_LINK', 1);
-
         $languages = Language::getLanguages(false);
         $HOTEL_AMENITIES_HEADING = array();
         $HOTEL_AMENITIES_DESCRIPTION = array();

modules/wkhotelfeaturesblock/controllers/admin/AdminFeaturesModuleSettingController.php

@@ -42,14 +42,6 @@ public function __construct()
                 'title' =>    $this->l('Hotel Amenity Setting'),
                 'icon' =>   'icon-cogs',
                 'fields' =>    array(
-                    'HOTEL_AMENITIES_BLOCK_NAV_LINK' => array(
-                        'title' => $this->l('Show link at navigation'),
-                        'hint' => $this->l('Enable, if you want to display a link at navigation menu for the amenities block at home page.'),
-                        'validation' => 'isBool',
-                        'cast' => 'intval',
-                        'type' => 'bool',
-                        'required' => true
-                    ),
                     'HOTEL_AMENITIES_HEADING' => array(
                         'title' => $this->l('Amenity Block Title'),
                         'type' => 'textLang',