diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl index 2223946c2..e68b185df 100644 --- a/admin/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin/themes/default/template/controllers/orders/_product_line.tpl @@ -221,10 +221,14 @@ {/if} - {if isset($refundReqBookings) && $refundReqBookings} + {if (isset($refundReqBookings) && $refundReqBookings) || (isset($isCancelledRoom) && $isCancelledRoom)} - {if isset($data.refund_info) && $data.refund_info} + {if $data.is_cancelled} + {l s='Cancelled'} + {elseif isset($data.refund_info) && $data.refund_info} {$data.refund_info.name|escape:'html':'UTF-8'} + {else} + -- {/if} @@ -233,15 +237,6 @@ {/if} {/if} - {if isset($isCancelledRoom) && $isCancelledRoom} - - {if $data.is_refunded} - {l s='Cancelled'} - {else} - -- - {/if} - - {/if} {if ($can_edit && !$order->hasBeenDelivered())} {if sizeof($invoices_collection)} @@ -256,7 +251,7 @@   {/if} - + {* edit/delete controls *}
- {$currentStateInfo['name']|escape:'html':'UTF-8'} + + {if $isCanceled} + {l s='Cancelled'} + {else} + {$currentStateInfo['name']|escape:'html':'UTF-8'} + {/if} +
@@ -120,22 +126,49 @@ {displayPrice price=$orderReturnInfo['refunded_amount'] currency=$orderInfo['id_currency']}
-
-
- {l s='Payment mode' mod='hotelreservationsystem'} + {if $orderReturnInfo['payment_mode'] != '' && $orderReturnInfo['id_transaction'] != ''} +
+
+ {l s='Payment mode' mod='hotelreservationsystem'} +
+
+ {$orderReturnInfo['payment_mode']|escape:'html':'UTF-8'} +
-
- {$orderReturnInfo['payment_mode']|escape:'html':'UTF-8'} +
+
+ {l s='Transaction ID' mod='hotelreservationsystem'} +
+
+ {$orderReturnInfo['id_transaction']|escape:'html':'UTF-8'} +
-
-
-
- {l s='Transaction ID' mod='hotelreservationsystem'} -
-
- {$orderReturnInfo['id_transaction']|escape:'html':'UTF-8'} -
-
+ {/if} + {if isset($orderReturnInfo['return_type'])} + {if $orderReturnInfo['return_type'] == OrderReturn::RETURN_TYPE_CART_RULE} +
+ {elseif $orderReturnInfo['return_type'] == OrderReturn::RETURN_TYPE_ORDER_SLIP} +
+
+ {l s='Credit Slip:' mod='hotelreservationsystem'} +
+ +
+ {/if} + {/if} {/if}