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

Merge commit '05a28033f' into gli-version_upgrade

Browse Source
This commit is contained in:
shazar rahman
2026-10-30 19:26:06 +05:30
parent f375e68ddc 05a28033f2
commit 41e0266260
12 changed files with 133 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
classes/pdf/HTMLTemplateInvoice.php
View File

@@ -169,7 +169,11 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$order_detail['unit_price_tax_excl_before_specific_price'] = $order_detail['unit_price_tax_excl_including_ecotax'] + $order_detail['reduction_amount_tax_excl'];
} elseif ($order_detail['reduction_percent'] > 0) {
$has_discount = true;
$order_detail['unit_price_tax_excl_before_specific_price'] = (100 * $order_detail['unit_price_tax_excl_including_ecotax']) / (100 - $order_detail['reduction_percent']);
if ($order_detail['reduction_percent'] >= 100) {
$order_detail['unit_price_tax_excl_before_specific_price'] = $order_detail['original_product_price'];
} else {
$order_detail['unit_price_tax_excl_before_specific_price'] = (100 * $order_detail['unit_price_tax_excl_including_ecotax']) / (100 - $order_detail['reduction_percent']);
}
}
// Set tax_code

3
controllers/front/GuestTrackingController.php
View File

@@ -252,7 +252,6 @@ class GuestTrackingControllerCore extends FrontController
if ($orderProducts = $order->getProducts()) {
$total_convenience_fee_te = 0;
$total_convenience_fee_ti = 0;
$total_tourism_tax = OrderTaxDetail::getOrderTourismTaxTotal($idOrder);
$objOrderReturn = new OrderReturn();
$refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($order->id, 0, 1);
@@ -536,6 +535,7 @@ class GuestTrackingControllerCore extends FrontController
// set order specific values
$order->total_convenience_fee_ti = $total_convenience_fee_ti;
$order->total_convenience_fee_te = $total_convenience_fee_te;
$order->total_tourism_tax = OrderTaxDetail::getOrderTourismTaxTotal($idOrder);
$order->any_back_order = $anyBackOrder;
$order->shw_bo_msg = Configuration::get('WK_SHOW_MSG_ON_BO');
$order->back_ord_msg = Configuration::get('WK_BO_MESSAGE');
@@ -567,7 +567,6 @@ class GuestTrackingControllerCore extends FrontController
'use_tax' => Configuration::get('PS_TAX'),
'guestInformations' => (array)$customer,
'view_on_map' => Configuration::get('WK_GOOGLE_ACTIVE_MAP'),
'total_tourism_tax' => isset($total_tourism_tax) ? $total_tourism_tax : 0,
'show_tourism_tax_separately' => (bool) Configuration::get('QLO_TOURISM_TAX_SHOW_SEPARATE'),
));
}

2
install-dev/models/install.php
View File

@@ -721,7 +721,7 @@ class InstallModelInstall extends InstallAbstractModel
'qlostatsserviceproducts',
'blockcart',
'blockuserinfo',
'qlochannelmanagerconnector',
'qlocmconnector',
'qlogooglehotelconnector'
);
}

4
modules/blockcart/blockcart.tpl
View File

@@ -161,7 +161,7 @@
{/block}
{block name='blockcart_shopping_cart_total_convenience_fee'}
{if isset($total_convenience_fee)}
<div class="cart-prices-line">
<div class="cart-prices-line"{if !$total_convenience_fee} style="display:none"{/if}>
<span class="price cart_block_convenience_fee ajax_cart_convenience_fee">{convertPrice price=$total_convenience_fee}</span>
<span class="price">{l s='Convenience Fees' mod='blockcart'}</strong>
</div>
@@ -343,7 +343,7 @@
</div> -->
{block name='blockcart_layer_cart_total_convenience_fee'}
{if isset($total_convenience_fee)}
<div class="layer_cart_row">
<div class="layer_cart_row"{if !$total_convenience_fee} style="display:none"{/if}>
<strong class="dark">
{l s='Convenience Fees' mod='blockcart'}
{if $use_taxes && $display_tax_label}

21
modules/hotelreservationsystem/classes/HotelBookingDetail.php
View File

@@ -4423,6 +4423,7 @@ class HotelBookingDetail extends ObjectModel
*/
public static function getPaymentMethodStats(array $params)
{
$paymentMethod = isset($params['payment_method']) ? pSQL($params['payment_method']) : '';
$dateFrom = pSQL($params['date_from']);
$dateTo = pSQL(isset($params['date_to']) ? $params['date_to'] : $params['date_from']);
$idsHotel = isset($params['ids_hotel']) ? $params['ids_hotel'] : (isset($params['id_hotel']) ? $params['id_hotel'] : false);
@@ -4441,12 +4442,32 @@ class HotelBookingDetail extends ObjectModel
AND hbd.`date_add` BETWEEN "'.$dateFrom.' 00:00:00" AND "'.$dateTo.' 23:59:59"'
.($idCustomer ? ' AND hbd.`id_customer` = '.$idCustomer : '')
.($bookingType ? ' AND hbd.`booking_type` = '.$bookingType : '')
.($paymentMethod ? ' AND o.`payment` = \''.$paymentMethod.'\'' : '')
.HotelBranchInformation::addHotelRestriction($idsHotel, 'hbd').'
GROUP BY o.`payment`, o.`module`
ORDER BY revenue_incl DESC'
);
}
/**
* Distinct payment method names stored on valid hotel orders, used to filter the Payment Methods report.
*
* @param int|false $idHotel
* @return array rows: payment_method
*/
public static function getDistinctOrderPaymentMethods($idHotel = false)
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(
'SELECT DISTINCT o.`payment` AS payment_method
FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
INNER JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = hbd.`id_order` AND o.`valid` = 1)
WHERE hbd.`id_status` != '.self::STATUS_CANCELLED.' AND o.`payment` != ""'
.HotelBranchInformation::addHotelRestriction($idHotel, 'hbd').'
ORDER BY o.`payment`'
);
}
/**
* Tax breakdown per booking line for the Tax Report.
* Delegates to ServiceProductOrderDetail::getTaxBreakdown() for service revenue.

6
modules/qlocmconnector/upgrade/upgrade-5.0.5.php → modules/qlocmconnector/upgrade/upgrade-7.0.0.php
View File

@@ -25,9 +25,9 @@
if (!defined('_PS_VERSION_'))
exit;
function upgrade_module_5_0_5($module)
function upgrade_module_7_0_0($module)
{
$objCMConnector = new UpgradeQloCMConnector505($module);
$objCMConnector = new UpgradeQloCMConnector700($module);
return (
$objCMConnector->registerHooks()
&& $objCMConnector->removeOldModule()
@@ -35,7 +35,7 @@ function upgrade_module_5_0_5($module)
);
}
class UpgradeQloCMConnector505{
class UpgradeQloCMConnector700{
public function __construct($module)
{
$this->module = $module;

51
modules/qloduitkupayment/controllers/front/return.php
View File

@@ -106,31 +106,40 @@ class QloDuitkuPaymentReturnModuleFrontController extends ModuleFrontController
$this->module->logger->log('After Cart Validation in return.', FileLogger::DEBUG);
$objDuitkuTransaction->addCartLock((int) $idCart);
if (!$res) {
$objDuitkuTransaction->save();
$objDuitkuTransaction->save();
}
if ($this->module->validateOrder(
(int) $idCart,
$orderStatus,
$cartAmount,
$this->module->l('Duitku Payment', 'return'),
null,
$extraVars,
(int) $id_currency,
false,
$objCustomer->secure_key
)) {
$statusResponse = $this->module->checkDuitkuTransactionStatus($merchantOrderId);
$statusCode = isset($statusResponse['response']['statusCode']) ? $statusResponse['response']['statusCode'] : null;
$this->module->logger->log('Return Process Order created.', FileLogger::DEBUG);
if ($statusResponse['status'] === true && ($statusCode == '00' || $statusCode == '01')) {
if ($this->module->validateOrder(
(int) $idCart,
$orderStatus,
$cartAmount,
$this->module->l('Duitku Payment', 'return'),
null,
$extraVars,
(int) $id_currency,
false,
$objCustomer->secure_key
)) {
$url = $this->context->link->getPageLink('order-confirmation', true, null, [
'id_cart' => $idCart,
'id_module' => $this->module->id,
'id_order' => Order::getOrderByCartId($idCart),
'success' => 1,
'key' => $objCustomer->secure_key,
]);
Tools::redirect($url);
$this->module->logger->log('Return Process Order created.', FileLogger::DEBUG);
$url = $this->context->link->getPageLink('order-confirmation', true, null, [
'id_cart' => $idCart,
'id_module' => $this->module->id,
'id_order' => Order::getOrderByCartId($idCart),
'success' => 1,
'key' => $objCustomer->secure_key,
]);
Tools::redirect($url);
}
} else {
$this->module->logger->log('Duitku could not confirm transaction for merchantOrderId ' . $merchantOrderId, FileLogger::DEBUG);
$objDuitkuTransaction->removeCartLock($idCart);
Tools::redirect($this->context->link->getModuleLink('qloduitkupayment', 'error') . '?validation_err=1&id=' . $merchantOrderId);
}
}

28
modules/qloduitkupayment/qloduitkupayment.php
View File

@@ -446,6 +446,34 @@ class QloDuitkuPayment extends PaymentModule
);
}
/**
* Confirm a transaction's real status with Duitku's own server-to-server API, rather
* than trusting the unsigned browser return redirect. Must be called at most once per
* return hit - Duitku rate-limits repeated calls to this endpoint.
*
* @param string $merchantOrderId
*
* @return array
*/
public function checkDuitkuTransactionStatus($merchantOrderId)
{
$merchantCode = Configuration::get('QDP_DUITKU_PAYMENT_MERCHANT_CODE');
$apiKey = Configuration::get('QDP_DUITKU_PAYMENT_API_KEY');
$signature = hash_hmac('sha256', $merchantCode . $merchantOrderId, $apiKey);
$params = array(
'merchantCode' => $merchantCode,
'merchantOrderId' => $merchantOrderId,
'signature' => $signature,
);
return QdpDuitkuServiceRequest::makeRequest(
'transactionStatus',
QdpDuitkuTransaction::QDP_CURL_REQUEST_TYPE_POST,
$params
);
}
private function getCustomerPhone($customer, $addressId)
{
if (!empty($customer->phone)) {

27
modules/qlohotelreports/qlohotelreports.php
View File

@@ -760,17 +760,28 @@ class QloHotelReports extends Module
if ($report === 'source' || $report === 'payment-method') {
$bookingSource = pSQL(Tools::getValue('booking_source', ''));
$paymentMethod = pSQL(Tools::getValue('payment_method', ''));
$filterBaseUrl = $baseUrl . '&tab=' . $report
. ($idHotel ? '&id_hotel=' . $idHotel : '')
. ($bookingSource ? '&booking_source=' . $bookingSource : '');
. ($idHotel ? '&id_hotel=' . $idHotel : '');
$baseParams = array(
'date_from' => $dateFrom,
'date_to' => $dateTo,
'id_hotel' => $idHotel ?: false,
'booking_source' => $bookingSource,
'date_from' => $dateFrom,
'date_to' => $dateTo,
'id_hotel' => $idHotel ?: false,
);
if ($report === 'payment-method') {
$filterBaseUrl .= ($paymentMethod ? '&payment_method=' . urlencode($paymentMethod) : '');
$baseParams['payment_method'] = $paymentMethod;
$this->context->smarty->assign(array(
'filter_payment_method' => $paymentMethod,
'payment_methods' => HotelBookingDetail::getDistinctOrderPaymentMethods($idHotel ?: false),
));
} else {
$filterBaseUrl .= ($bookingSource ? '&booking_source=' . $bookingSource : '');
$baseParams['booking_source'] = $bookingSource;
}
$this->context->smarty->assign(array(
'filter_base_url' => $filterBaseUrl,
'filter_booking_source' => $bookingSource,
@@ -1658,6 +1669,10 @@ class QloHotelReports extends Module
'id_hotel' => $idHotel ?: false,
);
if ($report === 'payment-method') {
$baseParams['payment_method'] = pSQL(Tools::getValue('payment_method', ''));
}
if ($report === 'source') {
$rows = HotelBookingDetail::getChannelStats($baseParams);
$totalRevExcl = 0.0;

16
modules/qlohotelreports/views/templates/hook/group-channels.tpl
View File

@@ -40,6 +40,21 @@
</select>
</div>
</div>
{if $active_report == 'payment-method'}
<div class="row">
<label class="col-xs-3">{l s='Payment Method' mod='qlohotelreports'}</label>
<div class="col-xs-9">
<select name="payment_method" class="form-control">
<option value=""{if !$filter_payment_method} selected="selected"{/if}>{l s='All' mod='qlohotelreports'}</option>
{foreach $payment_methods as $pm}
<option value="{$pm.payment_method|escape:'html':'UTF-8'}"{if $filter_payment_method == $pm.payment_method} selected="selected"{/if}>
{$pm.payment_method|escape:'html':'UTF-8'}
</option>
{/foreach}
</select>
</div>
</div>
{else}
<div class="row">
<label class="col-xs-3">{l s='Booking Source' mod='qlohotelreports'}</label>
<div class="col-xs-9">
@@ -48,6 +63,7 @@
placeholder="{l s='All sources' mod='qlohotelreports'}">
</div>
</div>
{/if}
<div class="actions">
<hr>
<span class="pull-right">

1
themes/hotel-reservation-theme/guest-tracking.tpl
View File

@@ -64,6 +64,7 @@
{assign var=hotel_address_info value=$order->hotel_address_info}
{assign var=hotel_refund_rules value=$order->hotel_refund_rules}
{assign var=property_type value=$order->property_type}
{assign var=total_tourism_tax value=$order->total_tourism_tax}
{if isset($order->total_old)}
{assign var=total_old value=$order->total_old}

8
themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
View File

@@ -161,8 +161,8 @@
{/if}
{/block}
{block name='blockcart_shopping_cart_total_convenience_fee'}
{if isset($total_convenience_fee) && $total_convenience_fee}
<div class="cart-prices-line">
{if isset($total_convenience_fee)}
<div class="cart-prices-line"{if !$total_convenience_fee} style="display:none"{/if}>
<span class="price cart_block_convenience_fee ajax_cart_convenience_fee">{convertPrice price=$total_convenience_fee}</span>
<span class="price">{l s='Convenience Fees' mod='blockcart'}</strong>
</div>
@@ -343,8 +343,8 @@
</span>
</div> -->
{block name='blockcart_layer_cart_total_convenience_fee'}
{if isset($total_convenience_fee) && $total_convenience_fee}
<div class="layer_cart_row">
{if isset($total_convenience_fee)}
<div class="layer_cart_row"{if !$total_convenience_fee} style="display:none"{/if}>
<strong class="dark">
{l s='Convenience Fees' mod='blockcart'}
{if $use_taxes && $display_tax_label}