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

Merge pull request #619 from shreesh-webkul/gli-1212

Browse Source 
Show service cost separately from room cost on checkout page
This commit is contained in:
Rohit Jain
2023-03-28 19:44:08 +05:30
committed by GitHub
parent 072d456917 2e38cedcd1
commit 7eb7ae8c5c
9 changed files with 109 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
classes/Cart.php
View File

@@ -3783,7 +3783,20 @@ class CartCore extends ObjectModel
}
}
$discountedProducts = array();
foreach ($cart_rules as $key => &$cart_rule) {
$product_rule_groups = $cart_rule['obj']->getProductRuleGroups();
foreach ($product_rule_groups as $id_product_rule_group => $product_rule_group) {
if (isset($product_rule_group['product_rules']) && $product_rule_group['product_rules']) {
foreach($product_rule_group['product_rules'] as $rule_products) {
if ($rule_products['type'] == 'products') {
$discountedProducts = array_merge($discountedProducts, $rule_products['values']);
}
}
}
}
if (((float)$cart_rule['value_real'] == 0 && (int)$cart_rule['free_shipping'] == 0)) {
unset($cart_rules[$key]);
}
@@ -3823,6 +3836,7 @@ class CartCore extends ObjectModel
'total_price' => $base_total_tax_inc,
'total_tax' => $total_tax,
'total_price_without_tax' => $base_total_tax_exc,
'discounted_products' => $discountedProducts,
'is_multi_address_delivery' => $this->isMultiAddressDelivery() || ((int)Tools::getValue('multi-shipping') == 1),
'free_ship' =>!$total_shipping && !count($this->getDeliveryAddressesWithoutCarriers(true, $errors)),
'carrier' => new Carrier($this->id_carrier, $id_lang),

1
classes/controller/FrontController.php
View File

@@ -1083,6 +1083,7 @@ class FrontControllerCore extends Controller
$this->addjqueryPlugin('fancybox');
$this->addJS(_PS_JS_DIR_.'hookLiveEdit.js');
}
$this->addJqueryUI('ui.tooltip', 'base', true);
if (Configuration::get('PS_QUICK_VIEW')) {
$this->addjqueryPlugin('fancybox');

9
controllers/admin/AdminOrderPreferencesController.php
View File

@@ -151,7 +151,14 @@ class AdminOrderPreferencesControllerCore extends AdminController
'list' => $cms_tab,
'identifier' => 'id',
'cast' => 'intval'
)
),
'PS_ROOM_PRICE_AUTO_ADD_BREAKDOWN' => array(
'title' => $this->l('Show room price breakdown'),
'hint' => $this->l('Show a summary for prices of the auto added service add with room on shopping cart list.'),
'desc' => $this->l('This breakdown is always visible on room that have cart rule applied for that specific room.'),
'cast' => 'intval',
'type' => 'bool'
),
),
'submit' => array('title' => $this->l('Save'))
),

2
controllers/front/OrderOpcController.php
View File

@@ -466,6 +466,7 @@ class OrderOpcControllerCore extends ParentOrderController
// 'defaultcurrencySign' => $objCurrency->sign,
'THEME_DIR' => _THEME_DIR_,
'PS_CUSTOMER_ADDRESS_CREATION' => Configuration::get('PS_CUSTOMER_ADDRESS_CREATION'),
'PS_ROOM_PRICE_AUTO_ADD_BREAKDOWN' => Configuration::get('PS_ROOM_PRICE_AUTO_ADD_BREAKDOWN'),
'free_shipping' => $free_shipping,
'isGuest' => isset($this->context->cookie->is_guest) ? $this->context->cookie->is_guest : 0,
'countries' => $countries,
@@ -556,6 +557,7 @@ class OrderOpcControllerCore extends ParentOrderController
if (!empty($cartProducts)) {
if ($cartBookingInfo = HotelCartBookingData::getHotelCartBookingData()) {
// ddd($cartBookingInfo);
$this->context->smarty->assign('cart_htl_data', $cartBookingInfo);
}
$objHotelServiceProductCartDetail = new HotelServiceProductCartDetail();

2
controllers/front/ProductController.php
View File

@@ -62,8 +62,6 @@ class ProductControllerCore extends FrontController
$this->addCSS(_THEME_CSS_DIR_.'occupancy.css');
$this->addJS(_THEME_JS_DIR_.'occupancy.js');
$this->addJqueryUI('ui.tooltip', 'base', true);
if (Configuration::get('PS_DISPLAY_JQZOOM') == 1) {
$this->addJqueryPlugin('jqzoom');
}

28
modules/hotelreservationsystem/classes/HotelCartBookingData.php
View File

@@ -1335,12 +1335,26 @@ class HotelCartBookingData extends ObjectModel
$data_v['date_from'],
$data_v['date_to']
);
$roomTypeDateRangePriceWithoutAutoAdd = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice(
$product['id_product'],
$data_v['date_from'],
$data_v['date_to'],
0,
0,
0,
0,
0,
0
);
if (!$price_tax) {
$amount = $roomTypeDateRangePrice['total_price_tax_excl'];
$amountWithoutAutoAdd = $roomTypeDateRangePriceWithoutAutoAdd['total_price_tax_excl'];
} else {
$amount = $roomTypeDateRangePrice['total_price_tax_incl'];
$amountWithoutAutoAdd = $roomTypeDateRangePriceWithoutAutoAdd['total_price_tax_incl'];
}
$cartHotelData[$prodKey]['date_diff'][$dateJoin]['amount'] = $amount * $varQty;
$cartHotelData[$prodKey]['date_diff'][$dateJoin]['amount_without_auto_add'] = $amountWithoutAutoAdd * $varQty;
} else {
$cartHotelData[$prodKey]['date_diff'][$dateJoin]['demand_price'] = $totalAdditionalServicePrice;
$numDays = $objBookingDetail->getNumberOfDays($data_v['date_from'], $data_v['date_to']);
@@ -1363,12 +1377,26 @@ class HotelCartBookingData extends ObjectModel
$data_v['date_from'],
$data_v['date_to']
);
$roomTypeDateRangePriceWithoutAutoAdd = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice(
$product['id_product'],
$data_v['date_from'],
$data_v['date_to'],
0,
0,
0,
0,
0,
0
);
if (!$price_tax) {
$amount = $roomTypeDateRangePrice['total_price_tax_excl'];
$amountWithoutAutoAdd = $roomTypeDateRangePriceWithoutAutoAdd['total_price_tax_excl'];
} else {
$amount = $roomTypeDateRangePrice['total_price_tax_incl'];
$amountWithoutAutoAdd = $roomTypeDateRangePriceWithoutAutoAdd['total_price_tax_incl'];
}
$cartHotelData[$prodKey]['date_diff'][$dateJoin]['amount'] = $amount;
$cartHotelData[$prodKey]['date_diff'][$dateJoin]['amount_without_auto_add'] = $amountWithoutAutoAdd;
$cartHotelData[$prodKey]['date_diff'][$dateJoin]['link'] = $context->link->getPageLink(
'order-opc',
null,

8
themes/hotel-reservation-theme/css/global.css
View File

@@ -8505,6 +8505,14 @@ div.star.star_hover:after {
content: "\f057";
font-family: "FontAwesome"; }
body .ui-tooltip {
box-shadow: 0 2px 6px 0 rgb(0 0 0 / 20%);
background: #FFFFFF;
border: unset;
color: #333;
padding: 10px 15px;
}
#facebook_block,
#cmsinfo_block {
overflow: hidden;

37
themes/hotel-reservation-theme/js/order-opc.js
View File

@@ -33,6 +33,43 @@ $(document).ready(function()
$(this).closest('.card').find('.step-edit').addClass('hidden');
});
// room price details tooltip
if ($('.room_price_detail_block .room-price-detail').length) {
$('.room_price_detail_block .room-price-detail img').tooltip({
content: $('.room_price_detail_block .room-price-detail-container').html(),
items: "span",
trigger : 'hover',
tooltipClass: "room-price-detail-tooltip",
open: function(event, ui)
{
if (typeof(event.originalEvent) === 'undefined')
{
return false;
}
var $id = $(ui.tooltip).attr('id');
if ($('div.ui-tooltip').not('#' + $id).length) {
return false;
}
},
close: function(event, ui)
{
ui.tooltip.hover(function()
{
$(this).stop(true).fadeTo(400, 1);
},
function()
{
$(this).fadeOut('400', function()
{
$(this).remove();
});
});
}
});
}
// BY WEBKUL
// FOR ADVANCED PAYMENT
var payment_type = $(".payment_type:checked").val();

11
themes/hotel-reservation-theme/shopping-cart.tpl
View File

@@ -150,6 +150,17 @@
<span>
{displayPrice price=($rm_v['amount'])}
</span>
{if (($rm_v['amount'] - $rm_v['amount_without_auto_add']) > 0) && (in_array($data_v['id_product'], $discounted_products) || $PS_ROOM_PRICE_AUTO_ADD_BREAKDOWN)}
<span class="room-price-detail">
<img src="{$img_dir}icon/icon-info.svg" />
</span>
<div class="room-price-detail-container" style="display: none;">
<div class="room-price-detail-tooltip-cont">
<div><label>{l s='Room price'}</label> : {displayPrice price=($rm_v['amount_without_auto_add'])}</div>
<div><label>{l s='Additional charges'}</label> : {displayPrice price=($rm_v['amount'] - $rm_v['amount_without_auto_add'])}</div>
</div>
</div>
{/if}
{if (isset($data_v['extra_demands']) && $data_v['extra_demands']) || (isset($data_v['service_products']) && $data_v['service_products'])}
<span class="plus-sign pull-right">
+