Added: new configuration for the dimension unit in for the bed types, revert the changes for the ps dimension unit

2025-06-14 11:19:33 +05:30
parent dd1da52836
commit 889d6b1301
40 changed files with 112 additions and 61 deletions
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -436,7 +436,7 @@ class ProductControllerCore extends FrontController
                            'PS_SERVICE_PRODUCT_CATEGORY_FILTER' => Configuration::get('PS_SERVICE_PRODUCT_CATEGORY_FILTER'),
                            'bed_types_info' => $bedTypes,
                            'selected_bed_types' => $selectedBedTypes,
-                            'dimension_unit' => Configuration::get('PS_DIMENSION_UNIT'),
+                            'dimension_unit' => Configuration::get('WK_DIMENSION_UNIT', $this->context->language->id),
                        )
                    );

--- a/localization/ae.xml
+++ b/localization/ae.xml
@@ -11,7 +11,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/be.xml
+++ b/localization/be.xml
@@ -223,7 +223,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/bg.xml
+++ b/localization/bg.xml
@@ -190,7 +190,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/by.xml
+++ b/localization/by.xml
@@ -23,7 +23,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/cy.xml
+++ b/localization/cy.xml
@@ -192,7 +192,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/cz.xml
+++ b/localization/cz.xml
@@ -131,7 +131,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/de.xml
+++ b/localization/de.xml
@@ -190,7 +190,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/ee.xml
+++ b/localization/ee.xml
@@ -190,7 +190,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/es.xml
+++ b/localization/es.xml
@@ -223,7 +223,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/fi.xml
+++ b/localization/fi.xml
@@ -221,7 +221,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/fr.xml
+++ b/localization/fr.xml
@@ -201,7 +201,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/gb.xml
+++ b/localization/gb.xml
@@ -130,7 +130,7 @@
  <units>
    <unit type="weight" value="Kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="mi"/>
  </units>
--- a/localization/gr.xml
+++ b/localization/gr.xml
@@ -254,7 +254,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/hr.xml
+++ b/localization/hr.xml
@@ -161,7 +161,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/hu.xml
+++ b/localization/hu.xml
@@ -221,7 +221,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/ie.xml
+++ b/localization/ie.xml
@@ -192,7 +192,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/it.xml
+++ b/localization/it.xml
@@ -333,7 +333,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/ke.xml
+++ b/localization/ke.xml
@@ -19,7 +19,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/lt.xml
+++ b/localization/lt.xml
@@ -221,7 +221,7 @@
 	<units>
 		<unit type="weight" value="kg"/>
 		<unit type="volume" value="L"/>
-		<unit type="short_distance" value="ft"/>
+		<unit type="short_distance" value="cm"/>
 		<unit type="base_distance" value="m"/>
 		<unit type="long_distance" value="km"/>
 	</units>
--- a/localization/lu.xml
+++ b/localization/lu.xml
@@ -253,7 +253,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/lv.xml
+++ b/localization/lv.xml
@@ -190,7 +190,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/mt.xml
+++ b/localization/mt.xml
@@ -160,7 +160,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/my.xml
+++ b/localization/my.xml
@@ -41,7 +41,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/ng.xml
+++ b/localization/ng.xml
@@ -19,7 +19,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/nl.xml
+++ b/localization/nl.xml
@@ -190,7 +190,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/pa.xml
+++ b/localization/pa.xml
@@ -19,7 +19,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/pe.xml
+++ b/localization/pe.xml
@@ -17,7 +17,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/ph.xml
+++ b/localization/ph.xml
@@ -19,7 +19,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/pl.xml
+++ b/localization/pl.xml
@@ -190,7 +190,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/pt.xml
+++ b/localization/pt.xml
@@ -221,7 +221,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/ro.xml
+++ b/localization/ro.xml
@@ -265,7 +265,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/rs.xml
+++ b/localization/rs.xml
@@ -10,7 +10,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/se.xml
+++ b/localization/se.xml
@@ -161,7 +161,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/sg.xml
+++ b/localization/sg.xml
@@ -18,7 +18,7 @@
 	<units>
 		<unit type="weight" value="kg"/>
 	    <unit type="volume" value="L"/>
-	    <unit type="short_distance" value="ft"/>
+	    <unit type="short_distance" value="cm"/>
 	    <unit type="base_distance" value="m"/>
 	    <unit type="long_distance" value="km"/>
 	</units>
--- a/localization/si.xml
+++ b/localization/si.xml
@@ -190,7 +190,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/sk.xml
+++ b/localization/sk.xml
@@ -190,7 +190,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="l"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/localization/tn.xml
+++ b/localization/tn.xml
@@ -16,7 +16,7 @@
  <units>
    <unit type="weight" value="kg"/>
    <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
    <unit type="base_distance" value="m"/>
    <unit type="long_distance" value="km"/>
  </units>
--- a/modules/hotelreservationsystem/classes/HotelHelper.php
+++ b/modules/hotelreservationsystem/classes/HotelHelper.php
@@ -1094,16 +1094,26 @@ class HotelHelper
            'ru' => 'Мы предлагаем элегантные номера, изысканную кухню и внимательное обслуживание для незабываемого отдыха.',
            'es' => 'Ofrecemos habitaciones elegantes, comidas gourmet y un servicio atento para una estadía inolvidable.',
        );
-
+        $defaultDimensionUnitLang = array(
+            'en' => 'ft',
+            'nl' => 'ft',
+            'fr' => 'pi',
+            'de' => 'ft',
+            'ru' => 'фут',
+            'es' => 'ft',
+        );
        $WK_HTL_CHAIN_NAME = array();
        $WK_HTL_TAG_LINE = array();
        $WK_HTL_SHORT_DESC = array();
+        $defaultDimensionUnit = array();
        foreach ($languages as $lang) {
            if (isset($htlTagLineLang[$lang['iso_code']])) {
                $WK_HTL_TAG_LINE[$lang['id_lang']] = $htlTagLineLang[$lang['iso_code']];
                $WK_HTL_SHORT_DESC[$lang['id_lang']] = $htlShortDescLang[$lang['iso_code']];
                $WK_HTL_CHAIN_NAME[$lang['id_lang']] = $homeBannerTitleLang[$lang['iso_code']];
+                $defaultDimensionUnit[$lang['id_lang']] = $defaultDimensionUnitLang[$lang['iso_code']];
            } else {
+                $defaultDimensionUnit[$lang['id_lang']] = $defaultDimensionUnitLang['en'];
                $WK_HTL_CHAIN_NAME[$lang['id_lang']] = $homeBannerTitleLang['en'];
                $WK_HTL_TAG_LINE[$lang['id_lang']] = $htlTagLineLang['en'];
                $WK_HTL_SHORT_DESC[$lang['id_lang']] = $htlShortDescLang['en'];
@@ -1113,6 +1123,7 @@ class HotelHelper
        Configuration::updateValue('WK_HTL_CHAIN_NAME', $WK_HTL_CHAIN_NAME);
        Configuration::updateValue('WK_HTL_TAG_LINE', $WK_HTL_TAG_LINE);
        Configuration::updateValue('WK_HTL_SHORT_DESC', $WK_HTL_SHORT_DESC);
+        Configuration::updateValue('WK_DIMENSION_UNIT', $defaultDimensionUnit);

        // Search Fields
        Configuration::updateValue('PS_FRONT_SEARCH_TYPE', HotelBookingDetail::SEARCH_TYPE_OWS);
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelBedTypesController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelBedTypesController.php
@@ -35,24 +35,22 @@ class AdminHotelBedTypesController extends ModuleAdminController
        parent::__construct();

        $this->_new_list_header_design = true;
-        $this->fields_list = array(
-            'id_bed_type' => array(
-                'title' => $this->l('ID'),
-                'align' => 'center',
-            ),
-            'name' => array(
-                'title' => $this->l('Name'),
-                'align' => 'center',
-            ),
-            'width' => array(
-                'title' => $this->l('Width'),
-                'align' => 'center',
-                'suffix' => Configuration::get('PS_DIMENSION_UNIT')
-            ),
-            'length' => array(
-                'title' => $this->l('Lenght'),
-                'align' => 'center',
-                'suffix' => Configuration::get('PS_DIMENSION_UNIT')
+         // field options for global fields
+        $this->fields_options = array(
+            'global' => array(
+                'title' => $this->l('Dimension Unit Setting'),
+                'icon' => 'icon-cogs',
+                'fields' => array(
+                    'WK_DIMENSION_UNIT' => array(
+                        'title' => $this->l('Dimension Unit'),
+                        'type' => 'textLang',
+                        'lang' => true,
+                        'required' => true,
+                        'validation' => 'isGenericName',
+                        'hint' => $this->l('Enter a dimension unit for the bed types.')
+                    ),
+                ),
+                'submit' => array('title' => $this->l('Save'))
            ),
        );

@@ -67,6 +65,17 @@ class AdminHotelBedTypesController extends ModuleAdminController
        );
    }

+    public function initContent()
+    {
+        parent::initContent();
+        // to customize the view as per our requirements
+        if ($this->display != 'add' && $this->display != 'edit') {
+            $this->content = $this->renderOptions();
+            $this->content .= $this->renderList();
+            $this->context->smarty->assign('content', $this->content);
+        }
+    }
+
    public function initPageHeaderToolbar()
    {
        if (!$this->display || $this->display == 'list') {
@@ -80,6 +89,37 @@ class AdminHotelBedTypesController extends ModuleAdminController
        parent::initPageHeaderToolbar();
    }

+    public function initToolbar()
+    {
+        $this->toolbar_btn = array();
+    }
+
+    public function renderList()
+    {
+        // added here instead of the constructor since the dimension unit will be update in post processs.
+        $this->fields_list = array(
+            'id_bed_type' => array(
+                'title' => $this->l('ID'),
+                'align' => 'center',
+            ),
+            'name' => array(
+                'title' => $this->l('Name'),
+                'align' => 'center',
+            ),
+            'width' => array(
+                'title' => $this->l('Width'),
+                'align' => 'center',
+                'suffix' => Configuration::get('WK_DIMENSION_UNIT', $this->context->language->id)
+            ),
+            'length' => array(
+                'title' => $this->l('Lenght'),
+                'align' => 'center',
+                'suffix' => Configuration::get('WK_DIMENSION_UNIT', $this->context->language->id)
+            ),
+        );
+        return parent::renderList();
+    }
+
    public function renderForm()
    {
        if (!$this->loadObject(true)) {
@@ -107,8 +147,8 @@ class AdminHotelBedTypesController extends ModuleAdminController
                    'name' => 'width',
                    'required' => true,
                    'col' => 4,
-                    'hint' => $this->l('Enter the width of the Bed type in ').Configuration::get('PS_DIMENSION_UNIT'),
-                    'suffix' => Configuration::get('PS_DIMENSION_UNIT'),
+                    'hint' => $this->l('Enter the width of the Bed type in ').Configuration::get('WK_DIMENSION_UNIT', $this->context->language->id),
+                    'suffix' => Configuration::get('WK_DIMENSION_UNIT', $this->context->language->id),
                ),
                array(
                    'type' => 'text',
@@ -116,8 +156,8 @@ class AdminHotelBedTypesController extends ModuleAdminController
                    'name' => 'length',
                    'col' => 4,
                    'required' => true,
-                    'hint' => $this->l('Enter the length of the Bed type in ').Configuration::get('PS_DIMENSION_UNIT'),
-                    'suffix' => Configuration::get('PS_DIMENSION_UNIT'),
+                    'hint' => $this->l('Enter the length of the Bed type in ').Configuration::get('WK_DIMENSION_UNIT', $this->context->language->id),
+                    'suffix' => Configuration::get('WK_DIMENSION_UNIT', $this->context->language->id),
                ),
            ),
            'submit' => array(