diff --git a/admin/themes/default/template/controllers/cart_rules/actions.tpl b/admin/themes/default/template/controllers/cart_rules/actions.tpl index efe1a4d24..d7da999e3 100644 --- a/admin/themes/default/template/controllers/cart_rules/actions.tpl +++ b/admin/themes/default/template/controllers/cart_rules/actions.tpl @@ -46,7 +46,6 @@ % - {l s='Does not apply to the shipping costs'} diff --git a/admin/themes/default/template/controllers/cart_rules/conditions.tpl b/admin/themes/default/template/controllers/cart_rules/conditions.tpl index bfdea3f15..8f225fbbf 100644 --- a/admin/themes/default/template/controllers/cart_rules/conditions.tpl +++ b/admin/themes/default/template/controllers/cart_rules/conditions.tpl @@ -47,7 +47,7 @@
| - {if $data.is_cancelled} - {l s='Cancelled'} - {elseif isset($data.refund_info) && $data.refund_info} - {$data.refund_info.name|escape:'html':'UTF-8'} + {if $data.id|in_array:$refundReqBookings} + {if $data.is_cancelled} + {l s='Cancelled'} + {elseif isset($data.refund_info) && (!$data.refund_info.refunded || $data.refund_info.id_customization)} + {$data.refund_info.name|escape:'html':'UTF-8'} + {else} + -- + {/if} {else} - -- - {/if} + -- + {/if} |
- {if isset($data.refund_info) && $data.refund_info}
+ {if $data.is_refunded && isset($data.refund_info) && $data.refund_info}
{convertPriceWithCurrency price=$data.refund_info.refunded_amount currency=$currency->id}
{else}
--
@@ -242,7 +246,7 @@
|
{if $rm_dtl_v['booking_type'] == HotelBookingDetail::ALLOTMENT_AUTO} - | {/if} - {if $orderTotalPaid|floatval} + {if $hasOrderDiscountOrPayment || $isRefundCompleted}
{if $isRefundCompleted}
- {displayPrice price=$booking['refunded_amount'] currency=$orderCurrency['id']}
+ {displayPrice price=$booking['refunded_amount'] currency=$orderCurrency['id']}
{else}
{$orderCurrency['sign']|escape:'html':'UTF-8'}
@@ -196,6 +200,18 @@
{/if}
|
+ {if $isRefundCompleted}
+ + {if $booking['is_cancelled']} + {l s='Cancelled' mod='hotelreservationsystem'} + {* used id_customization to check if in this request which bookings are refunded or not*} + {else if $booking['id_customization']} + {l s='Refunded' mod='hotelreservationsystem'} + {else} + {l s='Denied' mod='hotelreservationsystem'} + {/if} + | + {/if} {/if} {/foreach} @@ -279,7 +295,7 @@