Merge pull request #206 from sumitwebkul/gli-496

Removed Other Modules setting from admin Hotel Reservation System -> Settings
Qloapps · Feb 4, 2021 · 2fbd86f · 2fbd86f
2 parents c091a4b + c7b9198
commit 2fbd86f
Show file tree

Hide file tree

Showing 5 changed files with 123 additions and 56 deletions.
diff --git a/...les/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php b/...les/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php
@@ -27,7 +27,6 @@ public function renderView()
             'feature_price_setting_link' => $this->context->link->getAdminLink('AdminHotelFeaturePricesSettings'),
             'general_setting_link' => $this->context->link->getAdminLink('AdminHotelGeneralSettings'),
             'order_restrict_setting_link' => $this->context->link->getAdminLink('AdminOrderRestrictSettings'),
-            'other_module_setting_link' => $this->context->link->getAdminLink('AdminOtherHotelModulesSetting'),
             'additional_demand_setting_link' => $this->context->link->getAdminLink('AdminRoomTypeGlobalDemand'),
         );
         // Reviews setting link if only productcomment module is enabled

diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOtherHotelModulesSettingController.php b/modules/hotelreservationsystem/controllers/admin/AdminOtherHotelModulesSettingController.php
diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php
@@ -597,7 +597,6 @@ public function callInstallTab()
         //Controllers which are to be used in this modules but we have not to create tab for those ontrollers...
         $this->installTab('AdminOrderRestrictSettings', 'order restrict configuration', false, false);
         $this->installTab('AdminHotelGeneralSettings', 'Hotel General configuration', false, false);
-        $this->installTab('AdminOtherHotelModulesSetting', 'other hotel configuration', false, false);
         $this->installTab('AdminHotelFeaturePricesSettings', 'feature pricing configuration', false, false);
         $this->installTab('AdminRoomTypeGlobalDemand', 'Additional demand configuration', false, false);
         $this->installTab('AdminAssignHotelFeatures', 'Assign Hotel Features', false, false);

diff --git a/...reservationsystem/views/templates/admin/hotel_configuration_setting/helpers/view/view.tpl b/...reservationsystem/views/templates/admin/hotel_configuration_setting/helpers/view/view.tpl
@@ -31,15 +31,6 @@
 				<i class="icon-question-circle"></i>
 			</a>
 		</div>
-		<div class="btn-group setting-link-div col-sm-3 col-xs-12">
-			<a type="button" href="{$other_module_setting_link}" class="setting-link btn btn-default col-sm-10 col-xs-10">
-				<span class="col-sm-2 col-xs-2"><i class="icon-support"></i></span>
-				<span class="setting-title col-sm-10 col-xs-10">{l s='Other Modules' mod='hotelreservationsystem'}</span>
-			</a>
-			<a tabindex="0" class="btn btn-default col-sm-2 col-xs-2" role="button" data-toggle="popover" data-trigger="focus" title="{l s='Other Modules Settings' mod='hotelreservationsystem'}" data-content="{l s='Configure here settings of other modules of the software.' mod='hotelreservationsystem'}" data-placement="bottom">
-				<i class="icon-question-circle"></i>
-			</a>
-		</div>
 		<!-- Setting to set prices for date range -->
 		<div class="btn-group setting-link-div col-sm-3 col-xs-12">
 			<a type="button" href="{$feature_price_setting_link}" class="setting-link btn btn-default col-sm-10 col-xs-10">

diff --git a/modules/wkhotelfilterblock/wkhotelfilterblock.php b/modules/wkhotelfilterblock/wkhotelfilterblock.php
@@ -42,52 +42,143 @@ public function __construct()
         $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_);
     }
 
-    public function install()
+    public function getContent()
     {
-        if (!parent::install()
-            || !$this->registerHook('header')
-            || !$this->registerHook('addOtherModuleSetting')
-            || !$this->registerHook('displayLeftColumn')) {
-            return false;
+        if (Tools::isSubmit('btnConfigSubmit')) {
+            $this->postProcess();
+        } else {
+            $this->html .= '<br />';
         }
 
-        //set default config variable
-        Configuration::updateValue('SHOW_RATTING_FILTER', 1);
-        Configuration::updateValue('SHOW_AMENITIES_FILTER', 1);
-        Configuration::updateValue('SHOW_PRICE_FILTER', 1);
+        $this->html .= $this->renderForm();
 
-        return true;
+        return $this->html;
     }
 
-    public function hookAddOtherModuleSetting($params)
+    public function renderForm()
     {
-        $params['fields_options']['categoryfiltersetting'] = array(
-            'title' => $this->l('Category Filter Configuration'),
-            'fields' => array(
-                'SHOW_RATTING_FILTER' => array(
-                    'title' => $this->l('Show Guest Rating Filter'),
+        $fields_form = array();
+        $fields_form['form'] = array(
+            'legend' => array(
+                'icon' => 'icon-cog',
+                'title' => $this->l('Search Results Filter Configuration'),
+            ),
+            'input' => array(
+                array(
+                    'type' => 'switch',
+                    'label' => $this->l('Show Guest Rating Filter'),
+                    'name' => 'SHOW_RATTING_FILTER',
+                    'is_bool' => true,
+                    'values' => array(
+                        array(
+                            'id' => 'active_on',
+                            'value' => 1,
+                        ),
+                        array(
+                            'id' => 'active_off',
+                            'value' => 0,
+                        ),
+                    ),
                     'hint' => $this->l('If yes, it will display Guest Rating Filter.'),
-                    'validation' => 'isBool',
-                    'cast' => 'intval',
-                    'type' => 'bool',
                 ),
-                'SHOW_AMENITIES_FILTER' => array(
-                    'title' => $this->l('Show Amenities Filter'),
+                array(
+                    'type' => 'switch',
+                    'label' => $this->l('Show Amenities Filter'),
+                    'name' => 'SHOW_AMENITIES_FILTER',
+                    'is_bool' => true,
+                    'values' => array(
+                        array(
+                            'id' => 'active_on',
+                            'value' => 1,
+                        ),
+                        array(
+                            'id' => 'active_off',
+                            'value' => 0,
+                        ),
+                    ),
                     'hint' => $this->l('If yes, it will display Amenities Filter.'),
-                    'validation' => 'isBool',
-                    'cast' => 'intval',
-                    'type' => 'bool',
                 ),
-                'SHOW_PRICE_FILTER' => array(
-                    'title' => $this->l('Show Price Filter'),
-                    'hint' => $this->l('If yes, it will display Price Filter.'),
-                    'validation' => 'isBool',
-                    'cast' => 'intval',
-                    'type' => 'bool',
+                array(
+                    'type' => 'switch',
+                    'label' => $this->l('Show Price Filter'),
+                    'name' => 'SHOW_PRICE_FILTER',
+                    'is_bool' => true,
+                    'values' => array(
+                        array(
+                            'id' => 'active_on',
+                            'value' => 1,
+                        ),
+                        array(
+                            'id' => 'active_off',
+                            'value' => 0,
+                        ),
+                    ),
+                    'hint' => $this->l('If yes, it will display price Filter.'),
                 ),
             ),
-            'submit' => array('title' => $this->l('Save')),
+            'submit' => array(
+                'title' => $this->l('Save'),
+                'name' => 'submit_conf_filter',
+            ),
+        );
+
+        $helper = new HelperForm();
+        $helper->show_toolbar = false;
+        $helper->table = $this->table;
+        $lang = new Language((int) Configuration::get('PS_LANG_DEFAULT'));
+        $helper->default_form_language = $lang->id;
+        $this->fields_form = array();
+        $helper->identifier = $this->identifier;
+        $helper->submit_action = 'btnConfigSubmit';
+        $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).
+        '&configure='.$this->name.'&module_name='.$this->name;
+        $helper->token = Tools::getAdminTokenLite('AdminModules');
+
+        $helper->tpl_vars = array(
+            'fields_value' => $this->getConfigFieldsValues(),
+            'languages' => $this->context->controller->getLanguages(),
+            'id_language' => $this->context->language->id,
         );
+
+        return $helper->generateForm(array($fields_form));
+    }
+
+    public function postProcess()
+    {
+        if (Tools::isSubmit('btnConfigSubmit')) {
+            Configuration::updateValue(
+                'SHOW_RATTING_FILTER',
+                Tools::getValue('SHOW_RATTING_FILTER')
+            );
+            Configuration::updateValue(
+                'SHOW_AMENITIES_FILTER',
+                Tools::getValue('SHOW_AMENITIES_FILTER')
+            );
+            Configuration::updateValue('SHOW_PRICE_FILTER', Tools::getValue('SHOW_PRICE_FILTER'));
+
+            // redirect after saving the configuration
+            Tools::redirectAdmin(
+                $this->context->link->getAdminLink('AdminModules').'&configure='.$this->name.'&tab_module='.$this->tab.
+                '&module_name='.$this->name.'&conf=4'
+            );
+        }
+    }
+
+    public function install()
+    {
+        if (!parent::install()
+            || !$this->registerHook('header')
+            || !$this->registerHook('addOtherModuleSetting')
+            || !$this->registerHook('displayLeftColumn')) {
+            return false;
+        }
+
+        //set default config variable`
+        Configuration::updateValue('SHOW_RATTING_FILTER', 1);
+        Configuration::updateValue('SHOW_AMENITIES_FILTER', 1);
+        Configuration::updateValue('SHOW_PRICE_FILTER', 1);
+
+        return true;
     }
 
     public function hookHeader()