diff --git a/admin/themes/default/sass/controllers/_order.sass b/admin/themes/default/sass/controllers/_order.sass index c5315218e..d061c8615 100644 --- a/admin/themes/default/sass/controllers/_order.sass +++ b/admin/themes/default/sass/controllers/_order.sass @@ -77,3 +77,9 @@ .room_status_info_form .room_status white-space: normal + +#noteContent + max-height: 200px + +.panel-refund-request .refunded_amount + margin-top: 2px \ No newline at end of file diff --git a/admin/themes/default/sass/vendor/bootstrap-sass/_modals.scss b/admin/themes/default/sass/vendor/bootstrap-sass/_modals.scss index 8240fa4ad..a126c3986 100644 --- a/admin/themes/default/sass/vendor/bootstrap-sass/_modals.scss +++ b/admin/themes/default/sass/vendor/bootstrap-sass/_modals.scss @@ -9,7 +9,7 @@ // Kill the scroll on the body .modal-open { - overflow-x: hidden; + overflow: hidden; } // Container that the modal scrolls within diff --git a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl index 88da2734e..18145ce07 100644 --- a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl @@ -146,15 +146,27 @@

- {if $customer->active} - - - {l s='Active'} + {if !$customer->deleted} + {if $customer->active} + + + {l s='Active'} + + {else} + + + {l s='Inactive'} + + {/if} + {elseif $customer->deleted == Customer::STATUS_BANNED} + + + {l s='Banned'} - {else} + {elseif $customer->deleted == Customer::STATUS_DELETED} - {l s='Inactive'} + {l s='Deleted'} {/if}

diff --git a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl index fb6f389c2..07f87ca73 100644 --- a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl +++ b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl @@ -92,7 +92,7 @@ {foreach $data['child_ages'] as $childAge}

- -

- -
- -
- -
-
-
- - - -
-
-
-
{l s='Check In'}
- -
-
-
-
-
-
-
{l s='Check Out'}
- -
-
-
-
- - - {if $order->with_occupancy} -
-
- - -
-
-
-
-
-
-
- - -
-
- - - ({l s='Below'} {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years'}) -
-
-

- -
-
-
-
-
- {l s='Add Room'} - {l s='close'} -
-
-
-
- {else} -
- -
- {/if} - - - -
-
-
- {if $currency->format % 2}
{$currency->sign} {l s='tax excl.'}
{/if} - - {if !($currency->format % 2)}
{$currency->sign} {l s='tax excl.'}
{/if} -
-
-
-
-
- {if $currency->format % 2}
{$currency->sign} {l s='tax incl.'}
{/if} - - {if !($currency->format % 2)}
{$currency->sign} {l s='tax incl.'}
{/if} -
-
-
- - - - {*{if ($order->hasBeenPaid())}{/if} - {if $display_warehouse}{/if} - {if ($order->hasBeenDelivered())}{/if} - 0*} - {displayPrice price=0 currency=$currency->id} - - {if sizeof($invoices_collection)} - - {/if} - - - - - - - - diff --git a/admin/themes/default/template/controllers/orders/_overbookings.tpl b/admin/themes/default/template/controllers/orders/_overbookings.tpl index b2b89fa6c..8f0064708 100644 --- a/admin/themes/default/template/controllers/orders/_overbookings.tpl +++ b/admin/themes/default/template/controllers/orders/_overbookings.tpl @@ -43,15 +43,19 @@ {if $order->with_occupancy && $data['children']}
- +
{if isset($data['child_ages']) && $data['child_ages']} {foreach $data['child_ages'] as $childAge}

- {l s='Child %s : %s years' sprintf=[$childAge@iteration, $childAge]} + {if $childAge == 0} + {l s='Child %s : Under 1' sprintf=[$childAge@iteration]} + {else} + {l s='Child %s : %s' sprintf=[$childAge@iteration, $childAge]} {if $childAge > 1}{l s='years'}{else}{l s='year'}{/if} + {/if}

{/foreach} {/if} diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl index 1ed440c02..11ab4b428 100644 --- a/admin/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin/themes/default/template/controllers/orders/_product_line.tpl @@ -70,7 +70,11 @@ {if isset($data['child_ages']) && $data['child_ages']} {foreach $data['child_ages'] as $childAge}

- {l s='Child %s : %s years' sprintf=[$childAge@iteration, $childAge]} + {if $childAge == 0} + {l s='Child %s : Under 1' sprintf=[$childAge@iteration]} + {else} + {l s='Child %s : %s' sprintf=[$childAge@iteration, $childAge]} {if $childAge > 1}{l s='years'}{else}{l s='year'}{/if} + {/if}

{/foreach} {/if} @@ -246,7 +250,7 @@