From 021a003ab334d8f57c1aea1fe9779bcf2579cf11 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 17 Apr 2024 13:09:38 +0530 Subject: [PATCH 01/35] Updated error message for guest account to customer account transformation --- controllers/front/GuestTrackingController.php | 9 +++++++-- controllers/front/OrderOpcController.php | 8 +++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php index ab05a2876..ad2a0cb29 100644 --- a/controllers/front/GuestTrackingController.php +++ b/controllers/front/GuestTrackingController.php @@ -95,8 +95,13 @@ class GuestTrackingControllerCore extends FrontController } elseif (!Tools::getValue('password')) { $this->errors[] = Tools::displayError('Invalid password.'); } elseif (!$customer->transformToCustomer($this->context->language->id, Tools::getValue('password'))) { - // @todo clarify error message - $this->errors[] = Tools::displayError('An error occurred while transforming a guest into a registered customer.'); + if (!$customer->isGuest()) { + $this->errors[] = Tools::displayError('This account is already registered as a customer.'); + }else if (!Validate::isPasswd(Tools::getValue('password'))) { + $this->errors[] = Tools::displayError('Invalid password.'); + } else { + $this->errors[] = Tools::displayError('An error occurred while transforming a guest into a registered customer.'); + } } else { $this->context->smarty->assign('transformSuccess', true); } diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index 465c6a7ca..e109721a6 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -176,7 +176,13 @@ class OrderOpcControllerCore extends ParentOrderController if ($customer->transformToCustomer($this->context->language->id, $passwd)) { $this->context->updateCustomer($customer); } else { - $this->errors[] = Tools::displayError('An error occurred while transforming your account into a registered customer.'); + if (!$customer->isGuest()) { + $this->errors[] = Tools::displayError('This account is already registered as a customer.'); + }else if (!Validate::isPasswd($passwd)) { + $this->errors[] = Tools::displayError('Invalid password.'); + } else { + $this->errors[] = Tools::displayError('An error occurred while transforming your account into a registered customer.'); + } } } From a316307c2ea1c6d7250f75b2db5ec6f0ea6e2bd4 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Wed, 17 Apr 2024 16:00:52 +0530 Subject: [PATCH 02/35] Fixed: Search panel issue on room type page when hotel is disabled --- .../wkroomsearchblock/classes/WkRoomSearchHelper.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php b/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php index 7ab3d7138..dc4ac075c 100644 --- a/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php +++ b/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php @@ -159,11 +159,13 @@ class WkRoomSearchHelper $searchedData['location'] = $objLocationCategory->name; } else { $locationCategoryId = $objCategory->id_parent; - $searchedData['location'] = $searchedData['htl_dtl']['city']; - if (isset($searchedData['htl_dtl']['state_name'])) { - $searchedData['location'] .= ', '.$searchedData['htl_dtl']['state_name']; + if ($searchedData['htl_dtl']) { + $searchedData['location'] = $searchedData['htl_dtl']['city']; + if (isset($searchedData['htl_dtl']['state_name'])) { + $searchedData['location'] .= ', '.$searchedData['htl_dtl']['state_name']; + } + $searchedData['location'] .= ', '.$searchedData['htl_dtl']['country_name']; } - $searchedData['location'] .= ', '.$searchedData['htl_dtl']['country_name']; } $searchedData['location_category_id'] = $locationCategoryId; From 8d5a26969692d2ab57b75b8c1baaf1a6c66ac6c6 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Fri, 19 Apr 2024 11:21:25 +0530 Subject: [PATCH 03/35] Fixed: error on checkout if the user choses other lanuage than default language --- classes/order/OrderHistory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/order/OrderHistory.php b/classes/order/OrderHistory.php index 874171009..1d09988c0 100644 --- a/classes/order/OrderHistory.php +++ b/classes/order/OrderHistory.php @@ -449,7 +449,7 @@ class OrderHistoryCore extends ObjectModel ); if ($idHotel = HotelBookingDetail::getIdHotelByIdOrder($order->id)) { - $objHotelBranchInformation = new HotelBranchInformation($idHotel, $order->id_lang); + $objHotelBranchInformation = new HotelBranchInformation($idHotel); $fields = array_merge( $objHotelBranchInformation->getFields(), $objHotelBranchInformation->getFieldsLang()[$order->id_lang], From 417d863ea54364afc9fdd17affc824e053af645c Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Fri, 19 Apr 2024 11:39:04 +0530 Subject: [PATCH 04/35] Fixed: Invalid customer voucher amount when changing currency --- themes/hotel-reservation-theme/discount.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/hotel-reservation-theme/discount.tpl b/themes/hotel-reservation-theme/discount.tpl index ea4ba715f..b011b1ec2 100644 --- a/themes/hotel-reservation-theme/discount.tpl +++ b/themes/hotel-reservation-theme/discount.tpl @@ -53,7 +53,7 @@ {/if} {if $discountDetail.reduction_amount > 0} {if $discountDetail.reduction_percent > 0} + {/if} - {convertPrice price=$discountDetail.reduction_amount} ({if $discountDetail.reduction_tax == 1}{l s='Tax included'}{else}{l s='Tax excluded'}{/if}) + {displayPrice price=$discountDetail.reduction_amount currency=$discountDetail.reduction_currency} ({if $discountDetail.reduction_tax == 1}{l s='Tax included'}{else}{l s='Tax excluded'}{/if}) {/if} {if $discountDetail.free_shipping} {if $discountDetail.reduction_percent > 0 || $discountDetail.reduction_amount > 0} + {/if} @@ -73,7 +73,7 @@ {if $discountDetail.minimal == 0} {l s='None'} {else} - {convertPrice price=$discountDetail.minimal} ({if $discountDetail.minimum_amount_tax == 1}{l s='Tax included'}{else}{l s='Tax excluded'}{/if}) + {displayPrice price=$discountDetail.minimal currency=$discountDetail.reduction_currency} ({if $discountDetail.minimum_amount_tax == 1}{l s='Tax included'}{else}{l s='Tax excluded'}{/if}) {/if} From b2e3973e8ae01d5cee4b570819e958c0b719ccf5 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Fri, 19 Apr 2024 12:30:44 +0530 Subject: [PATCH 05/35] Fixed: Auto generated advance price rule are visible in room type configuration --- .../classes/HotelRoomTypeFeaturePricing.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php index f4be56fd3..5dbfbd1db 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php +++ b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php @@ -794,14 +794,14 @@ class HotelRoomTypeFeaturePricing extends ObjectModel * @param [int] $id_product [id of the product] * @return [array] [returns all feature prices by product] */ - public function getFeaturePricesbyIdProduct($id_product) + public function getFeaturePricesbyIdProduct($id_product, $id_cart = 0, $id_guest = 0, $id_room = 0) { $idLang = Context::getContext()->language->id; return Db::getInstance()->executeS( 'SELECT hrfp.*, hrfpl.`feature_price_name` FROM `'._DB_PREFIX_.'htl_room_type_feature_pricing` hrfp LEFT JOIN `'._DB_PREFIX_.'htl_room_type_feature_pricing_lang` hrfpl ON(hrfp.`id_feature_price` = hrfpl.`id_feature_price` AND hrfpl.`id_lang` = '.(int)$idLang.') - WHERE `id_product` = '.(int)$id_product + WHERE `id_product` = '.(int)$id_product.' AND `id_cart` = '.(int)$id_cart.' AND `id_guest` = '.(int)$id_guest.' AND `id_room` = '.(int)$id_room ); } From 8279b0f64aa2389e6d01347ced03a9d3bfb1f4e2 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Fri, 19 Apr 2024 16:37:17 +0530 Subject: [PATCH 06/35] Fixed: Creation of to sperate HotelAdvancedPayment for a same room type from two seprates tabs --- controllers/admin/AdminProductsController.php | 6 ++++-- .../hotelreservationsystem/classes/HotelAdvancedPayment.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 811207d39..6988d73bd 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -1089,16 +1089,18 @@ class AdminProductsControllerCore extends AdminController } $id_product = Tools::getValue('id_product'); - $id_adv_pmt = Tools::getValue('id_adv_pmt'); if ($id_adv_pmt) { $obj_adv_pmt = new HotelAdvancedPayment($id_adv_pmt); } else { $obj_adv_pmt = new HotelAdvancedPayment(); + if ($id_adv_pmt = $obj_adv_pmt->getIdAdvPaymentByIdProduct($id_product)) { + // To prevent duplication from two separate tabs + $obj_adv_pmt = new HotelAdvancedPayment($id_adv_pmt); + } } $adv_payment_active = Tools::getValue('adv_payment_active'); - $obj_adv_pmt->id_product = $id_product; $obj_adv_pmt->active = $adv_payment_active; diff --git a/modules/hotelreservationsystem/classes/HotelAdvancedPayment.php b/modules/hotelreservationsystem/classes/HotelAdvancedPayment.php index 1cc539d75..076663010 100644 --- a/modules/hotelreservationsystem/classes/HotelAdvancedPayment.php +++ b/modules/hotelreservationsystem/classes/HotelAdvancedPayment.php @@ -68,7 +68,7 @@ class HotelAdvancedPayment extends ObjectModel */ public function getIdAdvPaymentByIdProduct($id_product) { - $result = Db::getInstance()->getRow("SELECT * FROM `"._DB_PREFIX_."htl_advance_payment` WHERE `id_product`=".$id_product); + $result = Db::getInstance()->getRow("SELECT * FROM `"._DB_PREFIX_."htl_advance_payment` WHERE `id_product`=".(int) $id_product); if ($result) { return $result; From 5bb2378fdaff68feeaa1af65d0dd7727b5198af3 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 20 Apr 2024 10:21:42 +0530 Subject: [PATCH 07/35] Fixed: Getting fatal error on order detail page if entered invalid order ID in URL --- controllers/admin/AdminOrdersController.php | 75 ++++++++++----------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 9c6d1fe61..f4165de35 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -482,44 +482,44 @@ class AdminOrdersControllerCore extends AdminController { if ($this->display == 'view') { /** @var Order $order */ - $order = $this->loadObject(); + if (Validate::isLoadedObject($order = $this->loadObject())) { + // hotel link in header + if ($idHotel = HotelBookingDetail::getIdHotelByIdOrder($order->id)) { + $this->toolbar_btn['hotel'] = array( + 'href' => $this->context->link->getAdminLink('AdminAddHotel').'&id='.$idHotel.'&updatehtl_branch_info', + 'desc' => $this->l('View Hotel'), + 'class' => 'icon-building', + 'target' => true, + ); + } - // hotel link in header - if ($idHotel = HotelBookingDetail::getIdHotelByIdOrder($order->id)) { - $this->toolbar_btn['hotel'] = array( - 'href' => $this->context->link->getAdminLink('AdminAddHotel').'&id='.$idHotel.'&updatehtl_branch_info', - 'desc' => $this->l('View Hotel'), - 'class' => 'icon-building', - 'target' => true, + if (Configuration::get('PS_INVOICE') && $order->hasInvoice() && !$this->lite_display) { + $this->toolbar_btn['file'] = array( + 'short' => $this->l('Invoice'), + 'href' => $this->context->link->getAdminLink('AdminPdf').'&submitAction=generateInvoicePDF&id_order='.$order->id, + 'desc' => $this->l('View invoice'), + 'class' => 'icon-file-text', + 'target' => true, + ); + } + + $this->toolbar_btn['print'] = array( + 'short' => $this->l('Print'), + 'href' => 'javascript:window.print()', + 'desc' => $this->l('Print order'), + 'class' => 'icon-print', ); - } - if (Configuration::get('PS_INVOICE') && $order->hasInvoice() && !$this->lite_display) { - $this->toolbar_btn['file'] = array( - 'short' => $this->l('Invoice'), - 'href' => $this->context->link->getAdminLink('AdminPdf').'&submitAction=generateInvoicePDF&id_order='.$order->id, - 'desc' => $this->l('View invoice'), - 'class' => 'icon-file-text', - 'target' => true, - ); - } - - $this->toolbar_btn['print'] = array( - 'short' => $this->l('Print'), - 'href' => 'javascript:window.print()', - 'desc' => $this->l('Print order'), - 'class' => 'icon-print', - ); - - if (((int) $order->isReturnable()) && !$order->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_OR_REFUND_REQUEST_FLAG)) { - $this->toolbar_btn['cancel'] = array( - 'short' => ((float) $order->getTotalPaid()) ? $this->l('Refund') : $this->l('Cancel'), - 'href' => '#refundForm', - 'id' => 'desc-order-standard_refund', - 'desc' => ((float) $order->getTotalPaid()) ? $this->l('Initiate refund') : $this->l('Cancel bookings'), - 'class' => 'icon-exchange', - 'target' => true, - ); + if (((int) $order->isReturnable()) && !$order->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_OR_REFUND_REQUEST_FLAG)) { + $this->toolbar_btn['cancel'] = array( + 'short' => ((float) $order->getTotalPaid()) ? $this->l('Refund') : $this->l('Cancel'), + 'href' => '#refundForm', + 'id' => 'desc-order-standard_refund', + 'desc' => ((float) $order->getTotalPaid()) ? $this->l('Initiate refund') : $this->l('Cancel bookings'), + 'class' => 'icon-exchange', + 'target' => true, + ); + } } } @@ -2475,9 +2475,8 @@ class AdminOrdersControllerCore extends AdminController public function renderView() { - $order = new Order(Tools::getValue('id_order')); - if (!Validate::isLoadedObject($order)) { - $this->errors[] = Tools::displayError('The order cannot be found within your database.'); + if (!Validate::isLoadedObject($order = new Order(Tools::getValue('id_order')))) { + return; } $this->content .= $this->renderKpis(); From 994664c23b67bb90b6f3ecf893676b00e704445d Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 20 Apr 2024 11:58:42 +0530 Subject: [PATCH 08/35] Fixed: Should not allow admin to add rooms if order status is already canceled or refunded. --- .../default/template/controllers/orders/helpers/view/view.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index f28080e92..6c4efed72 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -869,7 +869,7 @@
 {l s='Rooms Booking Detail'} {$order_detail_data|@count} - {if !$order->hasBeenDelivered()} + {if !$order->hasBeenDelivered() && $currentState->id != Configuration::get('PS_OS_REFUND') && $currentState->id != Configuration::get('PS_OS_CANCELED')} From 5ce9749d747c939f1a77ae5d4acaf15f2a698b0a Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 20 Apr 2024 13:11:07 +0530 Subject: [PATCH 09/35] Fixed: Validation messages should be present on the same page when invalid text is added in the notes on admin order detail page. --- .../template/controllers/orders/modals/_document_note.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/themes/default/template/controllers/orders/modals/_document_note.tpl b/admin/themes/default/template/controllers/orders/modals/_document_note.tpl index ecb8e98e5..2fbbb25bd 100644 --- a/admin/themes/default/template/controllers/orders/modals/_document_note.tpl +++ b/admin/themes/default/template/controllers/orders/modals/_document_note.tpl @@ -18,7 +18,7 @@ *}
-
+
From 77f68d4b7b4ee752e11e13f5f65bfc6109437858 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Mon, 22 Apr 2024 13:10:58 +0530 Subject: [PATCH 10/35] Fixed: service products unit price not defined in cart package --- classes/Cart.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/Cart.php b/classes/Cart.php index 921afd2cf..7500dd21e 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -2407,7 +2407,8 @@ class CartCore extends ObjectModel $product['cart_quantity'] = $selectedProduct['quantity']; $product['total'] = $selectedProduct['total_price_tax_excl']; $product['total_wt'] = $selectedProduct['total_price_tax_incl']; - $product['price_wt'] = $selectedProduct['unit_price_tax_incl']; + $product['price_wt'] = $selectedProduct['total_price_tax_incl'] / $product['cart_quantity']; + $product['price'] = $selectedProduct['total_price_tax_excl'] / $product['cart_quantity']; $product['id_hotel'] = $selectedProduct['id_hotel']; $orderPackage[$id_address][$selectedProduct['id_hotel']]['product_list'][] = $product; if (!isset($orderPackage[$id_address][$selectedProduct['id_hotel']]['id_hotel'])) { From 5a8759c4d3fe12b12a3efa56921b5b1edce12ae1 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Mon, 22 Apr 2024 14:49:20 +0530 Subject: [PATCH 11/35] Fixed: Unable to change tax to "No Tax" for service product --- controllers/admin/AdminProductsController.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 811207d39..9f00f6c01 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -3178,12 +3178,8 @@ class AdminProductsControllerCore extends AdminController $objRoomTypeServiceProductPrice->id_element = $idProduct; $objRoomTypeServiceProductPrice->element_type = RoomTypeServiceProduct::WK_ELEMENT_TYPE_ROOM_TYPE; } - $objRoomTypeServiceProductPrice->price = $price; - if ($idTaxRulesGroup) { - $objRoomTypeServiceProductPrice->id_tax_rules_group = $idTaxRulesGroup; - } - + $objRoomTypeServiceProductPrice->id_tax_rules_group = $idTaxRulesGroup; $objRoomTypeServiceProductPrice->save(); } else { // create new association From 0195bc2a4d55d35e49d4d4eb0b7788b5715cd4c3 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Mon, 22 Apr 2024 16:25:41 +0530 Subject: [PATCH 12/35] Fixed: Tax price is not calculated according to zip code in backoffice controller --- controllers/admin/AdminNormalProductsController.php | 2 +- controllers/admin/AdminProductsController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php index 87a959951..cf78be63c 100644 --- a/controllers/admin/AdminNormalProductsController.php +++ b/controllers/admin/AdminNormalProductsController.php @@ -3079,7 +3079,7 @@ class AdminNormalProductsControllerCore extends AdminController } else { $address->id_country = (int)$address_infos['id_country']; $address->id_state = (int)$address_infos['id_state']; - $address->zipcode = $address_infos['postcode']; + $address->postcode = $address_infos['postcode']; } $tax_rules_groups = TaxRulesGroup::getTaxRulesGroups(true); $tax_rates = array( diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 811207d39..6e8ed5b65 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -3910,7 +3910,7 @@ class AdminProductsControllerCore extends AdminController } else { $address->id_country = (int)$address_infos['id_country']; $address->id_state = (int)$address_infos['id_state']; - $address->zipcode = $address_infos['postcode']; + $address->postcode = $address_infos['postcode']; } $tax_rules_groups = TaxRulesGroup::getTaxRulesGroups(true); From 5361beca0460020783e5a10fa9c77c204b311d89 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 23 Apr 2024 12:25:33 +0530 Subject: [PATCH 13/35] Fix duplicated order ids on admin Booking Carts listing page --- controllers/admin/AdminCartsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index 8b53e911c..108b51a75 100644 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -45,8 +45,8 @@ class AdminCartsControllerCore extends AdminController $this->_select = 'CONCAT(c.`firstname`, \' \', c.`lastname`) `customer`, a.id_cart total, TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', a.`date_add`)) AS `time_diff`, - IFNULL(GROUP_CONCAT(o.`id_order`), 0) AS `ids_order`, - IF (IFNULL(o.id_order, \''.$this->l('Non ordered cart').'\') = \''.$this->l('Non ordered cart').'\', IF(TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', a.`date_add`)) > 86400, \''.$this->l('Abandoned cart').'\', \''.$this->l('Non ordered cart').'\'), GROUP_CONCAT(o.`id_order`)) AS filter_ids_order, + IFNULL(GROUP_CONCAT(DISTINCT o.`id_order`), 0) AS `ids_order`, + IF (IFNULL(o.id_order, \''.$this->l('Non ordered cart').'\') = \''.$this->l('Non ordered cart').'\', IF(TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', a.`date_add`)) > 86400, \''.$this->l('Abandoned cart').'\', \''.$this->l('Non ordered cart').'\'), GROUP_CONCAT(DISTINCT o.`id_order`)) AS filter_ids_order, IF(o.id_order, 1, 0) badge_success, IF(o.id_order, 0, 1) badge_danger, IF(co.id_guest, 1, 0) id_guest'; $this->_join = 'LEFT JOIN '._DB_PREFIX_.'customer c ON (c.id_customer = a.id_customer) LEFT JOIN '._DB_PREFIX_.'currency cu ON (cu.id_currency = a.id_currency) From d05cadae50378f924353c829a026d07704307aed Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Tue, 23 Apr 2024 15:35:32 +0530 Subject: [PATCH 14/35] Fixed: Unable to edit the price of the room on order detail page, if the admin change the price of the room during booking. --- controllers/admin/AdminOrdersController.php | 42 ++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 9c6d1fe61..0264893fb 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -4760,47 +4760,47 @@ class AdminOrdersControllerCore extends AdminController if ($order_detail->id_order_invoice != $order_invoice->id) { $old_order_invoice = new OrderInvoice($order_detail->id_order_invoice); // We remove cost of products - $old_order_invoice->total_products -= $order_detail->total_price_tax_excl; - $old_order_invoice->total_products_wt -= $order_detail->total_price_tax_incl; + $old_order_invoice->total_products -= Tools::ps_round($order_detail->total_price_tax_excl, 6); + $old_order_invoice->total_products_wt -= Tools::ps_round($order_detail->total_price_tax_incl, 6); - $old_order_invoice->total_paid_tax_excl -= $order_detail->total_price_tax_excl; - $old_order_invoice->total_paid_tax_incl -= $order_detail->total_price_tax_incl; + $old_order_invoice->total_paid_tax_excl -= Tools::ps_round($order_detail->total_price_tax_excl, 6); + $old_order_invoice->total_paid_tax_incl -= Tools::ps_round($order_detail->total_price_tax_incl, 6); $res &= $old_order_invoice->update(); - $order_invoice->total_products += $order_detail->total_price_tax_excl; - $order_invoice->total_products_wt += $order_detail->total_price_tax_incl; + $order_invoice->total_products += Tools::ps_round($order_detail->total_price_tax_excl, 6); + $order_invoice->total_products_wt += Tools::ps_round($order_detail->total_price_tax_incl, 6); - $order_invoice->total_paid_tax_excl += $order_detail->total_price_tax_excl; - $order_invoice->total_paid_tax_incl += $order_detail->total_price_tax_incl; + $order_invoice->total_paid_tax_excl += Tools::ps_round($order_detail->total_price_tax_excl, 6); + $order_invoice->total_paid_tax_incl += Tools::ps_round($order_detail->total_price_tax_incl, 6); $order_detail->id_order_invoice = $order_invoice->id; } } if ($diff_price_tax_incl != 0 && $diff_price_tax_excl != 0) { - $order_detail->unit_price_tax_excl = $product_price_tax_excl; - $order_detail->unit_price_tax_incl = $product_price_tax_incl; + $order_detail->unit_price_tax_excl = Tools::ps_round($product_price_tax_excl, 6); + $order_detail->unit_price_tax_incl = Tools::ps_round($product_price_tax_incl, 6); - $order_detail->total_price_tax_incl += (float)$diff_price_tax_incl; - $order_detail->total_price_tax_excl += (float)$diff_price_tax_excl; + $order_detail->total_price_tax_incl += Tools::ps_round((float)$diff_price_tax_incl, 6); + $order_detail->total_price_tax_excl += Tools::ps_round((float)$diff_price_tax_excl, 6); if (isset($order_invoice)) { // Apply changes on OrderInvoice - $order_invoice->total_products += (float)$diff_price_tax_excl; - $order_invoice->total_products_wt += (float)$diff_price_tax_incl; + $order_invoice->total_products += Tools::ps_round((float)$diff_price_tax_excl, 6); + $order_invoice->total_products_wt += Tools::ps_round((float)$diff_price_tax_incl, 6); - $order_invoice->total_paid_tax_excl += (float)$diff_price_tax_excl; - $order_invoice->total_paid_tax_incl += (float)$diff_price_tax_incl; + $order_invoice->total_paid_tax_excl += Tools::ps_round((float)$diff_price_tax_excl, 6); + $order_invoice->total_paid_tax_incl += Tools::ps_round((float)$diff_price_tax_incl, 6); } // Apply changes on Order $order = new Order($order_detail->id_order); - $order->total_products += (float)$diff_price_tax_excl; - $order->total_products_wt += (float)$diff_price_tax_incl; - $order->total_paid += (float)$diff_price_tax_incl; - $order->total_paid_tax_excl += (float)$diff_price_tax_excl; - $order->total_paid_tax_incl += (float)$diff_price_tax_incl; + $order->total_products += Tools::ps_round((float)$diff_price_tax_excl, 6); + $order->total_products_wt += Tools::ps_round((float)$diff_price_tax_incl, 6); + $order->total_paid += Tools::ps_round((float)$diff_price_tax_incl, 6); + $order->total_paid_tax_excl += Tools::ps_round((float)$diff_price_tax_excl, 6); + $order->total_paid_tax_incl += Tools::ps_round((float)$diff_price_tax_incl, 6); $res &= $order->update(); } From fa6602fed2fa1339a5f39af9cf50728931f29447 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Tue, 23 Apr 2024 20:20:12 +0530 Subject: [PATCH 15/35] Fixed: Getting a fatal error if the admin reduces(in negative amount) more from the booking than the paid amount. --- controllers/admin/AdminOrdersController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 9c6d1fe61..45067c47a 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -1623,6 +1623,9 @@ class AdminOrdersControllerCore extends AdminController $this->errors[] = Tools::displayError('The date is invalid'); } elseif (!Validate::isUnsignedInt($payment_type)) { $this->errors[] = Tools::displayError('Payment source is invalid'); + // Amount cannot be less than paid amount by guest in negative price + } elseif ($amount < 0 && ($order->total_paid_real + $amount) < 0) { + $this->errors[] = sprintf(Tools::displayError('Amount cannot be less than -%s'), Tools::displayPrice($order->total_paid_real, new Currency($order->id_currency))); } else { if (!$order->addOrderPayment( $amount, From b1723a3fe069c273b5cbb250ff9e821ad19d2317 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Tue, 23 Apr 2024 20:48:25 +0530 Subject: [PATCH 16/35] Fixed: Unable to delete rooms from the Free order --- controllers/admin/AdminOrdersController.php | 43 ++++++++++++++------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 9c6d1fe61..248bf27d6 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -5364,8 +5364,8 @@ class AdminOrdersControllerCore extends AdminController } else { // Calculate differences of price (Before / After) - $order_detail->total_price_tax_incl -= $diff_products_tax_incl; - $order_detail->total_price_tax_excl -= $diff_products_tax_excl; + $order_detail->total_price_tax_incl -= Tools::ps_round($diff_products_tax_incl, 6); + $order_detail->total_price_tax_excl -= Tools::ps_round($diff_products_tax_excl, 6); $old_quantity = $order_detail->product_quantity; @@ -5384,8 +5384,8 @@ class AdminOrdersControllerCore extends AdminController if ($service['quantity'] >= $serviceOrderDetail->product_quantity) { $serviceOrderDetail->delete(); } else { - $order_detail->total_price_tax_incl -= $service['total_price_tax_incl']; - $order_detail->total_price_tax_excl -= $service['total_price_tax_excl']; + $order_detail->total_price_tax_incl -= Tools::ps_round($service['total_price_tax_incl'], 6); + $order_detail->total_price_tax_excl -= Tools::ps_round($service['total_price_tax_excl'], 6); $serviceOldQuantity = $serviceOrderDetail->product_quantity; $serviceOrderDetail->product_quantity = $serviceOldQuantity - $service['quantity']; @@ -5403,20 +5403,37 @@ class AdminOrdersControllerCore extends AdminController if ($order_detail->id_order_invoice != 0) { // values changes as values are calculated accoding to the quantity of the product by webkul $order_invoice = new OrderInvoice($order_detail->id_order_invoice); - $order_invoice->total_paid_tax_excl -= ($diff_products_tax_excl + $roomExtraDemandTE + $additionlServicesTE); - $order_invoice->total_paid_tax_incl -= ($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI); - $order_invoice->total_products -= $diff_products_tax_excl; - $order_invoice->total_products_wt -= $diff_products_tax_incl; + $order_invoice->total_paid_tax_excl -= Tools::ps_round(($diff_products_tax_excl + $roomExtraDemandTE + $additionlServicesTE), 6); + $order_invoice->total_paid_tax_excl = $order_invoice->total_paid_tax_excl > 0 ? $order_invoice->total_paid_tax_excl : 0; + + $order_invoice->total_paid_tax_incl -= Tools::ps_round(($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI), 6); + $order_invoice->total_paid_tax_incl = $order_invoice->total_paid_tax_incl > 0 ? $order_invoice->total_paid_tax_incl : 0; + + $order_invoice->total_products -= Tools::ps_round($diff_products_tax_excl, 6); + $order_invoice->total_products = $order_invoice->total_products > 0 ? $order_invoice->total_products : 0; + + $order_invoice->total_products_wt -= Tools::ps_round($diff_products_tax_incl, 6); + $order_invoice->total_products_wt = $order_invoice->total_products_wt > 0 ? $order_invoice->total_products_wt : 0; + $res &= $order_invoice->update(); } // Update Order // values changes as values are calculated accoding to the quantity of the product by webkul - $order->total_paid -= ($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI); - $order->total_paid_tax_incl -= ($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI); - $order->total_paid_tax_excl -= ($diff_products_tax_excl + $roomExtraDemandTE + $additionlServicesTE); - $order->total_products -= ($diff_products_tax_excl + $additionlServicesTE); - $order->total_products_wt -= ($diff_products_tax_incl + $additionlServicesTI); + $order->total_paid -= Tools::ps_round(($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI), 6); + $order->total_paid = $order->total_paid > 0 ? $order->total_paid : 0; + + $order->total_paid_tax_incl -= Tools::ps_round(($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI), 6); + $order->total_paid_tax_incl = $order->total_paid_tax_incl > 0 ? $order->total_paid_tax_incl : 0; + + $order->total_paid_tax_excl -= Tools::ps_round(($diff_products_tax_excl + $roomExtraDemandTE + $additionlServicesTE), 6); + $order->total_paid_tax_excl = $order->total_paid_tax_excl > 0 ? $order->total_paid_tax_excl : 0; + + $order->total_products -= Tools::ps_round(($diff_products_tax_excl + $additionlServicesTE), 6); + $order->total_products = $order->total_products > 0 ? $order->total_products : 0; + + $order->total_products_wt -= Tools::ps_round(($diff_products_tax_incl + $additionlServicesTI), 6); + $order->total_products_wt = $order->total_products_wt > 0 ? $order->total_products_wt : 0; $res &= $order->update(); From 302931473963a91eb8824fc477298884922f01ac Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Thu, 25 Apr 2024 15:12:10 +0530 Subject: [PATCH 17/35] Validations are improved --- controllers/admin/AdminOrdersController.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 9c6d1fe61..d67021de5 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -1648,16 +1648,20 @@ class AdminOrdersControllerCore extends AdminController } elseif (Tools::isSubmit('submitEditNote')) { $note = Tools::getValue('note'); $order_invoice = new OrderInvoice((int)Tools::getValue('id_order_invoice')); - if (Validate::isLoadedObject($order_invoice) && Validate::isCleanHtml($note)) { - if ($this->tabAccess['edit'] === '1') { - $order_invoice->note = $note; - if ($order_invoice->save()) { - Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order_invoice->id_order.'&vieworder&conf=4&token='.$this->token); + if (Validate::isLoadedObject($order_invoice)) { + if (Validate::isCleanHtml($note)) { + if ($this->tabAccess['edit'] === '1') { + $order_invoice->note = $note; + if ($order_invoice->save()) { + Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order_invoice->id_order.'&vieworder&conf=4&token='.$this->token); + } else { + $this->errors[] = Tools::displayError('The invoice note was not saved.'); + } } else { - $this->errors[] = Tools::displayError('The invoice note was not saved.'); + $this->errors[] = Tools::displayError('You do not have permission to edit this.'); } } else { - $this->errors[] = Tools::displayError('You do not have permission to edit this.'); + $this->errors[] = Tools::displayError('Invaid note found.'); } } else { $this->errors[] = Tools::displayError('The invoice for edit note was unable to load. '); From e186f4601fa42ae6e62ec881e07eaebf708afe41 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 27 Apr 2024 17:59:03 +0530 Subject: [PATCH 18/35] Renamed : Partial payment accepted to Partial payment received. --- install/langs/bg/data/order_state.xml | 2 +- install/langs/bn/data/order_state.xml | 2 +- install/langs/br/data/order_state.xml | 2 +- install/langs/cs/data/order_state.xml | 2 +- install/langs/de/data/order_state.xml | 2 +- install/langs/es/data/order_state.xml | 2 +- install/langs/fa/data/order_state.xml | 2 +- install/langs/fr/data/order_state.xml | 2 +- install/langs/he/data/order_state.xml | 2 +- install/langs/hr/data/order_state.xml | 2 +- install/langs/hu/data/order_state.xml | 2 +- install/langs/id/data/order_state.xml | 2 +- install/langs/it/data/order_state.xml | 2 +- install/langs/lt/data/order_state.xml | 2 +- install/langs/mk/data/order_state.xml | 2 +- install/langs/nl/data/order_state.xml | 2 +- install/langs/pl/data/order_state.xml | 2 +- install/langs/pt/data/order_state.xml | 2 +- install/langs/qc/data/order_state.xml | 2 +- install/langs/ro/data/order_state.xml | 2 +- install/langs/ru/data/order_state.xml | 2 +- install/langs/si/data/order_state.xml | 2 +- install/langs/sr/data/order_state.xml | 2 +- install/langs/sv/data/order_state.xml | 2 +- install/langs/tw/data/order_state.xml | 2 +- install/langs/vn/data/order_state.xml | 2 +- install/langs/zh/data/order_state.xml | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/install/langs/bg/data/order_state.xml b/install/langs/bg/data/order_state.xml index fd178eee0..ba7230bc7 100644 --- a/install/langs/bg/data/order_state.xml +++ b/install/langs/bg/data/order_state.xml @@ -45,7 +45,7 @@