Fix price calculation in order confirmation email
This commit is contained in:
@@ -541,6 +541,7 @@ abstract class PaymentModuleCore extends Module
|
||||
|
||||
$product_var_tpl_list = array();
|
||||
$orderServiceProducts = array();
|
||||
$processedServiceProductCartIds = array();
|
||||
$objProduct = new Product();
|
||||
|
||||
foreach ($order->product_list as $product) {
|
||||
@@ -591,11 +592,11 @@ abstract class PaymentModuleCore extends Module
|
||||
}
|
||||
|
||||
if (
|
||||
!$product['booking_product']
|
||||
!$product['booking_product'] && !$product['id_hotel_cart_booking']
|
||||
&& (
|
||||
Product::isSellableAsStandalone($product['selling_preference_type'])
|
||||
|| Product::isSellableWithHotel($product['selling_preference_type'])
|
||||
)
|
||||
)
|
||||
) {
|
||||
$cover_image_arr = $objProduct->getCover($product['id_product']);
|
||||
|
||||
@@ -613,7 +614,8 @@ abstract class PaymentModuleCore extends Module
|
||||
null,
|
||||
$product['id_product']
|
||||
);
|
||||
|
||||
$standaloneServiceProducts = array();
|
||||
$hotelServiceProducts = array();
|
||||
foreach ($serviceProducts as $serviceProduct) {
|
||||
$orderServiceProducts[] = array_merge($product_var_tpl, $serviceProduct);
|
||||
}
|
||||
@@ -1402,28 +1404,52 @@ abstract class PaymentModuleCore extends Module
|
||||
$normal_products_data_txt = $this->getEmailTemplateContent('service_product_data_text.tpl', Mail::TYPE_TEXT, $orderServiceProducts);
|
||||
|
||||
// get order total information html/txt files
|
||||
// room-related selling types:
|
||||
// 1: with room type, 3: hotel+room, 6: standalone+room, 7: hotel+room+standalone
|
||||
$roomRelatedSellingTypes = array(
|
||||
Product::SELLING_PREFERENCE_WITH_ROOM_TYPE,
|
||||
Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE,
|
||||
Product::SELLING_PREFERENCE_STANDALONE_AND_WITH_ROOM_TYPE,
|
||||
Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE_AND_WITH_STANDALONE,
|
||||
);
|
||||
|
||||
// total room price
|
||||
$room_price_tax_excl = $order->getTotalProductsWithoutTaxes(false, true) + $order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM);
|
||||
$room_price_tax_incl = $order->getTotalProductsWithTaxes(false, true) + $order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM);
|
||||
$room_auto_with_room_tax_excl = 0;
|
||||
$room_auto_with_room_tax_incl = 0;
|
||||
foreach ($roomRelatedSellingTypes as $sellingType) {
|
||||
$room_auto_with_room_tax_excl += $order->getTotalProductsWithoutTaxes(false, false, $sellingType, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM);
|
||||
$room_auto_with_room_tax_incl += $order->getTotalProductsWithTaxes(false, false, $sellingType, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM);
|
||||
}
|
||||
$room_price_tax_excl = $order->getTotalProductsWithoutTaxes(false, true) + $room_auto_with_room_tax_excl;
|
||||
$room_price_tax_incl = $order->getTotalProductsWithTaxes(false, true) + $room_auto_with_room_tax_incl;
|
||||
$room_tax = ($room_price_tax_incl - $room_price_tax_excl);
|
||||
|
||||
// extra services
|
||||
$additional_service_price_tax_excl = ($order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0) + $cart_booking_data['total_extra_demands_te']);
|
||||
$additional_service_price_tax_incl = ($order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0) + $cart_booking_data['total_extra_demands_ti']);
|
||||
$additional_service_price_tax_excl = (float) $cart_booking_data['total_extra_demands_te'];
|
||||
$additional_service_price_tax_incl = (float) $cart_booking_data['total_extra_demands_ti'];
|
||||
foreach ($roomRelatedSellingTypes as $sellingType) {
|
||||
$additional_service_price_tax_excl += $order->getTotalProductsWithoutTaxes(false, false, $sellingType, 0, Product::PRICE_ADDITION_TYPE_INDEPENDENT);
|
||||
$additional_service_price_tax_incl += $order->getTotalProductsWithTaxes(false, false, $sellingType, 0, Product::PRICE_ADDITION_TYPE_INDEPENDENT);
|
||||
}
|
||||
$additional_service_tax = ($additional_service_price_tax_incl - $additional_service_price_tax_excl);
|
||||
|
||||
// convenience fee price
|
||||
$total_convenience_fee_ti = $order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT);
|
||||
$total_convenience_fee_te = $order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT);
|
||||
$total_convenience_fee_ti = 0;
|
||||
$total_convenience_fee_te = 0;
|
||||
foreach ($roomRelatedSellingTypes as $sellingType) {
|
||||
$total_convenience_fee_ti += $order->getTotalProductsWithTaxes(false, false, $sellingType, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT);
|
||||
$total_convenience_fee_te += $order->getTotalProductsWithoutTaxes(false, false, $sellingType, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT);
|
||||
}
|
||||
$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);
|
||||
|
||||
$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);
|
||||
$all_services_price_tax_incl = $order->getTotalProductsWithTaxes(false, false);
|
||||
$all_services_price_tax_excl = $order->getTotalProductsWithoutTaxes(false, false);
|
||||
$room_linked_services_price_tax_incl = $order->getTotalProductsWithTaxes(false, false, null, null, null, null, Order::SERVICE_PRODUCT_CONTEXT_ROOM_LINKED);
|
||||
$room_linked_services_price_tax_excl = $order->getTotalProductsWithoutTaxes(false, false, null, null, null, null, Order::SERVICE_PRODUCT_CONTEXT_ROOM_LINKED);
|
||||
$total_standard_products_tax_incl = $all_services_price_tax_incl - $room_linked_services_price_tax_incl;
|
||||
$total_standard_products_tax_excl = $all_services_price_tax_excl - $room_linked_services_price_tax_excl;
|
||||
$service_products_tax = $total_standard_products_tax_incl - $total_standard_products_tax_excl;
|
||||
|
||||
$total_order_tax = $room_tax + $additional_service_tax + $total_convenience_fee_tax + $service_products_tax;
|
||||
|
||||
@@ -1440,12 +1466,12 @@ abstract class PaymentModuleCore extends Module
|
||||
'total_convenience_fee_te' => Tools::displayPrice($total_convenience_fee_te, $this->context->currency, false),
|
||||
'total_convenience_fee_tax' => Tools::displayPrice($total_convenience_fee_tax, $this->context->currency, false),
|
||||
'service_products_price_tax_excl' => Tools::displayPrice(
|
||||
($standalone_products_price_tax_excl + $hotel_standalone_products_price_tax_excl),
|
||||
$total_standard_products_tax_excl,
|
||||
$this->context->currency,
|
||||
false
|
||||
),
|
||||
'service_products_price_tax_incl' => Tools::displayPrice(
|
||||
($standalone_products_price_tax_incl + $hotel_standalone_products_price_tax_incl),
|
||||
$total_standard_products_tax_incl,
|
||||
$this->context->currency,
|
||||
false
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user