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

Merge pull request #1835 from amitsharma322/gli-3123

Browse Source 
Fixed: Resolve undefined variable warning on frontend Order Detail page
This commit is contained in:
Rohit Jain
2026-09-25 20:18:41 +05:30
committed by GitHub
parent 47e7d63c5d a16fd4679f
commit 611c01c87a
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
controllers/front/GuestTrackingController.php
View File

@@ -121,6 +121,7 @@ class GuestTrackingControllerCore extends FrontController
&& ($dateFrom = Tools::getValue('date_from'))
&& ($dateTo = Tools::getValue('date_to'))
) {
$objRoomType = new HotelRoomType();
$useTax = 0;
if (Group::getPriceDisplayMethod($this->context->customer->id_default_group) == PS_TAX_INC) {
$useTax = 1;
@@ -144,8 +145,10 @@ class GuestTrackingControllerCore extends FrontController
));
}
$roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($idProduct);
$this->context->smarty->assign(array(
'objOrder' => new Order($idOrder),
'room_type_info' => $roomTypeInfo,
));
$response['extra_services'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order-extra-services.tpl');
@@ -280,6 +283,12 @@ class GuestTrackingControllerCore extends FrontController
$cartHotelData[$type_key]['id_product'] = $type_value['product_id'];
$cartHotelData[$type_key]['cover_img'] = $cover_img;
// Prefer the name stored at order-creation time so it stays historically accurate
if (!empty($order_bk_data[0]['selling_object_name'])) {
$cartHotelData[$type_key]['selling_object_name'] = $order_bk_data[0]['selling_object_name'];
$cartHotelData[$type_key]['selling_object_plural_name'] = $order_bk_data[0]['selling_object_plural_name'];
}
foreach ($order_bk_data as $data_k => $data_v) {
$date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']);
@@ -538,6 +547,7 @@ class GuestTrackingControllerCore extends FrontController
$order->obj_hotel_branch_information = $objHotelBranchInformation;
$order->hotel_address_info = $hotelAddressInfo;
$order->hotel_refund_rules = $hotelRefundRules;
$order->property_type = $objHotelBranchInformation ? $objHotelBranchInformation->propertyTypeName : null;
//end
Hook::exec('actionOrderDetail', array('carrier' => $order->carrier, 'order' => $order));

5
controllers/front/OrderDetailController.php
View File

@@ -99,7 +99,6 @@ class OrderDetailControllerCore extends FrontController
$total_convenience_fee_te = 0;
$total_convenience_fee_ti = 0;
$roomTypes = array();
$propertyType = null;
$objOrderReturn = new OrderReturn();
$refundedAmount = 0;
$refundedAmount = $objOrderReturn->getRefundedAmount($order->id);
@@ -242,7 +241,6 @@ class OrderDetailControllerCore extends FrontController
$cartHotelData[$type_key]['date_diff'][$date_join]['feature_price_diff'] = $feature_price_diff;
$cartHotelData[$type_key]['hotel_name'] = $data_v['hotel_name'];
$propertyType = $data_v['property_type_name'];
// add extra services products in hotel detail.
$cartHotelData[$type_key]['date_diff'][$date_join]['additional_services'] = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
$id_order,
@@ -423,9 +421,10 @@ class OrderDetailControllerCore extends FrontController
// Prefer the name stored at order-creation time so it stays historically accurate
$objHotelBranchRefundRules = new HotelBranchRefundRules();
$hotelRefundRules = $objHotelBranchRefundRules->getHotelRefundRules($idHotel, 0, 1);
$order->property_type = $objHotelBranchInformation->propertyTypeName;
$this->context->smarty->assign(array(
'obj_hotel_branch_information' => $objHotelBranchInformation,
'property_type' => $propertyType,
'property_type' => $objHotelBranchInformation->propertyTypeName,
'hotel_address_info' => $hotelAddressInfo,
'hotel_refund_rules' => $hotelRefundRules,
));

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

@@ -63,6 +63,7 @@
{assign var=obj_hotel_branch_information value=$order->obj_hotel_branch_information}
{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}
{if isset($order->total_old)}
{assign var=total_old value=$order->total_old}

2
themes/hotel-reservation-theme/order-detail.tpl
View File

@@ -1030,7 +1030,7 @@
</label>
<span>({$hotel_booking_detail.adults|string_format:'%02d'} {if $hotel_booking_detail.adults > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if $hotel_booking_detail.children > 0}{l s=', '}{$hotel_booking_detail.children|string_format:'%02d'} {if $hotel_booking_detail.children > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if})</span>
{if $hotel_booking_detail.is_cancelled}<span class="badge badge-danger badge-cancelled">{l s='Cancelled'}</span>{else if $hotel_booking_detail.is_refunded}<span class="badge badge-danger badge-cancelled">{l s='Refunded'}</span>{else if $hotel_booking_detail.refund_denied}<span class="badge badge-danger badge-cancelled">{l s='Refund denied'}</span> {include file='_partials/htl-tooltip.tpl' tooltip_content={l s='Refund for this booking is denied. Please contact admin for more detail.'}}{else if $hotel_booking_detail.id_status != $ROOM_STATUS_ALLOTED}<span class="badge badge-danger badge-cancelled">{if $hotel_booking_detail.id_status == $ROOM_STATUS_CHECKED_OUT}{l s='Checked-Out'}{else}{l s='Checked-In'}{/if}</span>{/if}
{if $hotel_booking_detail.is_cancelled}<span class="badge badge-danger badge-cancelled">{l s='Cancelled'}</span>{else if $hotel_booking_detail.is_refunded}<span class="badge badge-danger badge-cancelled">{l s='Refunded'}</span>{else if $hotel_booking_detail.refund_denied}<span class="badge badge-danger badge-cancelled">{l s='Refund denied'}</span> {include file='_partials/htl-tooltip.tpl' tooltip_content={l s='Refund for this booking is denied. Please contact admin for more detail.'}}{else if $hotel_booking_detail.id_status != $ROOM_STATUS_ASSIGNED}<span class="badge badge-danger badge-cancelled">{if $hotel_booking_detail.id_status == $ROOM_STATUS_CHECKED_OUT}{l s='Checked-Out'}{else}{l s='Checked-In'}{/if}</span>{/if}
</div>
</div>