Design changes and issues resolved

This commit is contained in:
Sumit Panwar
2024-04-01 18:31:41 +05:30
parent 2e323bce76
commit 38db9dbb0b
12 changed files with 113 additions and 123 deletions

View File

@@ -76,10 +76,7 @@
padding: 15px
border-radius: 2px
box-shadow: none
a.order_detail_link
color: #3862D8
text-decoration: none
cursor: pointer
.nav-tabs>li.active>a
color: #333
.text-bold
@@ -127,7 +124,6 @@
a
font-size: 12px
font-weight: 600
color: #3862D8
text-transform: capitalize
text-decoration: none
i
@@ -155,7 +151,7 @@
top: unset
left: unset
thead > tr > th
padding: 12px 16px 12px 16px
padding: 12px 8px
background: #F5F5F5
border: none
font-weight: 600
@@ -190,13 +186,6 @@
.btn-primary
border: none
font-weight: 600
background: rgba(56,98,216,0.1)
color: #3862D8
i
color: #3862D8
&:hover
background: rgba(56,98,216,0.1)
opacity: 0.8
.message-body
margin-bottom: 15px
p.message-item-text
@@ -224,12 +213,14 @@
.modal-footer
padding: 15px 0px 0px 0px
.btn-close
color: #3862D8
color: #00aff0
font-weight: 600
padding: 10px
border: none
.btn-close:hover
background: none
.btn-close:focus
outline: none
.btn+.btn
margin-left: 10px

View File

@@ -59,9 +59,9 @@
</td>
<td>
{if get_class($document) eq 'OrderInvoice'}
<a class="order_detail_link _blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&amp;submitAction=generateInvoicePDF&amp;id_order_invoice={$document->id}">
<a class="_blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&amp;submitAction=generateInvoicePDF&amp;id_order_invoice={$document->id}">
{elseif get_class($document) eq 'OrderSlip'}
<a class="order_detail_link _blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&amp;submitAction=generateOrderSlipPDF&amp;id_order_slip={$document->id}">
<a class="_blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&amp;submitAction=generateOrderSlipPDF&amp;id_order_slip={$document->id}">
{/if}
{if get_class($document) eq 'OrderInvoice'}
{$document->getInvoiceNumberFormatted($current_id_lang, $order->id_shop)}
@@ -88,7 +88,7 @@
</td>
<td class="document_action">
{if get_class($document) eq 'OrderInvoice'}
<a href="#" class="order_detail_link add_document_note" data-id_order_invoice="{$document->id}" data-edit_note="{$document->note|escape:'html':'UTF-8'}" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}">
<a href="#" class="add_document_note" data-id_order_invoice="{$document->id}" data-edit_note="{$document->note|escape:'html':'UTF-8'}" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}">
{if $document->note eq ''}
<i class="icon-file-alt"></i> &nbsp;{l s='Add note'}
{else}
@@ -96,7 +96,7 @@
{/if}
</a>
{if $document->getRestPaid()}
<a href="#form_add_payment_panel" class="js-set-payment anchor order_detail_link pull-right" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}">
<a href="#form_add_payment_panel" class="js-set-payment anchor pull-right" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}">
<i class="icon-money"></i> &nbsp;{l s='Enter payment'}
</a>
{/if}

View File

@@ -33,7 +33,7 @@
<td><img src="{$data.image_link}" title="Room image" class="img-thumbnail"/></td>
<td><p>{$data.room_type}</p></td>
<td>
<a class="order_detail_link" href="{$link->getAdminLink('AdminAddHotel')}&amp;id={$data['id_hotel']}&amp;updatehtl_branch_info" target="_blank">
<a href="{$link->getAdminLink('AdminAddHotel')}&amp;id={$data['id_hotel']}&amp;updatehtl_branch_info" target="_blank">
<span>{$data['hotel_name']}</span>
</a>
</td>
@@ -65,7 +65,7 @@
<td>
{if $data['children']}
<div class="dropdown booking_occupancy_show">
<a class="order_detail_link" data-toggle="dropdown">
<a data-toggle="dropdown">
<span>{if $data['adults']}{$data['adults']}{/if} {if $data['adults'] > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if {$data['children']}}, {$data['children']} {if $data['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if}</span>
</a>
<div class="dropdown-menu well well-sm">
@@ -158,13 +158,13 @@
<span class="extra_service_show">
{convertPriceWithCurrency price=($data['extra_demands_price_te'] + $data['additional_services_price_te'] + $data['convenience_fee_te'] + $data['additional_services_price_auto_add_te']) currency=$currency->id}
{if $data['extra_demands']|count || $data['additional_services']|count}
<a class="order_detail_link open_room_extra_services" href="#" date_from="{$data['date_from']}" date_to="{$data['date_to']}" id_product="{$data['id_product']}" id_room="{$data['id_room']}" id_order="{$order->id}" id_htl_booking="{$data['id']}">
<a class="open_room_extra_services" href="#" date_from="{$data['date_from']}" date_to="{$data['date_to']}" id_product="{$data['id_product']}" id_room="{$data['id_room']}" id_order="{$order->id}" id_htl_booking="{$data['id']}">
<i class="icon icon-lg icon-info-circle"></i>
</a>
{/if}
</span>
<span class="extra_service_edit" style="display: none;">
<a class="order_detail_link open_room_extra_services" href="#" date_from="{$data['date_from']}" date_to="{$data['date_to']}" id_product="{$data['id_product']}" id_room="{$data['id_room']}" id_order="{$order->id}" id_htl_booking="{$data['id']}">
<a class="open_room_extra_services" href="#" date_from="{$data['date_from']}" date_to="{$data['date_to']}" id_product="{$data['id_product']}" id_room="{$data['id_room']}" id_order="{$order->id}" id_htl_booking="{$data['id']}">
{convertPriceWithCurrency price=($data['extra_demands_price_te'] + $data['additional_services_price_te'] + $data['convenience_fee_te'] + $data['additional_services_price_auto_add_te']) currency=$currency->id}
</a>
</span>
@@ -228,12 +228,12 @@
</td>
<td class="product_action">
<div class="actions-row">
<a href="#" class="order_detail_link edit_room_change_link" data-product_line_data="{$data|json_encode|escape}">
<a href="#" class="edit_room_change_link" data-product_line_data="{$data|json_encode|escape}">
<i class="icon-pencil"></i>
{l s='Edit'}
</a>
<div class="dropdown pull-right">
<a type="button" class="dropdown-toggle order_detail_link" data-toggle="dropdown" style="padding: 0 8px; margin-left: -15px;">
<a type="button" class="dropdown-toggle" data-toggle="dropdown" style="padding: 0 8px; margin-left: -15px;">
<i class="icon-ellipsis-v"></i>
</a>
<ul class="dropdown-menu" role="menu">

View File

@@ -29,7 +29,7 @@
<th><span class="title_box">{l s='Room Type'}</span></th>
<th><span class="title_box">{l s='Hotel Name'}</span></th>
<th><span class="title_box">{l s='Duration'}</span></th>
<th class="text-center fixed-width-lg"><span class="title_box">{l s='Occupancy'}</span></th>
<th class="fixed-width-lg"><span class="title_box">{l s='Occupancy'}</span></th>
<th><span class="title_box">{l s='Room Price (Tax excl.)'}</span></th>
<th><span class="title_box">{l s='Extra Services/Fee (Tax excl.)'}</span></th>
<th><span class="title_box">{l s='Total Tax'}</span></th>

View File

@@ -117,7 +117,7 @@
{$data['room_type_name']}
</td>
<td>
<a class="order_detail_link" href="{$link->getAdminLink('AdminAddHotel')}&amp;id={$data['id_hotel']}&amp;updatehtl_branch_info" target="_blank">
<a href="{$link->getAdminLink('AdminAddHotel')}&amp;id={$data['id_hotel']}&amp;updatehtl_branch_info" target="_blank">
<span>{$data['hotel_name']}</span>
</a>
</td>
@@ -125,7 +125,7 @@
{dateFormat date=$data['date_from']} - {dateFormat date=$data['date_to']}
</td>
<td>
<a href="#" class="text-bold order_detail_link" onclick="BookingDocumentsModal.init({$data.id|intval}, this); return false;">
<a href="#" class="text-bold" onclick="BookingDocumentsModal.init({$data.id|intval}, this); return false;">
{if $data.num_checkin_documents > 0}{$data.num_checkin_documents}{else}{l s='Upload'}{/if} {l s='Documents'}
</a>
</td>
@@ -138,12 +138,12 @@
<span class="text-success room_status">{l s='Checked out on'} {dateFormat date=$data['check_out']}</span>
{/if}
</td>
<td>
<td class="text-center">
{if $data.is_refunded || $data.is_cancelled}
<span class="badge badge-danger">{if $data.is_cancelled}{l s='Cancelled'}{else}{l s='Refunded'}{/if}</span>
{else}
<a class="open_room_status_form order_detail_link" href="#" data-id_hotel_booking_detail="{$data['id']}" data-id_order="{$data['id_order']}" data-id_status="{$data['id_status']}" data-id_room="{$data['id_room']}" data-date_from="{$data['date_from']|date_format:"%Y-%m-%d"}" data-date_to="{$data['date_to']|date_format:"%Y-%m-%d"}" data-check_in_time="{$data['check_in_time']}" data-check_out_time="{$data['check_out_time']}">
{l s='Edit Status'}
<a class="open_room_status_form" href="#" data-id_hotel_booking_detail="{$data['id']}" data-id_order="{$data['id_order']}" data-id_status="{$data['id_status']}" data-id_room="{$data['id_room']}" data-date_from="{$data['date_from']|date_format:"%Y-%m-%d"}" data-date_to="{$data['date_to']|date_format:"%Y-%m-%d"}" data-check_in_time="{$data['check_in_time']}" data-check_out_time="{$data['check_out_time']}">
<i class="icon-pencil"></i>
</a>
{/if}
</td>
@@ -186,13 +186,13 @@
<ul class="nav nav-tabs" id="tabOrder">
{$HOOK_TAB_ORDER}
<li class="active">
<a class="order_detail_link" href="#status">
<a href="#status">
<i class="icon-time"></i>
{l s='Status'} <span class="badge">{$history|@count}</span>
</a>
</li>
<li>
<a class="order_detail_link" href="#documents">
<a href="#documents">
<i class="icon-file-text"></i>
{l s='Documents'} <span class="badge">{$order->getDocuments()|@count}</span>
</a>
@@ -217,7 +217,7 @@
<td style="border-width: 1px 0px 1px 0px; border-color: {$row['color']}; border-style: solid">{dateFormat date=$row['date_add'] full=true}</td>
<td style="border-width: 1px 1px 1px 0px; border-color: {$row['color']}; border-style: solid" class="text-right">
{if $row['send_email']|intval}
<a class="order_detail_link" href="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&amp;vieworder&amp;id_order={$order->id|intval}&amp;sendStateEmail={$row['id_order_state']|intval}&amp;id_order_history={$row['id_order_history']|intval}" title="{l s='Resend this email to the customer'}">
<a href="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&amp;vieworder&amp;id_order={$order->id|intval}&amp;sendStateEmail={$row['id_order_state']|intval}&amp;id_order_history={$row['id_order_history']|intval}" title="{l s='Resend this email to the customer'}">
<i class="icon-mail-reply"></i>
{l s='Resend email'}
</a>
@@ -232,7 +232,7 @@
<td>{dateFormat date=$row['date_add'] full=true}</td>
<td class="text-right">
{if $row['send_email']|intval}
<a class="order_detail_link" href="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&amp;vieworder&amp;id_order={$order->id|intval}&amp;sendStateEmail={$row['id_order_state']|intval}&amp;id_order_history={$row['id_order_history']|intval}" title="{l s='Resend this email to the customer'}">
<a href="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&amp;vieworder&amp;id_order={$order->id|intval}&amp;sendStateEmail={$row['id_order_state']|intval}&amp;id_order_history={$row['id_order_history']|intval}" title="{l s='Resend this email to the customer'}">
<i class="icon-mail-reply"></i>
{l s='Resend email'}
</a>
@@ -453,7 +453,7 @@
<td>{displayPrice price=$payment['real_paid_amount'] currency=$payment['id_currency']}</td>
<td>{if isset($payment['invoice_number'])}{$payment['invoice_number']}{else}--{/if}</td>
<td class="actions">
<a class="order_detail_link open_payment_information" href="#" data-card_number="{if $payment['card_number']}{$payment['card_number']}{else}{l s='Not defined'}{/if}" data-card_brand="{if $payment['card_brand']}{$payment['card_brand']}{else}{l s='Not defined'}{/if}" data-card_expiration="{if $payment['card_expiration']}{$payment['card_expiration']}{else}{l s='Not defined'}{/if}" data-card_holder="{if $payment['card_holder']}{$payment['card_holder']}{else}{l s='Not defined'}{/if}" data-payment_date="{if $payment['date_add']}{$payment['date_add']}{else}{l s='Not defined'}{/if}" data-payment_method="{if $payment['payment_method']}{$payment['payment_method']}{else}{l s='Not defined'}{/if}" data-payment_source="{if $payment_types[$payment['payment_type']]['name']}{$payment_types[$payment['payment_type']]['name']}{else}{l s='Not defined'}{/if}" data-transaction_id="{if $payment['transaction_id']}{$payment['transaction_id']}{else}{l s='Not defined'}{/if}" data-amount="{if $payment['amount'] > 0}{displayPrice currency={$payment['id_currency']} price={$payment['amount']}}{else}{l s='Not defined'}{/if}" data-invoice_number="{if isset($payment['invoice_number']) && $payment['invoice_number']}{$payment['invoice_number']}{else}{l s='Not defined'}{/if}">{l s='Details'}</a>
<a class="open_payment_information" href="#" data-card_number="{if $payment['card_number']}{$payment['card_number']}{else}{l s='Not defined'}{/if}" data-card_brand="{if $payment['card_brand']}{$payment['card_brand']}{else}{l s='Not defined'}{/if}" data-card_expiration="{if $payment['card_expiration']}{$payment['card_expiration']}{else}{l s='Not defined'}{/if}" data-card_holder="{if $payment['card_holder']}{$payment['card_holder']}{else}{l s='Not defined'}{/if}" data-payment_date="{if $payment['date_add']}{$payment['date_add']}{else}{l s='Not defined'}{/if}" data-payment_method="{if $payment['payment_method']}{$payment['payment_method']}{else}{l s='Not defined'}{/if}" data-payment_source="{if $payment_types[$payment['payment_type']]['name']}{$payment_types[$payment['payment_type']]['name']}{else}{l s='Not defined'}{/if}" data-transaction_id="{if $payment['transaction_id']}{$payment['transaction_id']}{else}{l s='Not defined'}{/if}" data-amount="{if $payment['amount'] > 0}{displayPrice currency={$payment['id_currency']} price={$payment['amount']}}{else}{l s='Not defined'}{/if}" data-invoice_number="{if isset($payment['invoice_number']) && $payment['invoice_number']}{$payment['invoice_number']}{else}{l s='Not defined'}{/if}">{l s='Details'}</a>
</td>
</tr>
{foreachelse}
@@ -511,26 +511,22 @@
{/if}
</div>
<div class="panel-content form-horizontal" id="customer-guest-details">
<div class="form-group">
<div class="col-sm-6">
<label class="control-label">{l s='Gender'}</label>
<div class="gender_name">{$customerGuestDetail->gender->name}</div>
</div>
<div class="col-sm-6">
<label class="control-label">{l s='Name'}</label>
<div class="guest_name">{$customerGuestDetail->firstname} {$customerGuestDetail->lastname}</div>
</div>
</div>
<div class="form-group">
<div class="col-sm-6">
<label class="control-label">{l s='Email'}</label>
<div class="guest_email"><a class="order_detail_link" href="mailto:{$customerGuestDetail->email}"><i class="icon-envelope-o"></i> {$customerGuestDetail->email}</a></div>
</div>
<div class="col-sm-6">
<label class="control-label">{l s='Phone'}</label>
<div class="guest_phone"><a class="order_detail_link" href="tel:{$customerGuestDetail->phone}"><i class="icon-phone"></i> {$customerGuestDetail->phone}</a></div>
</div>
</div>
<dl class="list-detail col-sm-6">
<label class="label-title">{l s='Gender'}</label>
<dd class="gender_name">{$customerGuestDetail->gender->name}</dd>
</dl>
<dl class="list-detail col-sm-6">
<label class="label-title">{l s='Name'}</label>
<dd class="guest_name">{$customerGuestDetail->firstname} {$customerGuestDetail->lastname}</dd>
</dl>
<dl class="list-detail col-sm-6">
<label class="label-title">{l s='Email'}</label>
<dd class="guest_email"><a href="mailto:{$customerGuestDetail->email}"><i class="icon-envelope-o"></i> {$customerGuestDetail->email}</a></dd>
</dl>
<dl class="list-detail col-sm-6">
<label class="label-title">{l s='Phone'}</label>
<dd class="guest_phone"><a href="tel:{$customerGuestDetail->phone}"><i class="icon-phone"></i> {$customerGuestDetail->phone}</a></dd>
</dl>
</div>
</div>
{/if}
@@ -550,9 +546,9 @@
<dl class="list-detail col-sm-12">
<label class="label-title">{l s='Guest info'}</label>
<dd><i class="icon-envelope"></i> &nbsp;<b><a class="order_detail_link" href="mailto:{$customer->email}">{$customer->email}</a></b></dd>
<dd><i class="icon-envelope"></i> &nbsp;<b><a href="mailto:{$customer->email}">{$customer->email}</a></b></dd>
{if $addresses.invoice->phone_mobile || $addresses.invoice->phone}
<dd><i class="icon-phone"></i> &nbsp;<b><a class="order_detail_link" href="tel:{if $addresses.invoice->phone_mobile}{$addresses.invoice->phone_mobile}{else}{$addresses.invoice->phone}{/if}">{if $addresses.invoice->phone_mobile}{$addresses.invoice->phone_mobile}{else}{$addresses.invoice->phone}{/if}</a></b></dd>
<dd><i class="icon-phone"></i> &nbsp;<b><a href="tel:{if $addresses.invoice->phone_mobile}{$addresses.invoice->phone_mobile}{else}{$addresses.invoice->phone}{/if}">{if $addresses.invoice->phone_mobile}{$addresses.invoice->phone_mobile}{else}{$addresses.invoice->phone}{/if}</a></b></dd>
{/if}
</dl>
@@ -570,10 +566,10 @@
<dl class="list-detail col-sm-6">
<label class="label-title">{l s='Customer'}</label>
<dd><i class="icon-user"></i> &nbsp;<b><a class="order_detail_link" href="?tab=AdminCustomers&amp;id_customer={$customer->id}&amp;viewcustomer&amp;token={getAdminToken tab='AdminCustomers'}">{$customer->firstname} {$customer->lastname}</a></b></dd>
<dd><i class="icon-envelope"></i> &nbsp;<b><a class="order_detail_link" href="mailto:{$customer->email}">{$customer->email}</a></b></dd>
<dd><i class="icon-user"></i> &nbsp;<b><a href="?tab=AdminCustomers&amp;id_customer={$customer->id}&amp;viewcustomer&amp;token={getAdminToken tab='AdminCustomers'}">{$customer->firstname} {$customer->lastname}</a></b></dd>
<dd><i class="icon-envelope"></i> &nbsp;<b><a href="mailto:{$customer->email}">{$customer->email}</a></b></dd>
{if $addresses.invoice->phone_mobile || $addresses.invoice->phone}
<dd><i class="icon-phone"></i> &nbsp;<b><a class="order_detail_link" href="tel:{if $addresses.invoice->phone_mobile}{$addresses.invoice->phone_mobile}{else}{$addresses.invoice->phone}{/if}">{if $addresses.invoice->phone_mobile}{$addresses.invoice->phone_mobile}{else}{$addresses.invoice->phone}{/if}</a></b></dd>
<dd><i class="icon-phone"></i> &nbsp;<b><a href="tel:{if $addresses.invoice->phone_mobile}{$addresses.invoice->phone_mobile}{else}{$addresses.invoice->phone}{/if}">{if $addresses.invoice->phone_mobile}{$addresses.invoice->phone_mobile}{else}{$addresses.invoice->phone}{/if}</a></b></dd>
{/if}
</dl>
<dl class="list-detail col-sm-6">
@@ -809,7 +805,7 @@
{foreach from=$returns item=return_info}
<tr>
<td>
<a class="order_detail_link" href="{$link->getAdminLink('AdminOrderRefundRequests')}&vieworder_return&id_order_return={$return_info.id_order_return}" target="_blank">#{$return_info.id_order_return}</a>
<a href="{$link->getAdminLink('AdminOrderRefundRequests')}&vieworder_return&id_order_return={$return_info.id_order_return}" target="_blank">#{$return_info.id_order_return}</a>
</td>
<td>
{$return_info.total_rooms|escape:'html':'UTF-8'}
@@ -847,7 +843,7 @@
<ul>
{foreach from=$applicable_refund_policies item=$applicable_refund_policy}
<li class="form-group">
<a class="order_detail_link" href="{$link->getAdminLink('AdminOrderRefundRules')|escape:'html':'UTF-8'}&id_refund_rule={$applicable_refund_policy.id_refund_rule}&updatehtl_order_refund_rules" target="_blank">
<a href="{$link->getAdminLink('AdminOrderRefundRules')|escape:'html':'UTF-8'}&id_refund_rule={$applicable_refund_policy.id_refund_rule}&updatehtl_order_refund_rules" target="_blank">
{$applicable_refund_policy.name|escape:'html':'UTF-8'} &nbsp;<i class="icon icon-external-link-square"></i>
</a>
</li>
@@ -1072,7 +1068,7 @@
</td>
{if $can_edit}
<td>
<a class="order_detail_link" href="{$current_index}&amp;submitDeleteVoucher&amp;id_order_cart_rule={$discount['id_order_cart_rule']}&amp;id_order={$order->id}&amp;token={$smarty.get.token|escape:'html':'UTF-8'}">{l s='Delete'}</a>
<a href="{$current_index}&amp;submitDeleteVoucher&amp;id_order_cart_rule={$discount['id_order_cart_rule']}&amp;id_order={$order->id}&amp;token={$smarty.get.token|escape:'html':'UTF-8'}">{l s='Delete'}</a>
</td>
{/if}
</tr>
@@ -1119,7 +1115,7 @@
{foreach $order->getBrother() as $brother_order}
<tr>
<td>
<a class="order_detail_link" href="{$current_index}&amp;vieworder&amp;id_order={$brother_order->id}&amp;token={$smarty.get.token|escape:'html':'UTF-8'}">#{$brother_order->id}</a>
<a href="{$current_index}&amp;vieworder&amp;id_order={$brother_order->id}&amp;token={$smarty.get.token|escape:'html':'UTF-8'}">#{$brother_order->id}</a>
</td>
<td>
{$brother_order->getCurrentOrderState()->name[$current_id_lang]}
@@ -1128,7 +1124,7 @@
{displayPrice price=$brother_order->total_paid_tax_incl currency=$currency->id}
</td>
<td>
<a class="order_detail_link" href="{$current_index}&amp;vieworder&amp;id_order={$brother_order->id}&amp;token={$smarty.get.token|escape:'html':'UTF-8'}">
<a href="{$current_index}&amp;vieworder&amp;id_order={$brother_order->id}&amp;token={$smarty.get.token|escape:'html':'UTF-8'}">
<i class="icon-eye-open"></i>
{l s='See the order'}
</a>
@@ -1169,7 +1165,7 @@
</select>
</p>
<div>
<a class="order_detail_link" href="{$link->getAdminLink('AdminOrderMessage')|escape:'html':'UTF-8'}">
<a href="{$link->getAdminLink('AdminOrderMessage')|escape:'html':'UTF-8'}">
{l s='Configure predefined messages'}
<i class="icon-external-link"></i>
</a>
@@ -1212,7 +1208,7 @@
<ul {if sizeof($sources) > 3}style="height: 200px; overflow-y: scroll;"{/if}>
{foreach from=$sources item=source}
<li class="form-group">
{l s='From'} {if $source['http_referer'] != ''}<a class="order_detail_link" href="{$source['http_referer']}">{parse_url($source['http_referer'], $smarty.const.PHP_URL_HOST)|regex_replace:'/^www./':''}</a>{else}-{/if} {l s='To'} <a class="order_detail_link" href="http://{$source['request_uri']}">{$source['request_uri']|truncate:100:'...'}</a> <br />
{l s='From'} {if $source['http_referer'] != ''}<a href="{$source['http_referer']}">{parse_url($source['http_referer'], $smarty.const.PHP_URL_HOST)|regex_replace:'/^www./':''}</a>{else}-{/if} {l s='To'} <a href="http://{$source['request_uri']}">{$source['request_uri']|truncate:100:'...'}</a> <br />
{if $source['keywords']}<b>{l s='Keywords'}</b>: {$source['keywords']}<br />{/if}
{dateFormat date=$source['date_add'] full=true}<br />
</li>

View File

@@ -29,7 +29,7 @@
</div>
</div>
</div>
<div class="add_room_fields" style="display:none;">
<div class="add_room_fields bookingDuration" style="display:none;">
<div class="row form-group">
<div class="col-sm-6 room_check_in_div">
<label class="control-label">{l s='Check-In'}</label>

View File

@@ -52,7 +52,7 @@
</div>
</td>
<td>{displayPrice price=$demand['total_price_tax_excl'] currency=$orderCurrency}</td>
<td><a class="btn btn-danger pull-right del-order-room-demand" href="#" id_booking_demand="{$demand['id_booking_demand']}"><i class="icon-trash"></i></a></td>
<td class="text-right"><a class="btn btn-danger pull-right del-order-room-demand" href="#" id_booking_demand="{$demand['id_booking_demand']}"><i class="icon-trash"></i></a></td>
</tr>
{/foreach}
{/foreach}
@@ -77,7 +77,7 @@
<th></th>
<th>{l s='Name'}</th>
<th>{l s='Option'}</th>
<th class="text-right">{l s='Unit Price'}</th>
<th>{l s='Unit Price'}</th>
</tr>
</thead>
<tbody>
@@ -105,8 +105,7 @@
<input type="hidden" class="id_option" value="0" />
{/if}
</td>
<td class="text-right">
<td>
<div class="input-group">
<span class="input-group-addon">{$currencySign}</span>
{if isset($selected_adv_option) && isset($demand['adv_option'][$selected_adv_option]['price_tax_excl'])}
@@ -139,7 +138,7 @@
<tr>
<th>{l s='Name'}</th>
<th>{l s='Unit Price'}</th>
<th class="text-right">{l s='Total Price'}</th>
<th>{l s='Total Price'}</th>
</tr>
</thead>
<tbody>
@@ -154,7 +153,7 @@
{l s='/ night'}
{/if}
</td>
<td class="text-right">{displayPrice price=$demand['total_price_tax_excl'] currency=$orderCurrency}</td>
<td>{displayPrice price=$demand['total_price_tax_excl'] currency=$orderCurrency}</td>
</tr>
{/foreach}
{/foreach}

View File

@@ -32,7 +32,7 @@
<tr>
<th>{l s='Name'}</th>
<th class="fixed-width-sm"></th>
<th class="fixed-width-sm">{l s='Quantity'}</th>
<th class="fixed-width-sm text-center">{l s='Quantity'}</th>
<th>{l s='Unit Price'}</th>
<th>{l s='Total Price'}</th>
<th class="text-right">{l s='Action'}</th>
@@ -45,7 +45,7 @@
<td>
<div>{$service['name']|escape:'html':'UTF-8'}</div>
</td>
<td class="text-center">
<td>
{if $service['product_auto_add'] && $service['product_price_addition_type'] == Product::PRICE_ADDITION_TYPE_WITH_ROOM}
<span class="badge badge-info label">{l s='Auto added'}</span><br>
{/if}
@@ -53,7 +53,7 @@
<span class="badge badge-info label">{l s='Convenience fee'}</span>
{/if}
</td>
<td>
<td class="text-center">
{if $service['allow_multiple_quantity']}
<div class="qty_container">
<input type="number" class="form-control qty" min="1" data-id_product="{$service['id_product']|escape:'html':'UTF-8'}" value="{$service['quantity']|escape:'html':'UTF-8'}">
@@ -78,7 +78,7 @@
{/if} *}
</td>
<td>{displayPrice price=$service['total_price_tax_excl']|escape:'html':'UTF-8' currency=$orderCurrency}</td>
<td><a class="btn btn-danger pull-right del_room_additional_service" data-id_room_type_service_product_order_detail="{$service['id_room_type_service_product_order_detail']}" href="#"><i class="icon-trash"></i></a></td>
<td class="text-right"><a class="btn btn-danger pull-right del_room_additional_service" data-id_room_type_service_product_order_detail="{$service['id_room_type_service_product_order_detail']}" href="#"><i class="icon-trash"></i></a></td>
</tr>
{/foreach}
{else}
@@ -100,7 +100,7 @@
<th></th>
<th>{l s='Name'}</th>
<th class="fixed-width-sm"> </th>
<th class="fixed-width-sm">{l s='Quantity'}</th>
<th class="fixed-width-sm text-center">{l s='Quantity'}</th>
<th>{l s='Unit Price'}</th>
</tr>
</thead>
@@ -121,7 +121,7 @@
<span class="badge badge-info label">{l s='Convenience fee'}</span>
{/if}
</td>
<td>
<td class="text-center">
{if $product['allow_multiple_quantity']}
<div class="qty_container">
<input type="number" class="form-control qty" min="1" id="qty_{$product['id_product']|escape:'html':'UTF-8'}" name="service_qty[{$product['id_product']|escape:'html':'UTF-8'}]" data-id-product="{$product.id_product|escape:'html':'UTF-8'}" value="1">
@@ -160,7 +160,7 @@
<th>{l s='Name'}</th>
<th></th>
<th>{l s='Unit Price'}</th>
<th class="text-right">{l s='Total Price'}</th>
<th>{l s='Total Price'}</th>
</tr>
</thead>
</tbody>
@@ -170,7 +170,7 @@
{$service['id_product']|escape:'html':'UTF-8'} <a target="blank" href="{$link->getAdminLink('AdminNormalProducts')|escape:'html':'UTF-8'}&amp;id_product={$service['id_product']|escape:'html':'UTF-8'}&amp;updateproduct"><i class="icon-external-link-sign"></i></a>
</td>
<td>{$service['name']|escape:'html':'UTF-8'}</td>
<td class="text-center">
<td>
{if $service['product_auto_add'] && $service['product_price_addition_type'] == Product::PRICE_ADDITION_TYPE_INDEPENDENT}
<span class="badge badge-info label">{l s='Convenience fee'}</span>
{/if}
@@ -184,7 +184,7 @@
{l s='/ night'}
{/if}
</td>
<td class="text-right">
<td>
{displayPrice price=$service['total_price_tax_excl'] currency=$orderCurrency}
</td>
</tr>

View File

@@ -48,7 +48,7 @@
<div class="text-bold" id="invoice_number"></div>
</div>
</div>
<div class="form-group row">
{* <div class="form-group row">
<div class="col-sm-6">
<label class="control-label">{l s='Card Number'}</label>
<div class="text-bold" id="card_number"></div>
@@ -67,5 +67,5 @@
<label class="control-label">{l s='Card Holder'}</label>
<div class="text-bold" id="card_holder"></div>
</div>
</div>
</div> *}
</div>

View File

@@ -20,10 +20,10 @@
<div class="modal-body">
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active">
<a class="order_detail_link" href="#reallocate_room_tab" aria-controls="reallocate" role="tab" data-toggle="tab">{l s='Room Reallocation'}</a>
<a href="#reallocate_room_tab" aria-controls="reallocate" role="tab" data-toggle="tab">{l s='Room Reallocation'}</a>
</li>
<li role="presentation">
<a class="order_detail_link" href="#swap_room_tab" aria-controls="swap" role="tab" data-toggle="tab">{l s='Swap Room'}</a>
<a href="#swap_room_tab" aria-controls="swap" role="tab" data-toggle="tab">{l s='Swap Room'}</a>
</li>
</ul>
<div class="tab-content order-panel active">

View File

@@ -6267,8 +6267,8 @@ class AdminOrdersControllerCore extends AdminController
$objOrderDetail->product_quantity += $quantityDiff;
$objOrderDetail->total_price_tax_excl += $priceDiffTaxExcl;
$objOrderDetail->total_price_tax_incl += $priceDiffTaxIncl;
$objOrderDetail->unit_price_tax_excl = ($objOrderDetail->total_price_tax_excl / $objOrderDetail->product_quantity);
$objOrderDetail->unit_price_tax_incl = ($objOrderDetail->total_price_tax_incl / $objOrderDetail->product_quantity);
$objOrderDetail->unit_price_tax_excl = Tools::ps_round(($objOrderDetail->total_price_tax_excl / $objOrderDetail->product_quantity), 6);
$objOrderDetail->unit_price_tax_incl = Tools::ps_round(($objOrderDetail->total_price_tax_incl / $objOrderDetail->product_quantity), 6);
$res &= $objOrderDetail->updateTaxAmount($order);
$res &= $objOrderDetail->update();

View File

@@ -1660,11 +1660,9 @@ $(document).ready(function() {
// open date picker for the date input of check-in checkout dates
$(document).on('focus', '.room_status_date', function() {
var dateFrom = $(this).closest('.room_status_info_form').find('[name="date_from"]').val();
dateFrom = dateFrom.split("-");
minDate = new Date(dateFrom+'T00:00:00');
var dateTo = $(this).closest('.room_status_info_form').find('[name="date_to"]').val();
dateTo = dateTo.split("-");
maxDate = new Date(dateTo+'T23:59:59');
$(this).datetimepicker({
@@ -2449,6 +2447,7 @@ const AddRoomBookingModal = {
$('#new_product').find("input.add_room_date_to").val(date_out);
//End
// initialize datepickers
AddRoomBookingModal.initDatePickers();
addRoomRefreshTotal();
@@ -2484,12 +2483,14 @@ const AddRoomBookingModal = {
}
});
$('.add_room_date_to').datepicker({
$(".add_room_date_to").datepicker(
{
showOtherMonths: true,
dateFormat: 'dd-mm-yy',
beforeShow : function () {
var date_from = $.datepicker.parseDate('dd-mm-yy', $(this).closest('.bookingDuration').find('.add_room_date_from').val());
date_from.setDate(date_from.getDate() + 1);
$(this).datepicker("option", "minDate", date_from);
}
});
@@ -2541,37 +2542,8 @@ const EditRoomBookingModal = {
$('#edit_product .edit_product_date_to_actual').attr('value', jsonProductLineData.date_to);
$('#edit_product .room_unit_price').val(parseFloat(jsonProductLineData.paid_unit_price_tax_excl));
//@todo: Putting below datepicker js outside this not working
$('#edit_product .edit_product_date_from').datepicker({
showOtherMonths: true,
dateFormat: 'dd-mm-yy',
altField: '#edit_product .edit_product_date_from_actual',
onSelect: function(selectedDate) {
let objDateToMin = $.datepicker.parseDate('dd-mm-yy', selectedDate);
objDateToMin.setDate(objDateToMin.getDate() + 1);
$('#edit_product .edit_product_date_to').datepicker('option', 'minDate', objDateToMin);
},
beforeShow : function () {
if(allowBackdateOrder) {
var minDate = null;
} else {
var minDate = new Date(Math.min($.datepicker.parseDate('dd-mm-yy', $(this).data('min_date')), new Date()));
}
$(this).datepicker("option", "minDate", minDate);
}
});
$('#edit_product .edit_product_date_to').datepicker({
showOtherMonths: true,
dateFormat: 'dd-mm-yy',
altField: '#edit_product .edit_product_date_to_actual',
beforeShow : function () {
var date_from = $.datepicker.parseDate('dd-mm-yy', $(this).closest('.form-group').find('.edit_product_date_from').val());
date_from.setDate(date_from.getDate() + 1);
$(this).datepicker("option", "minDate", date_from);
}
});
// initialize datepickers
EditRoomBookingModal.initDatePickers();
$('#edit_product .extra-services-container #id_htl_booking').val(jsonProductLineData.id);
$('#edit-room-booking-modal').modal('show');
@@ -2580,6 +2552,38 @@ const EditRoomBookingModal = {
}
}
});
},
initDatePickers: function() {
$('#edit_product .edit_product_date_from').datepicker({
showOtherMonths: true,
dateFormat: 'dd-mm-yy',
altField: '#edit_product .edit_product_date_from_actual',
onSelect: function(selectedDate) {
let objDateToMin = $.datepicker.parseDate('dd-mm-yy', selectedDate);
objDateToMin.setDate(objDateToMin.getDate() + 1);
$('#edit_product .edit_product_date_to').datepicker('option', 'minDate', objDateToMin);
},
beforeShow : function () {
if(allowBackdateOrder) {
var minDate = null;
} else {
var minDate = new Date(Math.min($.datepicker.parseDate('dd-mm-yy', $(this).data('min_date')), new Date()));
}
$(this).datepicker("option", "minDate", minDate);
}
});
$('#edit_product .edit_product_date_to').datepicker({
showOtherMonths: true,
dateFormat: 'dd-mm-yy',
altField: '#edit_product .edit_product_date_to_actual',
beforeShow : function () {
var date_from = $.datepicker.parseDate('dd-mm-yy', $(this).closest('.form-group').find('.edit_product_date_from').val());
date_from.setDate(date_from.getDate() + 1);
$(this).datepicker("option", "minDate", date_from);
}
});
}
};