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

Merge pull request #1077 from abhishek-webkul/gli-2068

Browse Source 
Updated: Show 'Processing' to customer if all applicable order statuses are hidden
This commit is contained in:
Rohit Jain
2024-05-30 13:07:45 +05:30
committed by GitHub
parent 2fb666725c ea04c14bc7
commit ab72bee934
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
themes/hotel-reservation-theme/css/order-detail.css
View File

@@ -207,6 +207,10 @@
line-height: 16px;
}
.payment-details .detail-row .status .processing {
font-size: 16px;
}
.hotel-location p.hotel-address {
font-size: 16px;
line-height: 24px;

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

@@ -116,13 +116,17 @@
<div class="detail-row">
<div class="pull-left title">{l s='Status'}</div>
<div class="pull-right value status">
<span{if isset($order_history[0].color) && $order_history[0].color} style="background-color:{$order_history[0].color|escape:'html':'UTF-8'}30; border: 1px solid {$order_history[0].color|escape:'html':'UTF-8'};" {/if} class="label">
{if $order_history[0].id_order_state|in_array:$overbooking_order_states}
{l s='Order Not Confirmed'}
{else}
{$order_history[0].ostate_name|escape:'html':'UTF-8'}
{/if}
</span>
{if isset($order_history[0]) && $order_history[0]}
<span{if isset($order_history[0].color) && $order_history[0].color} style="background-color:{$order_history[0].color|escape:'html':'UTF-8'}30; border: 1px solid {$order_history[0].color|escape:'html':'UTF-8'};" {/if} class="label">
{if $order_history[0].id_order_state|in_array:$overbooking_order_states}
{l s='Order Not Confirmed'}
{else}
{$order_history[0].ostate_name|escape:'html':'UTF-8'}
{/if}
</span>
{else}
<span class="processing">{l s='Processing'}</span>
{/if}
</div>
</div>
@@ -499,13 +503,17 @@
<div class="detail-row">
<div class="pull-left title">{l s='Status'}</div>
<div class="pull-right value status">
<span{if isset($order_history[0].color) && $order_history[0].color} style="background-color:{$order_history[0].color|escape:'html':'UTF-8'}30; border: 1px solid {$order_history[0].color|escape:'html':'UTF-8'};" {/if} class="label">
{if $order_history[0].id_order_state|in_array:$overbooking_order_states}
{l s='Order Not Confirmed'}
{else}
{$order_history[0].ostate_name|escape:'html':'UTF-8'}
{/if}
</span>
{if isset($order_history[0]) && $order_history[0]}
<span{if isset($order_history[0].color) && $order_history[0].color} style="background-color:{$order_history[0].color|escape:'html':'UTF-8'}30; border: 1px solid {$order_history[0].color|escape:'html':'UTF-8'};" {/if} class="label">
{if $order_history[0].id_order_state|in_array:$overbooking_order_states}
{l s='Order Not Confirmed'}
{else}
{$order_history[0].ostate_name|escape:'html':'UTF-8'}
{/if}
</span>
{else}
<span class="processing">{l s='Processing'}</span>
{/if}
</div>
</div>