diff --git a/admin/themes/default/sass/partials/_kpi.sass b/admin/themes/default/sass/partials/_kpi.sass index e6ccfe8cb..6e2e15fbf 100644 --- a/admin/themes/default/sass/partials/_kpi.sass +++ b/admin/themes/default/sass/partials/_kpi.sass @@ -16,6 +16,7 @@ $kpi-gap: 10px flex-wrap: wrap margin-left: -($kpi-gap / 2) margin-right: -($kpi-gap / 2) + flex-grow: 1 .kpi-wrap display: inline-block width: 20% diff --git a/admin/themes/default/sass/partials/_print.sass b/admin/themes/default/sass/partials/_print.sass index 118b98014..2732a42aa 100644 --- a/admin/themes/default/sass/partials/_print.sass +++ b/admin/themes/default/sass/partials/_print.sass @@ -65,7 +65,7 @@ margin-bottom: 0 !important #addressInvoice width: 49% !important - float: right !important + float: right !important margin-bottom: 0 !important #status tr:first-child td @@ -81,15 +81,14 @@ i display: none !important .kpi-container.panel - margin: 30px 0 20px 0 !important border: solid 1px black !important + .actions-wrap + display: none .box-stats - padding: 10px 0 !important height: auto !important - width: 25% !important font-size: 8pt !important - i - font-size: 20pt !important + span.arrow + display: none .alert border: 1px solid black !important &:before @@ -99,3 +98,38 @@ margin: 0 !important .panel-total td font-size: 13pt!important + + + #customer_cart_details + thead + display: none + tr + display: block + border: 1px solid #ccc + -webkit-box-shadow: #EAEDEF 0 2px 0 0 + box-shadow: #EAEDEF 0 2px 0 0 + width: 100% + margin-bottom: 6px + td + display: block + display: grid + grid-template-columns: 2fr 3fr + text-align: center !important + position: relative + width: 100% !important + text-align: left !important + line-height: 2em !important + font-size: 1.15em !important + white-space: nowrap + overflow: hidden + text-overflow: ellipsis + > span + padding: 0px 5px + > span:nth-child(1) + border-right: 1px solid #EAEDEF + padding-right: 10px + white-space: nowrap + color: #aaa + text-align: right + font-size: .9em + font-style: italic \ No newline at end of file diff --git a/admin/themes/default/template/controllers/cart_rules/modal_confirm_bulk_delete.tpl b/admin/themes/default/template/controllers/cart_rules/modal_confirm_bulk_delete.tpl new file mode 100644 index 000000000..30c9df455 --- /dev/null +++ b/admin/themes/default/template/controllers/cart_rules/modal_confirm_bulk_delete.tpl @@ -0,0 +1,83 @@ +{* +* Since 2010 Webkul. +* +* NOTICE OF LICENSE +* +* All right is reserved, +* Please go through this link for complete license : https://store.webkul.com/license.html +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade this module to newer +* versions in the future. If you wish to customize this module for your +* needs please refer to https://store.webkul.com/customisation-guidelines/ for more information. +* +* @author Webkul IN +* @copyright Since 2010 Webkul IN +* @license https://store.webkul.com/license.html +*} + +{if isset($cartRules)} + +{/if} \ No newline at end of file diff --git a/admin/themes/default/template/controllers/cart_rules/modal_confirm_delete.tpl b/admin/themes/default/template/controllers/cart_rules/modal_confirm_delete.tpl new file mode 100644 index 000000000..eb08eb9e4 --- /dev/null +++ b/admin/themes/default/template/controllers/cart_rules/modal_confirm_delete.tpl @@ -0,0 +1,71 @@ +{* +* Since 2010 Webkul. +* +* NOTICE OF LICENSE +* +* All right is reserved, +* Please go through this link for complete license : https://store.webkul.com/license.html +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade this module to newer +* versions in the future. If you wish to customize this module for your +* needs please refer to https://store.webkul.com/customisation-guidelines/ for more information. +* +* @author Webkul IN +* @copyright Since 2010 Webkul IN +* @license https://store.webkul.com/license.html +*} + +{if isset($cartRule)} + +{/if} \ No newline at end of file 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 07f87ca73..a33e41262 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 @@ -118,7 +118,7 @@ {assign var=shown_room_type_price value=$data.product_price_tax_excl} {/if}
- + {$currency->prefix}{$currency->suffix}
diff --git a/admin/themes/default/template/controllers/orders/_overbookings.tpl b/admin/themes/default/template/controllers/orders/_overbookings.tpl index 8f0064708..963b33489 100644 --- a/admin/themes/default/template/controllers/orders/_overbookings.tpl +++ b/admin/themes/default/template/controllers/orders/_overbookings.tpl @@ -42,7 +42,7 @@ {dateFormat date=$data['date_from']} {l s='To'} {dateFormat date=$data['date_to']} {if $order->with_occupancy && $data['children']} - {else} - {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} + {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} {/if} diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl index 11ab4b428..453398fd0 100644 --- a/admin/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin/themes/default/template/controllers/orders/_product_line.tpl @@ -35,33 +35,11 @@

{$data.room_type}

- {dateFormat date=$data.date_from} - {dateFormat date=$data.date_to} - - {if $can_edit} - - {/if} + {dateFormat date=$data.date_from} - {dateFormat date=$data.date_to} {if $data['children']} - {else} - {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} + {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} {/if} - - -

- - {convertPriceWithCurrency price=$data['total_price_tax_excl'] currency=$currency->id} - -

-

{l s='Per day price:'} {convertPriceWithCurrency price=$data['paid_unit_price_tax_excl'] currency=$currency->id}

-
- +

+ + {convertPriceWithCurrency price=$data['total_price_tax_excl'] currency=$currency->id} + +

+

{l s='Per day price:'} {convertPriceWithCurrency price=$data['paid_unit_price_tax_excl'] currency=$currency->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} - {if $data['extra_demands']|count || $data['additional_services']|count} - - - - {/if} - - - - - {convertPriceWithCurrency price=($data['total_room_tax']) currency=$currency->id} - - - {convertPriceWithCurrency price=($data['total_room_price_ti']) currency=$currency->id} - {if $can_edit} - {/if} + + {convertPriceWithCurrency price=($data['total_room_tax']) currency=$currency->id} + + + {convertPriceWithCurrency price=($data['total_room_price_ti']) currency=$currency->id} + {if (isset($refundReqBookings) && $refundReqBookings)} {if $data.id|in_array:$refundReqBookings} @@ -220,19 +107,6 @@ {/if} {if ($can_edit && !$order->hasBeenDelivered())} - - {if sizeof($invoices_collection)} - - {else} -   - {/if} -
{if isset($refundReqBookings) && $refundReqBookings && $data.id|in_array:$refundReqBookings && $data.is_cancelled} diff --git a/admin/themes/default/template/controllers/orders/form.tpl b/admin/themes/default/template/controllers/orders/form.tpl index 3cd980765..8b7dae366 100644 --- a/admin/themes/default/template/controllers/orders/form.tpl +++ b/admin/themes/default/template/controllers/orders/form.tpl @@ -275,7 +275,7 @@ id_room: parseInt($(cart_row).attr('data-id-room')), date_from: $(cart_row).attr('data-date-from'), date_to: $(cart_row).attr('data-date-to'), - price: new Number($(this).val().replace(",",".")).toFixed(4).toString(), + price: new Number($(this).val().replace(",",".")).toString(), id_cart: id_cart }; updateProductPrice(params, cart_row); @@ -667,6 +667,8 @@ tab: "AdminCarts", action: "updateProductPrice", params: params, + id_cart: id_cart, + id_customer: id_customer }, success : function(response) { updateCartLine(response.curr_booking_info, cart_row); diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index 053ca5a45..7cc1b7c09 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -855,6 +855,8 @@ {assign var=room_price_tax_incl value=$order->getTotalProductsWithTaxes(false, true)} {assign var=service_products_price_tax_excl value=$order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITHOUT_ROOMTYPE)} {assign var=service_products_price_tax_incl value=$order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITHOUT_ROOMTYPE)} + {assign var=convenience_fee_price_tax_excl value=$order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT)} + {assign var=convenience_fee_price_tax_incl value=$order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT)} {assign var=additional_service_price_tax_excl value=($order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE) + $totalDemandsPriceTE)} {assign var=additional_service_price_tax_incl value=($order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE) + $totalDemandsPriceTI)} {if $room_price_tax_excl} @@ -870,7 +872,7 @@ {l s='Total Extra services (Tax excl.)'} - {displayPrice price=($additional_service_price_tax_excl - $totalConvenienceFeeTE) currency=$currency->id} + {displayPrice price=($additional_service_price_tax_excl - $convenience_fee_price_tax_excl) currency=$currency->id} @@ -885,11 +887,11 @@ {/if} - {if isset($totalConvenienceFeeTE) && $totalConvenienceFeeTE > 0} + {if isset($convenience_fee_price_tax_excl) && $convenience_fee_price_tax_excl > 0} {l s='Convenience Fee (Tax excl.)'} - {displayPrice price=$totalConvenienceFeeTE currency=$currency->id} + {displayPrice price=$convenience_fee_price_tax_excl currency=$currency->id} @@ -908,16 +910,16 @@ {l s='Extra services Tax'} - {displayPrice price=(($additional_service_price_tax_incl - $additional_service_price_tax_excl) - ($totalConvenienceFeeTI - $totalConvenienceFeeTE)) currency=$currency->id} + {displayPrice price=(($additional_service_price_tax_incl - $additional_service_price_tax_excl) - ($convenience_fee_price_tax_incl - $convenience_fee_price_tax_excl)) currency=$currency->id} {/if} - {if isset($totalConvenienceFeeTE) && $totalConvenienceFeeTE > 0} + {if isset($convenience_fee_price_tax_excl) && $convenience_fee_price_tax_excl > 0} {l s='Convenience Fee Tax'} - {displayPrice price=($totalConvenienceFeeTI - $totalConvenienceFeeTE) currency=$currency->id} + {displayPrice price=($convenience_fee_price_tax_incl - $convenience_fee_price_tax_excl) currency=$currency->id} @@ -1098,13 +1100,13 @@
{/if} -
+
 {l s='Messages'} {sizeof($customer_thread_message)} {l s='Show all messages'}
-
+
diff --git a/admin/themes/default/template/controllers/slip/_status_change_link.tpl b/admin/themes/default/template/controllers/slip/_status_change_link.tpl index 958a76581..c1d720530 100644 --- a/admin/themes/default/template/controllers/slip/_status_change_link.tpl +++ b/admin/themes/default/template/controllers/slip/_status_change_link.tpl @@ -17,7 +17,7 @@ * @license LICENSE.txt *} - + {l s='Change Status'} diff --git a/admin/themes/default/template/controllers/slip/modal_confirm_update.tpl b/admin/themes/default/template/controllers/slip/modal_confirm_update.tpl new file mode 100644 index 000000000..ac6e1d40d --- /dev/null +++ b/admin/themes/default/template/controllers/slip/modal_confirm_update.tpl @@ -0,0 +1,49 @@ +{* +* Since 2010 Webkul. +* +* NOTICE OF LICENSE +* +* All right is reserved, +* Please go through this link for complete license : https://store.webkul.com/license.html +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade this module to newer +* versions in the future. If you wish to customize this module for your +* needs please refer to https://store.webkul.com/customisation-guidelines/ for more information. +* +* @author Webkul IN +* @copyright Since 2010 Webkul IN +* @license https://store.webkul.com/license.html +*} + + \ No newline at end of file diff --git a/admin/themes/default/template/modal.tpl b/admin/themes/default/template/modal.tpl index e785c99d4..360e1cc48 100644 --- a/admin/themes/default/template/modal.tpl +++ b/admin/themes/default/template/modal.tpl @@ -26,10 +26,10 @@