From e20942fd5988c500c4b2e8968781b74ca7b0072e Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 18 Sep 2024 12:19:27 +0530 Subject: [PATCH 01/20] Fixed: the issues in AdmiNormalProducts caused by hotels-tree --- .../default/template/helpers/tree/tree.tpl | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/admin/themes/default/template/helpers/tree/tree.tpl b/admin/themes/default/template/helpers/tree/tree.tpl index 1eab06591..8c7234244 100644 --- a/admin/themes/default/template/helpers/tree/tree.tpl +++ b/admin/themes/default/template/helpers/tree/tree.tpl @@ -64,7 +64,7 @@ {/if} {if isset($use_search) && $use_search == true} $("#{$id|escape:'html':'UTF-8'}-search").bind("typeahead:selected", function(obj, datum) { - $("#{$id|escape:'html':'UTF-8'}").find(":input").each( + $("#{$id|escape:'html':'UTF-8'}").find('[name="'+datum.input_name + '[]"]:input').each( function() { if ($(this).val() == datum.value) @@ -78,6 +78,15 @@ $(this).show(); $(this).prev().find('.icon-folder-close').removeClass('icon-folder-close').addClass('icon-folder-open'); }); + + {if isset($auto_select_children) && $auto_select_children == true} + if ($(this).closest('.tree-item').length == 0) { + $(this).closest('.tree-folder').find(':input[type=checkbox]').each(function(){ + $(this).prop('checked', true); + $(this).parent().addClass('tree-selected'); + }); + } + {/if} } } ); @@ -86,7 +95,7 @@ {if isset($auto_select_children) && $auto_select_children == true} $('#{$id|escape:'html':'UTF-8'}').find(':input[type=checkbox]').on('click', function(){ - if ($(this).closest('.tree-item').length ==0) { + if ($(this).closest('.tree-item').length == 0) { if ($(this).is(":checked")) { $(this).closest('.tree-folder').find(':input[type=checkbox]').each(function(){ $(this).prop('checked', true); @@ -111,9 +120,13 @@ }); {/if} - $(document).ready(function () { - var tree = $("#{$id|escape:'html':'UTF-8'}").tree('collapseAll'); + function startTree() { + if (typeof $.fn.tree === 'undefined') { + setTimeout(startTree, 100); + return; + } + var tree = $("#{$id|escape:'html':'UTF-8'}").tree('collapseAll'); if ($("#{$id|escape:'html':'UTF-8'}").find(":input:checked").length > 1) $('#expand-all-{$id|escape:'html':'UTF-8'}').hide(); @@ -127,6 +140,10 @@ $(this).prev().find('.icon-folder-close').removeClass('icon-folder-close').addClass('icon-folder-open'); }); }); + } + + $(document).ready(function () { + startTree(); }); {/block} \ No newline at end of file From fff499a10eda84bb5e9d488fa07558681f6082be Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 24 Sep 2024 17:27:47 +0530 Subject: [PATCH 02/20] Fixed: The vocher expiry date was not saved correctly while trying to generate voucher from the refund request --- .../controllers/admin/AdminOrderRefundRequestsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php index d9664b18e..55ac676b4 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php @@ -496,7 +496,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController $cartrule->date_from = date('Y-m-d H:i:s', $now); // generateDiscount if ($voucher_expiry_date) { - $cartrule->date_to = date('Y-m-d H:i:s', strtotime($voucher_expiry_date)); + $cartrule->date_to = date('Y-m-d', strtotime($voucher_expiry_date)).' 23:00:00'; } else { $cartrule->date_to = date('Y-m-d H:i:s', $now + (3600 * 24 * 365.25)); /* 1 year */ } From 1993e8ce76d829401b0f82e20851611ef478f339 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 24 Sep 2024 17:53:36 +0530 Subject: [PATCH 03/20] Fixed: The default date ranges in the booking form are not correct in case los and minimum booking offset is applied on the room type --- controllers/front/ProductController.php | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index e33644402..d9222203d 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -337,27 +337,19 @@ class ProductControllerCore extends FrontController $preparationTime = (int) HotelOrderRestrictDate::getPreparationTime($hotel_id); if (!($date_from = Tools::getValue('date_from'))) { $date_from = date('Y-m-d'); - // set date to according to los - $objHotelRoomTypeRestrictionDateRange = new HotelRoomTypeRestrictionDateRange(); - $los = $objHotelRoomTypeRestrictionDateRange->getRoomTypeLengthOfStay($this->product->id, $date_from); - $date_to = date('Y-m-d', strtotime('+'.$los['min_los'].' day', strtotime($date_from))); - } - if (!($date_to = Tools::getValue('date_to'))) { - // set date to according to los - $objHotelRoomTypeRestrictionDateRange = new HotelRoomTypeRestrictionDateRange(); - $los = $objHotelRoomTypeRestrictionDateRange->getRoomTypeLengthOfStay($this->product->id, $date_from); - $date_to = date('Y-m-d', strtotime('+'.$los['min_los'].' day', strtotime($date_from))); } if ($preparationTime && strtotime(date('Y-m-d', strtotime('+'. ($preparationTime) .' days'))) > strtotime($date_from) ) { $date_from = date('Y-m-d', strtotime('+ '.$preparationTime.' day')); - if (strtotime($date_from) >= strtotime($date_to)) { - $objHotelRoomTypeRestrictionDateRange = new HotelRoomTypeRestrictionDateRange(); - $los = $objHotelRoomTypeRestrictionDateRange->getRoomTypeLengthOfStay($this->product->id, $date_from); - $date_to = date('Y-m-d', strtotime('+'.$los['min_los'].' day', strtotime($date_from))); - } + } + + if (!($date_to = Tools::getValue('date_to'))) { + // set date to according to los + $objHotelRoomTypeRestrictionDateRange = new HotelRoomTypeRestrictionDateRange(); + $los = $objHotelRoomTypeRestrictionDateRange->getRoomTypeLengthOfStay($this->product->id, $date_from); + $date_to = date('Y-m-d', strtotime('+'.$los['min_los'].' day', strtotime($date_from))); } $hotel_branch_obj = new HotelBranchInformation($hotel_id); From 2041f7a53bc7cd6baa7dc5cd4985c9de5359fc00 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 25 Sep 2024 10:43:26 +0530 Subject: [PATCH 04/20] Fixed: The add new button disappear display type is not empty --- controllers/admin/AdminAddressesController.php | 2 +- controllers/admin/AdminAttachmentsController.php | 2 +- controllers/admin/AdminAttributesGroupsController.php | 2 +- controllers/admin/AdminCartRulesController.php | 2 +- controllers/admin/AdminCartsController.php | 2 +- controllers/admin/AdminCategoriesController.php | 4 ++-- controllers/admin/AdminContactsController.php | 2 +- controllers/admin/AdminCountriesController.php | 2 +- controllers/admin/AdminCurrenciesController.php | 2 +- controllers/admin/AdminEmployeesController.php | 2 +- controllers/admin/AdminFeaturesController.php | 2 +- controllers/admin/AdminGendersController.php | 2 +- controllers/admin/AdminImagesController.php | 2 +- controllers/admin/AdminLanguagesController.php | 2 +- controllers/admin/AdminManufacturersController.php | 2 +- controllers/admin/AdminMetaController.php | 2 +- controllers/admin/AdminNormalProductsController.php | 2 +- controllers/admin/AdminOrderMessageController.php | 2 +- controllers/admin/AdminOrdersController.php | 2 +- controllers/admin/AdminProductsController.php | 2 +- controllers/admin/AdminProfilesController.php | 2 +- controllers/admin/AdminQuickAccessesController.php | 2 +- controllers/admin/AdminReferrersController.php | 2 +- controllers/admin/AdminRequestSqlController.php | 2 +- controllers/admin/AdminScenesController.php | 2 +- controllers/admin/AdminSearchConfController.php | 2 +- controllers/admin/AdminSearchEnginesController.php | 2 +- controllers/admin/AdminSpecificPriceRuleController.php | 2 +- controllers/admin/AdminStatesController.php | 2 +- controllers/admin/AdminStatusesController.php | 2 +- controllers/admin/AdminStoresController.php | 2 +- controllers/admin/AdminSuppliersController.php | 2 +- controllers/admin/AdminSupplyOrdersController.php | 2 +- controllers/admin/AdminTabsController.php | 2 +- controllers/admin/AdminTagsController.php | 2 +- controllers/admin/AdminTaxRulesGroupController.php | 2 +- controllers/admin/AdminTaxesController.php | 2 +- controllers/admin/AdminThemesController.php | 2 +- controllers/admin/AdminWarehousesController.php | 2 +- controllers/admin/AdminWebserviceController.php | 2 +- controllers/admin/AdminZonesController.php | 2 +- .../controllers/admin/AdminRoomTypeGlobalDemand.php | 2 +- .../controllers/admin/AdminHotelReviewCategory.php | 2 +- 43 files changed, 44 insertions(+), 44 deletions(-) diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php index 2f579a095..48ac15bec 100644 --- a/controllers/admin/AdminAddressesController.php +++ b/controllers/admin/AdminAddressesController.php @@ -99,7 +99,7 @@ class AdminAddressesControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_address'] = array( 'href' => self::$currentIndex.'&addaddress&token='.$this->token, 'desc' => $this->l('Add new address', null, null, false), diff --git a/controllers/admin/AdminAttachmentsController.php b/controllers/admin/AdminAttachmentsController.php index 8ded2eca2..5547e8817 100644 --- a/controllers/admin/AdminAttachmentsController.php +++ b/controllers/admin/AdminAttachmentsController.php @@ -96,7 +96,7 @@ class AdminAttachmentsControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_attachment'] = array( 'href' => self::$currentIndex.'&addattachment&token='.$this->token, 'desc' => $this->l('Add new attachment', null, null, false), diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php index c47cb31e3..87de868f5 100644 --- a/controllers/admin/AdminAttributesGroupsController.php +++ b/controllers/admin/AdminAttributesGroupsController.php @@ -506,7 +506,7 @@ class AdminAttributesGroupsControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_attribute_group'] = array( 'href' => self::$currentIndex.'&addattribute_group&token='.$this->token, 'desc' => $this->l('Add new attribute', null, null, false), diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php index 0e21ec140..fa40c81af 100644 --- a/controllers/admin/AdminCartRulesController.php +++ b/controllers/admin/AdminCartRulesController.php @@ -260,7 +260,7 @@ class AdminCartRulesControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_cart_rule'] = array( 'href' => self::$currentIndex.'&addcart_rule&token='.$this->token, 'desc' => $this->l('Add new cart rule', null, null, false), diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index 9cf872c27..7daedf915 100644 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -168,7 +168,7 @@ class AdminCartsControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['export_cart'] = array( 'href' => self::$currentIndex.'&exportcart&token='.$this->token, 'desc' => $this->l('Export carts', null, null, false), diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php index 5576d3de6..119e8354a 100644 --- a/controllers/admin/AdminCategoriesController.php +++ b/controllers/admin/AdminCategoriesController.php @@ -278,7 +278,7 @@ class AdminCategoriesControllerCore extends AdminController public function initToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->toolbar_btn['new'] = array( 'href' => self::$currentIndex.'&add'.$this->table.'&token='.$this->token, 'desc' => $this->l('Add New') @@ -317,7 +317,7 @@ class AdminCategoriesControllerCore extends AdminController unset($this->toolbar_btn['new']); } // after adding a category - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $id_category = (Tools::isSubmit('id_category')) ? '&id_parent='.(int)Tools::getValue('id_category') : ''; $this->toolbar_btn['new'] = array( 'href' => self::$currentIndex.'&add'.$this->table.'&token='.$this->token.$id_category, diff --git a/controllers/admin/AdminContactsController.php b/controllers/admin/AdminContactsController.php index 3d7ae5b25..7136dac08 100644 --- a/controllers/admin/AdminContactsController.php +++ b/controllers/admin/AdminContactsController.php @@ -139,7 +139,7 @@ class AdminContactsControllerCore extends AdminController public function initPageHeaderToolbar() { $this->initToolbar(); - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_contact'] = array( 'href' => self::$currentIndex.'&addcontact&token='.$this->token, 'desc' => $this->l('Add new contact', null, null, false), diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php index becf523cb..f4b7e1e4f 100644 --- a/controllers/admin/AdminCountriesController.php +++ b/controllers/admin/AdminCountriesController.php @@ -120,7 +120,7 @@ class AdminCountriesControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_country'] = array( 'href' => self::$currentIndex.'&addcountry&token='.$this->token, 'desc' => $this->l('Add new country', null, null, false), diff --git a/controllers/admin/AdminCurrenciesController.php b/controllers/admin/AdminCurrenciesController.php index 6f6e1ded2..ba3bed966 100644 --- a/controllers/admin/AdminCurrenciesController.php +++ b/controllers/admin/AdminCurrenciesController.php @@ -361,7 +361,7 @@ class AdminCurrenciesControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_currency'] = array( 'href' => self::$currentIndex.'&addcurrency&token='.$this->token, 'desc' => $this->l('Add new currency', null, null, false), diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php index c736e1865..1a5decb74 100644 --- a/controllers/admin/AdminEmployeesController.php +++ b/controllers/admin/AdminEmployeesController.php @@ -177,7 +177,7 @@ class AdminEmployeesControllerCore extends AdminController { parent::initPageHeaderToolbar(); - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_employee'] = array( 'href' => self::$currentIndex.'&addemployee&token='.$this->token, 'desc' => $this->l('Add new employee', null, null, false), diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php index c57d5d807..c94266099 100644 --- a/controllers/admin/AdminFeaturesController.php +++ b/controllers/admin/AdminFeaturesController.php @@ -231,7 +231,7 @@ class AdminFeaturesControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_feature'] = array( 'href' => self::$currentIndex.'&addfeature&token='.$this->token, 'desc' => $this->l('Add new room feature', null, null, false), diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php index 7331a9c4c..894df14ef 100644 --- a/controllers/admin/AdminGendersController.php +++ b/controllers/admin/AdminGendersController.php @@ -97,7 +97,7 @@ class AdminGendersControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_gender'] = array( 'href' => self::$currentIndex.'&addgender&token='.$this->token, 'desc' => $this->l('Add new title', null, null, false), diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php index 914802c9d..6f9dc7f32 100644 --- a/controllers/admin/AdminImagesController.php +++ b/controllers/admin/AdminImagesController.php @@ -823,7 +823,7 @@ class AdminImagesControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_image_type'] = array( 'href' => self::$currentIndex.'&addimage_type&token='.$this->token, 'desc' => $this->l('Add new image type', null, null, false), diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php index f655284a7..0f5f60f51 100644 --- a/controllers/admin/AdminLanguagesController.php +++ b/controllers/admin/AdminLanguagesController.php @@ -107,7 +107,7 @@ class AdminLanguagesControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_language'] = array( 'href' => self::$currentIndex.'&addlang&token='.$this->token, 'desc' => $this->l('Add new language', null, null, false), diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php index 68718fc3d..ea594419e 100644 --- a/controllers/admin/AdminManufacturersController.php +++ b/controllers/admin/AdminManufacturersController.php @@ -109,7 +109,7 @@ class AdminManufacturersControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_manufacturer'] = array( 'href' => self::$currentIndex.'&addmanufacturer&token='.$this->token, 'desc' => $this->l('Add new manufacturer', null, null, false), diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php index 676bd7a64..af5a251a6 100644 --- a/controllers/admin/AdminMetaController.php +++ b/controllers/admin/AdminMetaController.php @@ -229,7 +229,7 @@ class AdminMetaControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_meta'] = array( 'href' => self::$currentIndex.'&addmeta&token='.$this->token, 'desc' => $this->l('Add a new page', null, null, false), diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php index c584a46b6..738fbebc5 100644 --- a/controllers/admin/AdminNormalProductsController.php +++ b/controllers/admin/AdminNormalProductsController.php @@ -2610,7 +2610,7 @@ class AdminNormalProductsControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_product'] = array( 'href' => self::$currentIndex.'&addproduct&token='.$this->token, // 'desc' => $this->l('Add new room type', null, null, false), diff --git a/controllers/admin/AdminOrderMessageController.php b/controllers/admin/AdminOrderMessageController.php index b6eb07604..23e4c144c 100644 --- a/controllers/admin/AdminOrderMessageController.php +++ b/controllers/admin/AdminOrderMessageController.php @@ -108,7 +108,7 @@ class AdminOrderMessageControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_order_message'] = array( 'href' => self::$currentIndex.'&addorder_message&token='.$this->token, 'desc' => $this->l('Add new order message'), diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 9a4a3da7d..36a007cb1 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -360,7 +360,7 @@ class AdminOrdersControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_order'] = array( 'href' => self::$currentIndex.'&addorder&token='.$this->token, 'desc' => $this->l('Add new order', null, null, false), diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index f96439145..c78ee0348 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -2649,7 +2649,7 @@ class AdminProductsControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_product'] = array( 'href' => self::$currentIndex.'&addproduct&token='.$this->token, // 'desc' => $this->l('Add new room type', null, null, false), diff --git a/controllers/admin/AdminProfilesController.php b/controllers/admin/AdminProfilesController.php index 56d9f04d3..57bdca16d 100644 --- a/controllers/admin/AdminProfilesController.php +++ b/controllers/admin/AdminProfilesController.php @@ -114,7 +114,7 @@ class AdminProfilesControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_profile'] = array( 'href' => self::$currentIndex.'&addprofile&token='.$this->token, 'desc' => $this->l('Add new profile', null, null, false), diff --git a/controllers/admin/AdminQuickAccessesController.php b/controllers/admin/AdminQuickAccessesController.php index 1f4b5bab9..ecd8d5d0d 100644 --- a/controllers/admin/AdminQuickAccessesController.php +++ b/controllers/admin/AdminQuickAccessesController.php @@ -135,7 +135,7 @@ class AdminQuickAccessesControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_quick_access'] = array( 'href' => self::$currentIndex.'&addquick_access&token='.$this->token, 'desc' => $this->l('Add new quick access', null, null, false), diff --git a/controllers/admin/AdminReferrersController.php b/controllers/admin/AdminReferrersController.php index bed1574e2..17e143c25 100644 --- a/controllers/admin/AdminReferrersController.php +++ b/controllers/admin/AdminReferrersController.php @@ -168,7 +168,7 @@ class AdminReferrersControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_referrer'] = array( 'href' => self::$currentIndex.'&addreferrer&token='.$this->token, 'desc' => $this->l('Add new referrer', null, null, false), diff --git a/controllers/admin/AdminRequestSqlController.php b/controllers/admin/AdminRequestSqlController.php index 068face35..a36151e9e 100644 --- a/controllers/admin/AdminRequestSqlController.php +++ b/controllers/admin/AdminRequestSqlController.php @@ -310,7 +310,7 @@ class AdminRequestSqlControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_request'] = array( 'href' => self::$currentIndex.'&addrequest_sql&token='.$this->token, 'desc' => $this->l('Add new SQL query', null, null, false), diff --git a/controllers/admin/AdminScenesController.php b/controllers/admin/AdminScenesController.php index ccd3f2793..eed625718 100644 --- a/controllers/admin/AdminScenesController.php +++ b/controllers/admin/AdminScenesController.php @@ -120,7 +120,7 @@ class AdminScenesControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_scene'] = array( 'href' => self::$currentIndex.'&addscene&token='.$this->token, 'desc' => $this->l('Add new image map', null, null, false), diff --git a/controllers/admin/AdminSearchConfController.php b/controllers/admin/AdminSearchConfController.php index 91efb9430..aafb69f1b 100644 --- a/controllers/admin/AdminSearchConfController.php +++ b/controllers/admin/AdminSearchConfController.php @@ -242,7 +242,7 @@ class AdminSearchConfControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_alias'] = array( 'href' => self::$currentIndex.'&addalias&token='.$this->token, 'desc' => $this->l('Add new alias', null, null, false), diff --git a/controllers/admin/AdminSearchEnginesController.php b/controllers/admin/AdminSearchEnginesController.php index 92d4c1929..266eb1756 100644 --- a/controllers/admin/AdminSearchEnginesController.php +++ b/controllers/admin/AdminSearchEnginesController.php @@ -92,7 +92,7 @@ class AdminSearchEnginesControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_search_engine'] = array( 'href' => self::$currentIndex.'&addsearch_engine&token='.$this->token, 'desc' => $this->l('Add new search engine', null, null, false), diff --git a/controllers/admin/AdminSpecificPriceRuleController.php b/controllers/admin/AdminSpecificPriceRuleController.php index 783aced1d..e6e2de668 100644 --- a/controllers/admin/AdminSpecificPriceRuleController.php +++ b/controllers/admin/AdminSpecificPriceRuleController.php @@ -130,7 +130,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_specific_price_rule'] = array( 'href' => self::$currentIndex.'&addspecific_price_rule&token='.$this->token, 'desc' => $this->l('Add new catalog price rule', null, null, false), diff --git a/controllers/admin/AdminStatesController.php b/controllers/admin/AdminStatesController.php index 6c549289f..b4a3fb717 100644 --- a/controllers/admin/AdminStatesController.php +++ b/controllers/admin/AdminStatesController.php @@ -114,7 +114,7 @@ class AdminStatesControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_state'] = array( 'href' => self::$currentIndex.'&addstate&token='.$this->token, 'desc' => $this->l('Add new state', null, null, false), diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php index aadb4ee44..ab0e269a9 100644 --- a/controllers/admin/AdminStatusesController.php +++ b/controllers/admin/AdminStatusesController.php @@ -242,7 +242,7 @@ class AdminStatusesControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_order_state'] = array( 'href' => self::$currentIndex.'&addorder_state&token='.$this->token, 'desc' => $this->l('Add new order status', null, null, false), diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php index 6e56fee02..8f73711ed 100644 --- a/controllers/admin/AdminStoresController.php +++ b/controllers/admin/AdminStoresController.php @@ -139,7 +139,7 @@ class AdminStoresControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_store'] = array( 'href' => self::$currentIndex.'&addstore&token='.$this->token, 'desc' => $this->l('Add new store', null, null, false), diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php index 12d994703..15408bdf9 100644 --- a/controllers/admin/AdminSuppliersController.php +++ b/controllers/admin/AdminSuppliersController.php @@ -78,7 +78,7 @@ class AdminSuppliersControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_supplier'] = array( 'href' => self::$currentIndex.'&addsupplier&token='.$this->token, 'desc' => $this->l('Add new supplier', null, null, false), diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php index 485bf6d90..dc8ae73bb 100644 --- a/controllers/admin/AdminSupplyOrdersController.php +++ b/controllers/admin/AdminSupplyOrdersController.php @@ -161,7 +161,7 @@ class AdminSupplyOrdersControllerCore extends AdminController 'desc' => $this->l('Back to list', null, null, false), 'icon' => 'process-icon-back' ); - } elseif (empty($this->display)) { + } elseif ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_supply_order'] = array( 'href' => self::$currentIndex.'&addsupply_order&token='.$this->token, 'desc' => $this->l('Add new supply order', null, null, false), diff --git a/controllers/admin/AdminTabsController.php b/controllers/admin/AdminTabsController.php index d2449776f..42ada96c3 100644 --- a/controllers/admin/AdminTabsController.php +++ b/controllers/admin/AdminTabsController.php @@ -96,7 +96,7 @@ class AdminTabsControllerCore extends AdminController 'desc' => $this->l('Back to list', null, null, false), 'icon' => 'process-icon-back' ); - } elseif (empty($this->display)) { + } elseif ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_menu'] = array( 'href' => self::$currentIndex.'&addtab&token='.$this->token, 'desc' => $this->l('Add new menu', null, null, false), diff --git a/controllers/admin/AdminTagsController.php b/controllers/admin/AdminTagsController.php index 5322e6ea6..bf8c850c6 100644 --- a/controllers/admin/AdminTagsController.php +++ b/controllers/admin/AdminTagsController.php @@ -71,7 +71,7 @@ class AdminTagsControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_tag'] = array( 'href' => self::$currentIndex.'&addtag&token='.$this->token, 'desc' => $this->l('Add new tag', null, null, false), diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php index ba62da512..878b1c4e7 100644 --- a/controllers/admin/AdminTaxRulesGroupController.php +++ b/controllers/admin/AdminTaxRulesGroupController.php @@ -77,7 +77,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_tax_rules_group'] = array( 'href' => self::$currentIndex.'&addtax_rules_group&token='.$this->token, 'desc' => $this->l('Add new tax rules group', null, null, false), diff --git a/controllers/admin/AdminTaxesController.php b/controllers/admin/AdminTaxesController.php index 8a1640a19..38c8da23e 100644 --- a/controllers/admin/AdminTaxesController.php +++ b/controllers/admin/AdminTaxesController.php @@ -117,7 +117,7 @@ class AdminTaxesControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_tax'] = array( 'href' => self::$currentIndex.'&addtax&token='.$this->token, 'desc' => $this->l('Add new tax', null, null, false), diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index 09470ad22..61105c518 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -734,7 +734,7 @@ class AdminThemesControllerCore extends AdminController { parent::initPageHeaderToolbar(); - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['import_theme'] = array( 'href' => self::$currentIndex.'&action=importtheme&token='.$this->token, 'desc' => $this->l('Add new theme', null, null, false), diff --git a/controllers/admin/AdminWarehousesController.php b/controllers/admin/AdminWarehousesController.php index 0ae0e5ae8..4011597eb 100644 --- a/controllers/admin/AdminWarehousesController.php +++ b/controllers/admin/AdminWarehousesController.php @@ -85,7 +85,7 @@ class AdminWarehousesControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_warehouse'] = array( 'href' => self::$currentIndex.'&addwarehouse&token='.$this->token, 'desc' => $this->l('Add new warehouse', null, null, false), diff --git a/controllers/admin/AdminWebserviceController.php b/controllers/admin/AdminWebserviceController.php index f44c412cb..f7ca60f65 100644 --- a/controllers/admin/AdminWebserviceController.php +++ b/controllers/admin/AdminWebserviceController.php @@ -102,7 +102,7 @@ class AdminWebserviceControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_webservice'] = array( 'href' => self::$currentIndex.'&addwebservice_account&token='.$this->token, 'desc' => $this->l('Add new webservice key', null, null, false), diff --git a/controllers/admin/AdminZonesController.php b/controllers/admin/AdminZonesController.php index 925e92170..b215ee276 100644 --- a/controllers/admin/AdminZonesController.php +++ b/controllers/admin/AdminZonesController.php @@ -69,7 +69,7 @@ class AdminZonesControllerCore extends AdminController public function initPageHeaderToolbar() { - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new_zone'] = array( 'href' => self::$currentIndex.'&addzone&token='.$this->token, 'desc' => $this->l('Add new zone', null, null, false), diff --git a/modules/hotelreservationsystem/controllers/admin/AdminRoomTypeGlobalDemand.php b/modules/hotelreservationsystem/controllers/admin/AdminRoomTypeGlobalDemand.php index 72e2f61e9..2e4611bbc 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminRoomTypeGlobalDemand.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminRoomTypeGlobalDemand.php @@ -130,7 +130,7 @@ class AdminRoomTypeGlobalDemandController extends ModuleAdminController public function initToolbar() { parent::initToolbar(); - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new'] = array( 'href' => self::$currentIndex.'&add'.$this->table.'&token='.$this->token, 'desc' => $this->l('Add New Facility'), diff --git a/modules/qlohotelreview/controllers/admin/AdminHotelReviewCategory.php b/modules/qlohotelreview/controllers/admin/AdminHotelReviewCategory.php index 8c20dd222..7b116c5fc 100644 --- a/modules/qlohotelreview/controllers/admin/AdminHotelReviewCategory.php +++ b/modules/qlohotelreview/controllers/admin/AdminHotelReviewCategory.php @@ -80,7 +80,7 @@ class AdminHotelReviewCategoryController extends ModuleAdminController public function initToolbar() { parent::initToolbar(); - if (empty($this->display)) { + if ($this->display != 'edit' && $this->display != 'add' && $this->display !='view') { $this->page_header_toolbar_btn['new'] = array( 'href' => self::$currentIndex.'&add'.$this->table.'&token='.$this->token, 'desc' => $this->l('Add new category') From 64d0f8661ad2043fb7ff32e1a2b38e0cb00ca8b5 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Thu, 26 Sep 2024 20:17:57 +0530 Subject: [PATCH 05/20] Fixed: javascript files are included multiple times in admin login page --- admin/themes/default/template/controllers/login/header.tpl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/admin/themes/default/template/controllers/login/header.tpl b/admin/themes/default/template/controllers/login/header.tpl index d1d17ce21..161910564 100644 --- a/admin/themes/default/template/controllers/login/header.tpl +++ b/admin/themes/default/template/controllers/login/header.tpl @@ -54,14 +54,11 @@ {/if} {/foreach} {/if} - {foreach from=$js_files item=js_uri} - - {/foreach} - - {if (isset($js_def) && count($js_def) || isset($js_files) && count($js_files))} {include file=$smarty.const._PS_ALL_THEMES_DIR_|cat:"javascript.tpl"} {/if} + +
From 4e189a7aecaad1b2202faee8615f299b2d6c0e22 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Fri, 27 Sep 2024 10:55:50 +0530 Subject: [PATCH 06/20] Fixed: Occupancy selection panel design issue in Backoffice book now page --- .../views/css/HotelReservationAdmin.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/hotelreservationsystem/views/css/HotelReservationAdmin.css b/modules/hotelreservationsystem/views/css/HotelReservationAdmin.css index 91dd1825b..147403354 100644 --- a/modules/hotelreservationsystem/views/css/HotelReservationAdmin.css +++ b/modules/hotelreservationsystem/views/css/HotelReservationAdmin.css @@ -191,6 +191,10 @@ a.deleteHtlImage { margin: 2px 20px; } +#room-search-form .booking_occupancy_wrapper { + min-width: 250px; +} + .htl_room_data_cont > div.row > div + div > div.row{ border-left: 1px solid #C7D6DB; } From 78353a61cb95f74e289e833dfcd9537a34357230 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Fri, 27 Sep 2024 12:01:38 +0530 Subject: [PATCH 07/20] Fixed: Localization pack not updating from correct resource during QloApps installation --- controllers/admin/AdminLocalizationController.php | 2 +- install/models/install.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/controllers/admin/AdminLocalizationController.php b/controllers/admin/AdminLocalizationController.php index aaba53ffa..484f14282 100644 --- a/controllers/admin/AdminLocalizationController.php +++ b/controllers/admin/AdminLocalizationController.php @@ -170,7 +170,7 @@ class AdminLocalizationControllerCore extends AdminController } if (Tools::isSubmit('submitLocalizationPack')) { - $version = str_replace('.', '', _PS_VERSION_); + $version = str_replace('.', '', _QLOAPPS_VERSION_); $version = substr($version, 0, 2); if (($iso_localization_pack = Tools::getValue('iso_localization_pack')) && Validate::isFileName($iso_localization_pack)) { diff --git a/install/models/install.php b/install/models/install.php index 83a356c55..5acdb9312 100644 --- a/install/models/install.php +++ b/install/models/install.php @@ -181,7 +181,7 @@ class InstallModelInstall extends InstallAbstractModel if (!$all_languages) { $iso_codes_to_install = array($this->language->getLanguageIso()); if ($iso_country) { - $version = str_replace('.', '', _PS_VERSION_); + $version = str_replace('.', '', _QLOAPPS_VERSION_); $version = substr($version, 0, 2); $localization_file_content = $this->getLocalizationPackContent($version, $iso_country); @@ -403,7 +403,7 @@ class InstallModelInstall extends InstallAbstractModel if (is_file($path_cache_file)) { $localization_file_content = file_get_contents($path_cache_file); } else { - $localization_file_content = @Tools::file_get_contents('http://api.prestashop.com/localization/'.$version.'/'.$country.'.xml'); + $localization_file_content = @Tools::file_get_contents('http://api.qloapps.com/localization/'.$version.'/'.$country.'.xml'); if (!@simplexml_load_string($localization_file_content)) { $localization_file_content = false; } @@ -544,7 +544,7 @@ class InstallModelInstall extends InstallAbstractModel Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'country SET active = 0 WHERE id_country != '.(int)$id_country); // Set localization configuration - $version = str_replace('.', '', _PS_VERSION_); + $version = str_replace('.', '', _QLOAPPS_VERSION_); $version = substr($version, 0, 2); $localization_file_content = $this->getLocalizationPackContent($version, $data['shop_country']); From 1cde4c88560aac05457f8adfce0dcbb28940c64a Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Fri, 27 Sep 2024 12:23:10 +0530 Subject: [PATCH 08/20] Fixed: Service products cart data not available in admin carts page --- .../RoomTypeServiceProductCartDetail.php | 111 ++++++++++-------- 1 file changed, 62 insertions(+), 49 deletions(-) diff --git a/modules/hotelreservationsystem/classes/RoomTypeServiceProductCartDetail.php b/modules/hotelreservationsystem/classes/RoomTypeServiceProductCartDetail.php index cb4f1b7dc..fec2fed2c 100644 --- a/modules/hotelreservationsystem/classes/RoomTypeServiceProductCartDetail.php +++ b/modules/hotelreservationsystem/classes/RoomTypeServiceProductCartDetail.php @@ -221,7 +221,8 @@ class RoomTypeServiceProductCartDetail extends ObjectModel cbd.`id_product` as `room_type_id_product`, cbd.`adults`, cbd.`children`, cbd.`date_from`, cbd.`date_to`'; if (!$getTotalPrice) { $sql .= ', pl.`name`, cbd.`id_guest`, cbd.`id_customer`, p.`auto_add_to_cart`, p.`price_addition_type`, - p.`price_calculation_method`, cbd.`id_hotel`, cbd.`id_room`, cbd.`date_from`, cbd.`date_to`, cbd.`is_refunded`'; + p.`price_calculation_method`, cbd.`id_hotel`, cbd.`id_room`, cbd.`date_from`, cbd.`date_to`, + cbd.`is_refunded`, p.`allow_multiple_quantity`'; } $sql .= ' FROM `'._DB_PREFIX_.'htl_cart_booking_data` cbd LEFT JOIN `'._DB_PREFIX_.'htl_room_type_service_product_cart_detail` rscd @@ -296,11 +297,44 @@ class RoomTypeServiceProductCartDetail extends ObjectModel if ($idProduct) { $selectedServiceProducts[$product['htl_cart_booking_id']]['quantity'] += $product['quantity']; } else { + $servicePrice = $objRoomTypeServiceProductPrice->getServicePrice( + (int)$product['id_product'], + (int)$product['room_type_id_product'], + 1, + $product['date_from'], + $product['date_to'], + $useTax, + false, + $id_address + ); + + $servicePriceTE = $objRoomTypeServiceProductPrice->getServicePrice( + (int)$product['id_product'], + (int)$product['room_type_id_product'], + 1, + $product['date_from'], + $product['date_to'], + false, + false, + $id_address + ); + + $servicePriceTI = $objRoomTypeServiceProductPrice->getServicePrice( + (int)$product['id_product'], + (int)$product['room_type_id_product'], + 1, + $product['date_from'], + $product['date_to'], + true, + false, + $id_address + ); $selectedServiceProducts[$product['htl_cart_booking_id']]['selected_products_info'][$product['id_product']] = array( 'id_product' => $product['id_product'], 'name' => $product['name'], 'quantity' => $product['quantity'], 'auto_add_to_cart' => $product['auto_add_to_cart'], + 'allow_multiple_quantity' => $product['allow_multiple_quantity'], 'price_addition_type' => $product['price_addition_type'], 'price_calculation_method' => $product['price_calculation_method'], 'unit_price_tax_excl' => ($objRoomTypeServiceProductPrice->getServicePrice( @@ -323,9 +357,28 @@ class RoomTypeServiceProductCartDetail extends ObjectModel false, $id_address ) / $numdays), + 'total_price' => $servicePrice, + 'total_price_tax_excl' => $servicePriceTE, + 'total_price_tax_incl' => $servicePriceTI ); } + $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price'] += Tools::processPriceRounding($servicePrice, $qty); + $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price_tax_excl'] += Tools::processPriceRounding($servicePriceTE, $qty); + $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price_tax_incl'] += Tools::processPriceRounding($servicePriceTI, $qty); + } else { + $selectedServiceProducts[$product['htl_cart_booking_id']]['htl_cart_booking_id'] = $product['htl_cart_booking_id']; + $selectedServiceProducts[$product['htl_cart_booking_id']]['id_cart'] = $product['id_cart']; + $selectedServiceProducts[$product['htl_cart_booking_id']]['room_type_id_product'] = $product['room_type_id_product']; + $selectedServiceProducts[$product['htl_cart_booking_id']]['id_guest'] = $product['id_guest']; + $selectedServiceProducts[$product['htl_cart_booking_id']]['id_customer'] = $product['id_customer']; + $selectedServiceProducts[$product['htl_cart_booking_id']]['id_hotel'] = $product['id_hotel']; + $selectedServiceProducts[$product['htl_cart_booking_id']]['id_room'] = $product['id_room']; + $selectedServiceProducts[$product['htl_cart_booking_id']]['date_from'] = $product['date_from']; + $selectedServiceProducts[$product['htl_cart_booking_id']]['date_to'] = $product['date_to']; + $selectedServiceProducts[$product['htl_cart_booking_id']]['is_refunded'] = $product['is_refunded']; + $selectedServiceProducts[$product['htl_cart_booking_id']]['adults'] = $product['adults']; + $selectedServiceProducts[$product['htl_cart_booking_id']]['children'] = $product['children']; $servicePrice = $objRoomTypeServiceProductPrice->getServicePrice( (int)$product['id_product'], (int)$product['room_type_id_product'], @@ -358,28 +411,12 @@ class RoomTypeServiceProductCartDetail extends ObjectModel false, $id_address ); - - $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price'] += Tools::processPriceRounding($servicePrice, $qty); - $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price_tax_excl'] += Tools::processPriceRounding($servicePriceTE, $qty); - $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price_tax_incl'] += Tools::processPriceRounding($servicePriceTI, $qty); - } else { - $selectedServiceProducts[$product['htl_cart_booking_id']]['htl_cart_booking_id'] = $product['htl_cart_booking_id']; - $selectedServiceProducts[$product['htl_cart_booking_id']]['id_cart'] = $product['id_cart']; - $selectedServiceProducts[$product['htl_cart_booking_id']]['room_type_id_product'] = $product['room_type_id_product']; - $selectedServiceProducts[$product['htl_cart_booking_id']]['id_guest'] = $product['id_guest']; - $selectedServiceProducts[$product['htl_cart_booking_id']]['id_customer'] = $product['id_customer']; - $selectedServiceProducts[$product['htl_cart_booking_id']]['id_hotel'] = $product['id_hotel']; - $selectedServiceProducts[$product['htl_cart_booking_id']]['id_room'] = $product['id_room']; - $selectedServiceProducts[$product['htl_cart_booking_id']]['date_from'] = $product['date_from']; - $selectedServiceProducts[$product['htl_cart_booking_id']]['date_to'] = $product['date_to']; - $selectedServiceProducts[$product['htl_cart_booking_id']]['is_refunded'] = $product['is_refunded']; - $selectedServiceProducts[$product['htl_cart_booking_id']]['adults'] = $product['adults']; - $selectedServiceProducts[$product['htl_cart_booking_id']]['children'] = $product['children']; if ($idProduct) { $selectedServiceProducts[$product['htl_cart_booking_id']]['id_product'] = $product['id_product']; $selectedServiceProducts[$product['htl_cart_booking_id']]['name'] = $product['name']; $selectedServiceProducts[$product['htl_cart_booking_id']]['quantity'] = $product['quantity']; $selectedServiceProducts[$product['htl_cart_booking_id']]['auto_add_to_cart'] = $product['auto_add_to_cart']; + $selectedServiceProducts[$product['htl_cart_booking_id']]['allow_multiple_quantity'] = $product['allow_multiple_quantity']; $selectedServiceProducts[$product['htl_cart_booking_id']]['price_addition_type'] = $product['price_addition_type']; $selectedServiceProducts[$product['htl_cart_booking_id']]['price_calculation_method'] = $product['price_calculation_method']; $selectedServiceProducts[$product['htl_cart_booking_id']]['unit_price_tax_excl'] = $objRoomTypeServiceProductPrice->getServicePrice( @@ -402,12 +439,16 @@ class RoomTypeServiceProductCartDetail extends ObjectModel false, $id_address ) / $numdays; + $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price'] = $servicePrice; + $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price_tax_excl'] = $servicePriceTE; + $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price_tax_incl'] = $servicePriceTI; } else { $selectedServiceProducts[$product['htl_cart_booking_id']]['selected_products_info'][$product['id_product']] = array( 'id_product' => $product['id_product'], 'name' => $product['name'], 'quantity' => $product['quantity'], 'auto_add_to_cart' => $product['auto_add_to_cart'], + 'allow_multiple_quantity' => $product['allow_multiple_quantity'], 'price_addition_type' => $product['price_addition_type'], 'price_calculation_method' => $product['price_calculation_method'], 'unit_price_tax_excl' => ($objRoomTypeServiceProductPrice->getServicePrice( @@ -430,41 +471,13 @@ class RoomTypeServiceProductCartDetail extends ObjectModel false, $id_address ) / $numdays), + 'total_price' => $servicePrice, + 'total_price_tax_excl' => $servicePriceTE, + 'total_price_tax_incl' => $servicePriceTI ); } - $servicePrice = $objRoomTypeServiceProductPrice->getServicePrice( - (int)$product['id_product'], - (int)$product['room_type_id_product'], - 1, - $product['date_from'], - $product['date_to'], - $useTax, - false, - $id_address - ); - $servicePriceTE = $objRoomTypeServiceProductPrice->getServicePrice( - (int)$product['id_product'], - (int)$product['room_type_id_product'], - 1, - $product['date_from'], - $product['date_to'], - false, - false, - $id_address - ); - - $servicePriceTI = $objRoomTypeServiceProductPrice->getServicePrice( - (int)$product['id_product'], - (int)$product['room_type_id_product'], - 1, - $product['date_from'], - $product['date_to'], - true, - false, - $id_address - ); $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price'] = Tools::processPriceRounding($servicePrice, $qty); $selectedServiceProducts[$product['htl_cart_booking_id']]['total_price_tax_excl'] = Tools::processPriceRounding($servicePriceTE, $qty); From 3c11e481069a5faa7acf28b55ceb5dcf6428aa42 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Fri, 27 Sep 2024 12:29:29 +0530 Subject: [PATCH 09/20] Fixed: Optional column on one tab is reset from another tab in backoffice --- classes/controller/AdminController.php | 2 +- classes/helper/HelperList.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 8115f30b6..2e8e263fb 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -1027,7 +1027,7 @@ class AdminControllerCore extends Controller public function processListVisibility() { $listFieldsVisibility = Tools::getValue('list_fields_visibility', array()); // To set optional list empty in case none is selected - $controller = 'list_visibility_'.$this->context->controller->className; + $controller = 'list_visibility_'.$this->context->controller->controller_name; $this->context->cookie->$controller = json_encode($listFieldsVisibility); return true; diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php index 55219ea1e..03a38764d 100644 --- a/classes/helper/HelperList.php +++ b/classes/helper/HelperList.php @@ -726,7 +726,7 @@ class HelperListCore extends Helper } // get selected fields to display - $list_visibility = json_decode($this->context->cookie->{'list_visibility_'.$this->context->controller->className}); + $list_visibility = json_decode($this->context->cookie->{'list_visibility_'.$this->context->controller->controller_name}); foreach ($this->fields_list as $key => $field) { if (!(isset($field['search']) && $field['search'] === false)) { $has_search_field = true; From aa3f45f73b9790eb038e4572a5a0acb8282cc8bd Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Fri, 27 Sep 2024 12:50:23 +0530 Subject: [PATCH 10/20] Fixed: Error not showing in guest checkout when Invaid email is passed --- controllers/front/AuthController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php index 68ccb858d..a6e43a108 100644 --- a/controllers/front/AuthController.php +++ b/controllers/front/AuthController.php @@ -435,7 +435,9 @@ class AuthControllerCore extends FrontController } if (!Tools::getValue('is_new_customer', 1)) { - if ($idCustomer = Customer::customerExists(Tools::getValue('email'), true, false)) { + if (Validate::isEmail($email = Tools::getValue('email')) + && $idCustomer = Customer::customerExists(Tools::getValue('email'), true, false) + ) { $customer = new Customer($idCustomer); } } @@ -574,7 +576,6 @@ class AuthControllerCore extends FrontController } } } - if (!@checkdate(Tools::getValue('months'), Tools::getValue('days'), Tools::getValue('years')) && !(Tools::getValue('months') == '' && Tools::getValue('days') == '' && Tools::getValue('years') == '')) { $this->errors[] = Tools::displayError('Invalid date of birth'); } From c22ec9fa91fb0719dc513df708913314b61cb17e Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Fri, 27 Sep 2024 16:34:51 +0530 Subject: [PATCH 11/20] Fixed: jquery chosen, select and tinymce plugins used images were not visible in different admin theme --- admin/themes/default/img/loader.gif | Bin 0 -> 3717 bytes .../themes/default/sass/partials/_chosen.sass | 2 +- .../default/sass/partials/_select2.scss | 22 +++++++++--------- .../default/sass/partials/_tinymce.sass | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 admin/themes/default/img/loader.gif diff --git a/admin/themes/default/img/loader.gif b/admin/themes/default/img/loader.gif new file mode 100644 index 0000000000000000000000000000000000000000..424c17c320f2e79b4950b925291115716233a113 GIT binary patch literal 3717 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 C=!dib literal 0 HcmV?d00001 diff --git a/admin/themes/default/sass/partials/_chosen.sass b/admin/themes/default/sass/partials/_chosen.sass index b56215a15..0e76a91d6 100644 --- a/admin/themes/default/sass/partials/_chosen.sass +++ b/admin/themes/default/sass/partials/_chosen.sass @@ -20,7 +20,7 @@ $chosen-focus-box-shadow: 0 1px 1px rgba(0, 0, 0, .075) inset, 0 0 8px rgba(82, $chosen-focus-transition: border linear .2s, box-shadow linear .2s $chosen-height: $input-height-base $chosen-multi-height: $input-height-base + 6px -$chosen-sprite-path: '../img/chosen-sprite.png' +$chosen-sprite-path: '#{$img-path}/chosen-sprite.png' .chosen-select width: 100% diff --git a/admin/themes/default/sass/partials/_select2.scss b/admin/themes/default/sass/partials/_select2.scss index 13013a28c..1a1bfeec4 100644 --- a/admin/themes/default/sass/partials/_select2.scss +++ b/admin/themes/default/sass/partials/_select2.scss @@ -86,7 +86,7 @@ Version: 3.4.6 Timestamp: Sat Mar 22 22:30:15 EDT 2014 text-decoration: none; border: 0; - background: url('../img/select2.png') right top no-repeat; + background: url('#{$img-path}/select2.png') right top no-repeat; cursor: pointer; outline: 0; } @@ -182,7 +182,7 @@ Version: 3.4.6 Timestamp: Sat Mar 22 22:30:15 EDT 2014 display: block; width: 100%; height: 100%; - background: url('../img/select2.png') no-repeat 0 1px; + background: url('#{$img-path}/select2.png') no-repeat 0 1px; } .select2-search { @@ -215,8 +215,8 @@ Version: 3.4.6 Timestamp: Sat Mar 22 22:30:15 EDT 2014 -webkit-box-shadow: none; box-shadow: none; - background: #fff url('../img/select2.png') no-repeat 100% -22px; - background: url('../img/select2.png') no-repeat 100% -22px; + background: #fff url('#{$img-path}/select2.png') no-repeat 100% -22px; + background: url('#{$img-path}/select2.png') no-repeat 100% -22px; } .select2-drop.select2-drop-above .select2-search input { @@ -224,8 +224,8 @@ Version: 3.4.6 Timestamp: Sat Mar 22 22:30:15 EDT 2014 } .select2-search input.select2-active { - background: #fff url('../img/select2-spinner.gif') no-repeat 100%; - background: url('../img/select2-spinner.gif') no-repeat 100%; + background: #fff url('#{$img-path}/select2-spinner.gif') no-repeat 100%; + background: url('#{$img-path}/select2-spinner.gif') no-repeat 100%; } .select2-container-active .select2-choice, @@ -369,7 +369,7 @@ disabled look for disabled choices in the results dropdown } .select2-more-results.select2-active { - background: #f4f4f4 url('../img/select2-spinner.gif') no-repeat 100%; + background: #f4f4f4 url('#{$img-path}/select2-spinner.gif') no-repeat 100%; } .select2-more-results { @@ -456,7 +456,7 @@ html[dir="rtl"] .select2-container-multi .select2-choices li } .select2-container-multi .select2-choices .select2-search-field input.select2-active { - background: #fff url('../img/select2-spinner.gif') no-repeat 100% !important; + background: #fff url('#{$img-path}/select2-spinner.gif') no-repeat 100% !important; } .select2-default { @@ -512,7 +512,7 @@ html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice font-size: 1px; outline: none; - background: url('../img/select2.png') right top no-repeat; + background: url('#{$img-path}/select2.png') right top no-repeat; } html[dir="rtl"] .select2-search-choice-close { right: auto; @@ -590,7 +590,7 @@ html[dir="rtl"] .select2-search-choice-close { .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice .select2-arrow b { - background-image: url('../img/select2x2.png') !important; + background-image: url('#{$img-path}/select2x2.png') !important; background-repeat: no-repeat !important; background-size: 60px 40px !important; } @@ -607,7 +607,7 @@ html[dir="rtl"] .select2-search-choice-close { } .form-control .select2-choice .select2-arrow { - border-radius: 0 2px 2px 0; + border-radius: 0 2px 2px 0; } .form-control.select2-container { diff --git a/admin/themes/default/sass/partials/_tinymce.sass b/admin/themes/default/sass/partials/_tinymce.sass index de7e99302..7a5f7f448 100644 --- a/admin/themes/default/sass/partials/_tinymce.sass +++ b/admin/themes/default/sass/partials/_tinymce.sass @@ -1210,7 +1210,7 @@ i.mce-i-resize opacity: .6 filter: alpha(opacity = 60) zoom: 1 - background: white url('img/loader.gif') no-repeat center center + background: white url('#{$img-path}/loader.gif') no-repeat center center .mce-i-none width: 16px From e5c236b0498bc0eea86620248539140fdfcabb1b Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Tue, 1 Oct 2024 12:51:36 +0530 Subject: [PATCH 12/20] Updated: Error message for cart rule validation --- classes/CartRule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/CartRule.php b/classes/CartRule.php index 17c6bd8ca..d8a340c6e 100644 --- a/classes/CartRule.php +++ b/classes/CartRule.php @@ -565,7 +565,7 @@ class CartRuleCore extends ObjectModel return (!$display_error) ? false : Tools::displayError('This voucher has expired'); } if (!$alreadyInCart && $context->cart->getOrderTotal(true, Cart::BOTH) <= 0) { - return (!$display_error) ? false : Tools::displayError('You cannot add more vouchers. Please remove an existing voucher before applying a new one.'); + return (!$display_error) ? false : Tools::displayError('You cannot add more vouchers since the booking amount has already reached zero. Please remove an existing voucher before adding a new one.'); } if ($context->cart->id_customer) { From 0bedfdb09410698d3d4a1d668588838d9297ae37 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Tue, 1 Oct 2024 12:56:20 +0530 Subject: [PATCH 13/20] Updated : added hidden inputs in HelperTree class | Admin can only see his own hotel in HelperTree --- .../default/template/helpers/tree/tree.tpl | 4 +- .../helpers/tree/tree_node_folder.tpl | 2 +- .../tree/tree_node_folder_checkbox.tpl | 4 +- .../helpers/tree/tree_node_folder_radio.tpl | 4 +- .../template/helpers/tree/tree_node_item.tpl | 2 +- .../helpers/tree/tree_node_item_checkbox.tpl | 4 +- .../helpers/tree/tree_node_item_radio.tpl | 4 +- .../admin/AdminCartRulesController.php | 8 ++-- .../classes/HotelBranchInformation.php | 14 +++---- .../classes/HotelHelper.php | 41 +++++++++++++++++++ .../AdminHotelRoomsBookingController.php | 8 ++-- 11 files changed, 68 insertions(+), 27 deletions(-) diff --git a/admin/themes/default/template/helpers/tree/tree.tpl b/admin/themes/default/template/helpers/tree/tree.tpl index 1eab06591..217743b29 100644 --- a/admin/themes/default/template/helpers/tree/tree.tpl +++ b/admin/themes/default/template/helpers/tree/tree.tpl @@ -42,7 +42,7 @@ {if isset($use_checkbox) && $use_checkbox == true} function checkAll($tree) { - $tree.find(":input[type=checkbox]").each( + $tree.find(":input[type=checkbox]:not([hidden])").each( function() { $(this).prop("checked", true); @@ -53,7 +53,7 @@ function uncheckAll($tree) { - $tree.find(":input[type=checkbox]").each( + $tree.find(":input[type=checkbox]:not([hidden])").each( function() { $(this).prop("checked", false); diff --git a/admin/themes/default/template/helpers/tree/tree_node_folder.tpl b/admin/themes/default/template/helpers/tree/tree_node_folder.tpl index 19191b8cc..ff0af7779 100644 --- a/admin/themes/default/template/helpers/tree/tree_node_folder.tpl +++ b/admin/themes/default/template/helpers/tree/tree_node_folder.tpl @@ -22,7 +22,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -
  • +
  • +
  • +
  • +
  • +
  • +