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

Merge pull request #1265 from sumitwebkul/book_noww_testing_issues

Browse Source 
Fixed: Issues in the Booking process from back-office
This commit is contained in:
Rohit Jain
2024-10-04 19:08:45 +05:30
committed by GitHub
parent 534f28d282 439e395d0b
commit b0cc856363
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
classes/order/OrderInvoice.php
View File

@@ -1011,12 +1011,24 @@ class OrderInvoiceCore extends ObjectModel
{
$cache_id = 'order_invoice_paid_'.(int)$this->id;
if (!Cache::isStored($cache_id)) {
$objOrder = new Order($this->id_order);
$amount = 0;
$payments = OrderPaymentDetail::getByInvoiceId($this->id);
foreach ($payments as $payment) {
/** @var OrderPayment $payment */
$amount += ($payment['amount'] / $payment['conversion_rate']);
if ($payment['id_currency'] == $objOrder->id_currency) {
$amount += $payment['amount'];
} else {
$amountConverted = Tools::convertPrice($payment['amount'], $payment['id_currency'], false);
if ($objOrder->id_currency == Configuration::get('PS_CURRENCY_DEFAULT')) {
$amount += $amountConverted;
} else {
$amount += Tools::convertPrice($amountConverted, $objOrder->id_currency, true);
}
}
}
Cache::store($cache_id, $amount);
return $amount;
}

7
modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php
View File

@@ -750,12 +750,9 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
$id_room
)) {
$selectedServices = array_shift($roomServicesServices);
$totalPrice['total_price_tax_incl'] += $selectedServices['total_price_tax_incl'];
$totalPrice['total_price_tax_excl'] += $selectedServices['total_price_tax_excl'];
}
}
if (isset($selectedServices)) {
$totalPrice['total_price_tax_incl'] += $selectedServices['total_price_tax_incl'];
$totalPrice['total_price_tax_excl'] += $selectedServices['total_price_tax_excl'];
} else {
if ($servicesWithTax = RoomTypeServiceProduct::getAutoAddServices(
$id_product,