From b9c3c6b0053112481877e0c74834b177d5c37185 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Thu, 10 Oct 2024 16:06:45 +0530 Subject: [PATCH 1/2] Fixed: incorrect service price calculation when multiple hotels are added in cart --- classes/Cart.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Cart.php b/classes/Cart.php index e3b4d1e42..5255c580c 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -1751,7 +1751,7 @@ public function getOrderTotal($with_taxes = true, $type = Cart::BOTH, $products if ($servicesWithRoom = $objRoomTypeServiceProductCartDetail->getServiceProductsInCart( $this->id, (int)$product['id_product'], - 0, + isset($product['id_hotel']) ? $product['id_hotel'] : 0, 0, 0, 0, From fad6185a3e90faad01f712c3046ce9fd14ad9527 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Thu, 10 Oct 2024 16:28:41 +0530 Subject: [PATCH 2/2] updated install data --- modules/hotelreservationsystem/classes/HotelHelper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/hotelreservationsystem/classes/HotelHelper.php b/modules/hotelreservationsystem/classes/HotelHelper.php index 7a13dc622..137697e46 100644 --- a/modules/hotelreservationsystem/classes/HotelHelper.php +++ b/modules/hotelreservationsystem/classes/HotelHelper.php @@ -1046,7 +1046,7 @@ public function insertDefaultHotelEntries() Configuration::updateValue( 'WK_HOTEL_GLOBAL_ADDRESS', - 'The Hotel Prime, Monticello Dr, Montgomery, AL 36117, USA' + 'The Hotel Prime, Monticello Dr, Montgomery, 10010' ); Configuration::updateValue('WK_HOTEL_GLOBAL_CONTACT_NUMBER', '0987654321'); Configuration::updateValue('WK_HOTEL_GLOBAL_CONTACT_EMAIL', 'hotelprime@htl.com'); @@ -1612,7 +1612,7 @@ public function saveDummyHotelBranchInfo() $objAddress->id_state = $state_id; $objAddress->id_country = $def_cont_id; $objAddress->postcode = Tools::generateRandomZipcode($def_cont_id); - $objAddress->address1 = 'Monticello Dr, Montgomery, AL 36117, USA'; + $objAddress->address1 = 'Monticello Dr, Montgomery, 10010'; $objAddress->alias = 'The Hotel Prime'; $objAddress->lastname = 'The Hotel Prime'; $objAddress->firstname = 'The Hotel Prime';