updated refund details on admin and backoffice pages

This commit is contained in:
Shreesh Arora
2023-03-30 14:49:52 +05:30
parent 2eca1a3c3a
commit e95180b995
9 changed files with 103 additions and 53 deletions

View File

@@ -221,10 +221,14 @@
</div>
{/if}
</td>
{if isset($refundReqBookings) && $refundReqBookings}
{if (isset($refundReqBookings) && $refundReqBookings) || (isset($isCancelledRoom) && $isCancelledRoom)}
<td class="text-center">
{if isset($data.refund_info) && $data.refund_info}
{if $data.is_cancelled}
<span class="badge badge-danger">{l s='Cancelled'}</span>
{elseif isset($data.refund_info) && $data.refund_info}
<span class="badge" style="background-color:{$data.refund_info.color|escape:'html':'UTF-8'}">{$data.refund_info.name|escape:'html':'UTF-8'}</span>
{else}
<span>--</span>
{/if}
</td>
<td class="text-center">
@@ -233,15 +237,6 @@
{/if}
</td>
{/if}
{if isset($isCancelledRoom) && $isCancelledRoom}
<td>
{if $data.is_refunded}
<span class="badge badge-danger">{l s='Cancelled'}</span>
{else}
<span>--</span>
{/if}
</td>
{/if}
{if ($can_edit && !$order->hasBeenDelivered())}
<td class="product_invoice" style="display: none;">
{if sizeof($invoices_collection)}
@@ -256,7 +251,7 @@
&nbsp;
{/if}
</td>
<td class="product_action text-right fixed-width-md">
<td class="product_action text-right">
{* edit/delete controls *}
<div class="btn-group pull-right">
<button type="button" class="btn btn-default edit_room_change_link">

View File

@@ -16,15 +16,12 @@
<th class="text-center"><span class="title_box">{l s='Extra Services/Fee (Tax excl.)'}</span></th>
<th class="text-center"><span class="title_box">{l s='Total Tax'}</span></th>
<th class="text-center"><span class="title_box">{l s='Total Price (Tax incl.)'}</span></th>
{if isset($refundReqBookings) && $refundReqBookings}
<th class="text-center"><span class="title_box">{l s='Refund State'}</span></th>
{if (isset($refundReqBookings) && $refundReqBookings) || (isset($isCancelledRoom) && $isCancelledRoom)}
<th class="text-center"><span class="title_box">{l s='Refund/Cancellation Status'}</span></th>
<th class="text-center"><span class="title_box">{l s='Refunded amount'}</span></th>
{/if}
{if isset($isCancelledRoom) && $isCancelledRoom}
<th class="text-center"><span class="title_box">{l s='Room Status'}</span></th>
{/if}
{if ($can_edit && !$order->hasBeenDelivered())}
<th class="text-center"><span class="title_box">{l s='Edit Order'}</th>
<th class="text-center fixed-width-lg"><span class="title_box">{l s='Edit Order'}</th>
{/if}
</tr>
</thead>

View File

@@ -265,10 +265,12 @@ class OrderReturnCore extends ObjectModel
}
$sql = 'SELECT orr.`id_order`, orr.`state`, orr.`id_order_return`, orr.`payment_mode`, orr.`id_transaction`,
orr.`id_return_type`, orr.`return_type`, ors.`id_cart_rule`, orr.`date_add`, orr.`date_upd`,
COUNT(ord.`id_order_return_detail`) AS total_rooms
hbd.`is_cancelled`, COUNT(ord.`id_order_return_detail`) AS total_rooms
FROM `'._DB_PREFIX_.'order_return` orr
LEFT JOIN `'._DB_PREFIX_.'order_return_detail` ord
ON (ord.`id_order_return` = orr.`id_order_return`)
LEFT JOIN `'._DB_PREFIX_.'htl_booking_detail` hbd
ON (hbd.`id` = ord.`id_htl_booking`)
LEFT JOIN `'._DB_PREFIX_.'order_slip` ors
ON (ors.`id_order_slip` = orr.`id_return_type` AND orr.`return_type` = '.(int) self::RETURN_TYPE_ORDER_SLIP.')
WHERE orr.`id_customer` = '.(int)$customer_id.

View File

@@ -253,7 +253,7 @@ class AdminOrdersControllerCore extends AdminController
}
$occupancyRequiredForBooking = false;
if (Configuration::get('PS_BACKOFFICE_ROOM_BOOKING_TYPE') == HotelBookingDetail::PS_FRONT_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) {
if (Configuration::get('PS_BACKOFFICE_ROOM_BOOKING_TYPE') == HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) {
$occupancyRequiredForBooking = true;
}
@@ -2714,7 +2714,7 @@ class AdminOrdersControllerCore extends AdminController
$objCartBookingData = new HotelCartBookingData();
$objCartBookingData->id_cart = $this->context->cart->id;
$objCartBookingData->id_guest = $this->context->cookie->id_guest;
$objCartBookingData->id_customer = $this->context->customer->id;
$objCartBookingData->id_customer = $order->id_customer;
$objCartBookingData->id_currency = $order->id_currency;
$objCartBookingData->id_product = $room_info['id_product'];
$objCartBookingData->id_room = $room_info['id_room'];
@@ -3042,7 +3042,7 @@ class AdminOrdersControllerCore extends AdminController
$objBookingDetail->id_cart = $this->context->cart->id;
$objBookingDetail->id_room = $objCartBookingData->id_room;
$objBookingDetail->id_hotel = $objCartBookingData->id_hotel;
$objBookingDetail->id_customer = $this->context->customer->id;
$objBookingDetail->id_customer = $order->id_customer;
$objBookingDetail->booking_type = $objCartBookingData->booking_type;
$objBookingDetail->id_status = 1;
$objBookingDetail->comment = $objCartBookingData->comment;

View File

@@ -389,6 +389,13 @@ class OrderDetailControllerCore extends FrontController
if ($data_v['is_back_order']) {
$anyBackOrder = 1;
}
if ($data_v['is_refunded']) {
$cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] += 1;
}
if ($data_v['is_cancelled']) {
$cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] += 1;
$cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] -= 1;
}
} else {
$num_days = $objBookingDetail->getNumberOfDays($data_v['date_from'], $data_v['date_to']);
$cartHotelData[$type_key]['date_diff'][$date_join]['num_rm'] = 1;
@@ -408,6 +415,15 @@ class OrderDetailControllerCore extends FrontController
if ($data_v['is_back_order']) {
$anyBackOrder = 1;
}
$cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] = 0;
$cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] = 0;
if ($data_v['is_refunded']) {
$cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] += 1;
}
if ($data_v['is_cancelled']) {
$cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] += 1;
$cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] -= 1;
}
}
$cartHotelData[$type_key]['date_diff'][$date_join]['is_refunded'] = $data_v['is_refunded'];
@@ -588,8 +604,6 @@ class OrderDetailControllerCore extends FrontController
$objHotelBookingDetail = new HotelBookingDetail();
$htlBookingDetail = $objHotelBookingDetail->getOrderCurrentDataByOrderId($order->id);
$isCancelledRoom = in_array(true, array_column($htlBookingDetail, 'is_cancelled'));
$this->context->smarty->assign(
array(
'id_cms_refund_policy' => Configuration::get('WK_GLOBAL_REFUND_POLICY_CMS'),
@@ -605,7 +619,6 @@ class OrderDetailControllerCore extends FrontController
'cart_htl_data' => $cartHotelData,
'cart_service_products' => $cartServiceProducts,
'non_requested_rooms' => $nonRequestedRooms,
'isCancelledRoom' => $isCancelledRoom,
)
);
// }

View File

@@ -51,11 +51,17 @@ class OrderReturnControllerCore extends FrontController
$orderCurrency = new Currency($objOrder->id_currency);
$refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrderReturn->id_order, $objOrderReturn->id, 0, 1);
$isCanceled = false;
if (count(array_unique(array_column($refundReqBookings, 'is_cancelled'))) === 1
&& array_unique(array_column($refundReqBookings, 'is_cancelled'))[0] != 0
) {
$isCanceled = true;
}
$this->context->smarty->assign(
array (
'orderReturnInfo' => (array)$objOrderReturn,
'refundReqBookings' => $refundReqBookings,
'isCanceled' => $isCanceled,
'orderInfo' => (array) $objOrder,
'orderCurrency' => (array) $orderCurrency,
'currentStateInfo' => (array) new OrderReturnState($objOrderReturn->state,

View File

@@ -363,9 +363,6 @@
<th>{l s='Room Capacity'}</th>
<th>{l s='Check-in Date'}</th>
<th>{l s='Check-out Date'}</th>
{if isset($isCancelledRoom) && $isCancelledRoom}
<th class="text-center"><span class="title_box">{l s='Room Status'}</span></th>
{/if}
<th>{l s='Extra Services'}</th>
<th class="cart_total">{l s='Total'}</th>
</tr>
@@ -402,18 +399,19 @@
<td>{$data_v['hotel_name']|escape:'html':'UTF-8'}</td>
<td class="text-center">
<p>
{if $data_v['adults'] <= 9}0{$data_v['adults']}{else}{$data_v['adults']}{/if} {if $data_v['adults'] > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if $data_v['children']}, {if $data_v['children'] <= 9}0{$data_v['children']}{else} {$data_v['children']}{/if} {if $data_v['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if}<br>{if $rm_v['num_rm'] <= 9}0{/if}{$rm_v['num_rm']} {if $rm_v['num_rm'] > 1}{l s='Rooms'}{else}{l s='Room'}{/if}
{if $rm_v['adults'] <= 9}0{$rm_v['adults']}{else}{$rm_v['adults']}{/if} {if $rm_v['adults'] > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if $rm_v['children']}, {if $rm_v['children'] <= 9}0{$rm_v['children']}{else} {$rm_v['children']}{/if} {if $rm_v['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if}<br>{if $rm_v['num_rm'] <= 9}0{/if}{$rm_v['num_rm']} {if $rm_v['num_rm'] > 1}{l s='Rooms'}{else}{l s='Room'}{/if}
</p>
{if $rm_v['count_cancelled'] > 0}
<span class="badge badge-danger">{$rm_v['count_cancelled']} {l s='Room(s) Cancelled'}</span>
<br>
{/if}
{if $rm_v['count_refunded'] > 0}
<span class="badge badge-danger">{$rm_v['count_refunded']} {l s='Room(s) Refunded'}</span>
{/if}
</td>
<td class="text-center">{$rm_v['data_form']|date_format:"%d-%m-%Y"}</td>
<td class="text-center">{$rm_v['data_to']|date_format:"%d-%m-%Y"}</td>
{if isset($isCancelledRoom) && $isCancelledRoom}
<td>
{if $rm_v['is_refunded']}
<span class="badge badge-danger">{l s='Cancelled'}</span>
{/if}
</td>
{/if}
<td>
{if (isset($rm_v['extra_demands']) && $rm_v['extra_demands']) || isset($rm_v['additional_services']) && $rm_v['additional_services']}
<a data-date_from="{$rm_v['data_form']}" data-date_to="{$rm_v['data_to']}" data-id_product="{$data_v['id_product']}" data-id_order="{$order->id}" data-action="{$link->getPageLink('order-detail')}" class="open_rooms_extra_services_panel" href="#rooms_type_extra_services_form">

View File

@@ -61,7 +61,13 @@
{$return.total_rooms|escape:'html':'UTF-8'}
</td>
<td>
<span class="badge wk-badge" style="background-color:{$return.state_color|escape:'html':'UTF-8'}">{$return.state_name|escape:'html':'UTF-8'}</span>
<span class="badge wk-badge" style="background-color:{$return.state_color|escape:'html':'UTF-8'}">
{if $return.is_cancelled}
{l s='Cancelled'}
{else}
{$return.state_name|escape:'html':'UTF-8'}
{/if}
</span>
</td>
<td>
{dateFormat date=$return.date_add full=0}

View File

@@ -83,7 +83,13 @@
<strong>{l s='Current refund state'} </strong>
</div>
<div class="col-sm-9 col-md-10">
<span class="badge wk-badge" style="background-color:{$currentStateInfo['color']|escape:'html':'UTF-8'}">{$currentStateInfo['name']|escape:'html':'UTF-8'}</span>
<span class="badge wk-badge" style="background-color:{$currentStateInfo['color']|escape:'html':'UTF-8'}">
{if $isCanceled}
{l s='Cancelled'}
{else}
{$currentStateInfo['name']|escape:'html':'UTF-8'}
{/if}
</span>
</div>
</div>
<div class="form-group row">
@@ -120,22 +126,49 @@
{displayPrice price=$orderReturnInfo['refunded_amount'] currency=$orderInfo['id_currency']}
</div>
</div>
<div class="form-group row">
<div class="col-md-2 col-sm-3">
<strong>{l s='Payment mode' mod='hotelreservationsystem'}</strong>
{if $orderReturnInfo['payment_mode'] != '' && $orderReturnInfo['id_transaction'] != ''}
<div class="form-group row">
<div class="col-md-2 col-sm-3">
<strong>{l s='Payment mode' mod='hotelreservationsystem'}</strong>
</div>
<div class="col-sm-9 col-md-10">
{$orderReturnInfo['payment_mode']|escape:'html':'UTF-8'}
</div>
</div>
<div class="col-sm-9 col-md-10">
{$orderReturnInfo['payment_mode']|escape:'html':'UTF-8'}
<div class="form-group row">
<div class="col-md-2 col-sm-3">
<strong>{l s='Transaction ID' mod='hotelreservationsystem'}</strong>
</div>
<div class="col-sm-9 col-md-10">
{$orderReturnInfo['id_transaction']|escape:'html':'UTF-8'}
</div>
</div>
</div>
<div class="form-group row">
<div class="col-md-2 col-sm-3">
<strong>{l s='Transaction ID' mod='hotelreservationsystem'}</strong>
</div>
<div class="col-sm-9 col-md-10">
{$orderReturnInfo['id_transaction']|escape:'html':'UTF-8'}
</div>
</div>
{/if}
{if isset($orderReturnInfo['return_type'])}
{if $orderReturnInfo['return_type'] == OrderReturn::RETURN_TYPE_CART_RULE}
<div class="form-group row">
<div class="col-md-2 col-sm-3">
<strong>{l s='Voucher ID:' mod='hotelreservationsystem'}</strong>
</div>
<div class="col-sm-9 col-md-10">
<a class="btn btn-default btn-sm" href="{$link->getPageLink('discount')}" target="_blank">
{l s='View your vouchers'}
</a>
</div>
</div>
{elseif $orderReturnInfo['return_type'] == OrderReturn::RETURN_TYPE_ORDER_SLIP}
<div class="form-group row">
<div class="col-md-2 col-sm-3">
<strong>{l s='Credit Slip:' mod='hotelreservationsystem'}</strong>
</div>
<div class="col-sm-9 col-md-10">
<a class="btn btn-default btn-sm" href="{$link->getPageLink('order-slip')}">
{l s='View your creadit slips' mod='hotelreservationsystem'}
</a>
</div>
</div>
{/if}
{/if}
{/if}
</div>