Daniel/hotel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Incorrect selling type context during order validation for multi-preference service products

Browse Source
This commit is contained in:
Amit sharma
2026-05-29 19:12:37 +05:30
parent 71cd5573da
commit 412f43919b
38 changed files with 387 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
classes/PaymentModule.php
View File

@@ -590,9 +590,9 @@ abstract class PaymentModuleCore extends Module
}
if (!$product['booking_product']
&& ($product['selling_preference_type'] == Product::SELLING_PREFERENCE_STANDALONE
|| $product['selling_preference_type'] == Product::SELLING_PREFERENCE_HOTEL_STANDALONE
|| $product['selling_preference_type'] == Product::SELLING_PREFERENCE_WITH_HOTE_AND_WITH_ROOM_TYPE
&& ($product['selling_preference_type'] == Product::SELLING_PREFERENCE_WITH_STANDALONE
|| $product['selling_preference_type'] == Product::SELLING_PREFERENCE_WITH_HOTEL
|| $product['selling_preference_type'] == Product::SELLING_PREFERENCE_WITH_HOTEL_AND_WITH_ROOM_TYPE
)
) {
$cover_image_arr = $objProduct->getCover($product['id_product']);
@@ -1003,7 +1003,7 @@ abstract class PaymentModuleCore extends Module
$objServiceProductOrderDetail->save();
}
}
} elseif (Product::SELLING_PREFERENCE_HOTEL_STANDALONE == $product['selling_preference_type']) {
} elseif (Product::SELLING_PREFERENCE_WITH_HOTEL == $product['selling_preference_type']) {
if ($hotelProducts = $objServiceProductCartDetail->getServiceProductsInCart(
$this->context->cart->id,
[],
@@ -1037,7 +1037,7 @@ abstract class PaymentModuleCore extends Module
}
}
} elseif (Product::SELLING_PREFERENCE_STANDALONE == $product['selling_preference_type']) {
} elseif (Product::SELLING_PREFERENCE_WITH_STANDALONE == $product['selling_preference_type']) {
if ($standaloneProducts = $objServiceProductCartDetail->getServiceProductsInCart(
$this->context->cart->id,
[],
@@ -1065,7 +1065,7 @@ abstract class PaymentModuleCore extends Module
}
}
} elseif (Product::SELLING_PREFERENCE_WITH_HOTE_AND_WITH_ROOM_TYPE == $product['selling_preference_type']) {
} elseif (Product::SELLING_PREFERENCE_WITH_HOTEL_AND_WITH_ROOM_TYPE == $product['selling_preference_type']) {
$idProductRoomType = null;
$idProductHotel = null;
if (isset($product['id_room_type']) && $product['id_room_type']) {
@@ -1083,7 +1083,7 @@ abstract class PaymentModuleCore extends Module
)) {
foreach ($serviceProducts as $serviceProduct) {
if ($serviceProduct['id_hotel']) {
$idOrderDetail = $objBookingDetail->getPsOrderDetailIdByIdProduct($idProduct, $order->id, Product::SELLING_PREFERENCE_HOTEL_STANDALONE);
$idOrderDetail = $objBookingDetail->getPsOrderDetailIdByIdProduct($idProduct, $order->id, Product::SELLING_PREFERENCE_WITH_HOTEL);
} else {
$idOrderDetail = $objBookingDetail->getPsOrderDetailIdByIdProduct($idProduct, $order->id, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE);
}
@@ -1247,10 +1247,10 @@ abstract class PaymentModuleCore extends Module
$total_convenience_fee_tax = $total_convenience_fee_ti - $total_convenience_fee_te;
// service products
$standalone_products_price_tax_excl = $order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE);
$standalone_products_price_tax_incl = $order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE);
$hotel_standalone_products_price_tax_excl = $order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE);
$hotel_standalone_products_price_tax_incl = $order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE);
$standalone_products_price_tax_excl = $order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_STANDALONE);
$standalone_products_price_tax_incl = $order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_STANDALONE);
$hotel_standalone_products_price_tax_excl = $order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_HOTEL);
$hotel_standalone_products_price_tax_incl = $order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_HOTEL);
$service_products_tax = ($standalone_products_price_tax_incl + $hotel_standalone_products_price_tax_incl) - ($standalone_products_price_tax_excl + $hotel_standalone_products_price_tax_excl);