diff --git a/admin/themes/default/sass/controllers/_order.sass b/admin/themes/default/sass/controllers/_order.sass index 8c054362e..2cce1d798 100644 --- a/admin/themes/default/sass/controllers/_order.sass +++ b/admin/themes/default/sass/controllers/_order.sass @@ -96,3 +96,20 @@ right: 0 left: unset font-size: 14px + +#order-details-price + .icon-bold + font-weight: 600 + #convenience_services, #order_tax_details + .panel + .table + tr + &:last-child td + border-bottom: none + td + background-color: #F5F8F9 + padding: 10px + background-color: #F5F8F9 + // Adding transparent border for display while printing screen + border: solid 1px transparent + border-radius: 0 \ No newline at end of file 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/sass/partials/_tree.sass b/admin/themes/default/sass/partials/_tree.sass index 897c29f85..39b2be7e6 100644 --- a/admin/themes/default/sass/partials/_tree.sass +++ b/admin/themes/default/sass/partials/_tree.sass @@ -7,6 +7,7 @@ font-size: $icon-size-base .tree list-style: none + overflow: auto @include padding(0, 0, 0, 20px) input vertical-align: baseline @@ -42,6 +43,14 @@ &:hover color: #ccc background-color: none + .node-hint + font-style: italic + color: #959595 + margin-left: 30px + margin-top: -4px + margin-bottom: 4px + .badge + margin-left: 5px .tree-actions display: inline-block diff --git a/admin/themes/default/template/controllers/addresses/helpers/form/form.tpl b/admin/themes/default/template/controllers/addresses/helpers/form/form.tpl index 9fd0f69e6..d0f8312d6 100644 --- a/admin/themes/default/template/controllers/addresses/helpers/form/form.tpl +++ b/admin/themes/default/template/controllers/addresses/helpers/form/form.tpl @@ -71,6 +71,7 @@ $('input[name=lastname]').val(infos[1]); $('input[name=company]').val(infos[2]); $('input[name=id_customer]').val(infos[3]); + $('input[name=phone]').val(infos[4]); } else { resetCustomerRelatedAddressFields(); } 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 +*} +
+ +

 {l s='Confirm Delete'}

+ {if isset($cartRules)} +

{l s='The following cart rules in your selection were created dynamically from refunds or credit slips. Please confirm if you also intend to delete these cart rules?'}

+ {else} +

{l s='Are you sure, you want to delete the selected cart rules?'}

+ + {/if} +
+{if isset($cartRules)} +
+
+ + + + + + + + + + + {foreach $cartRules as $cartRule} + + + + + + + + + {/foreach} +
+ + {l s='Cart Rule'} + + {l s='Reason'} + + {l s='Order'} + + {l s='Amount'} +
+ + + #{$cartRule['id_cart_rule']} + + {if $cartRule['generated_by'] == CartRule::GENERATED_BY_REFUND} + {l s='Generated against refund'} + (#{$cartRule['id_generated_by']}) + {else if $cartRule['generated_by'] == CartRule::GENERATED_BY_ORDER_SLIP} + {l s='Generated against credit slip'} + (#{$cartRule['id_generated_by']}) + {/if} + {if !$cartRule['cart_rule']->quantity} + {l s='Used'} + {/if} + + #{$cartRule['order']->id} + + {displayPrice price=$cartRule['cart_rule']->reduction_amount currency=$cartRule['cart_rule']->reduction_currency} +
+
+
+{/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 +*} +
+ +

{l s='Confirm Delete'}

+

{l s='Are you sure, you want to delete this cart rule?'}

+
+{if isset($cartRule)} +
+
+
+ +

+ {$cartRule->code} (#{$cartRule->id}) +

+
+
+ +

+ {if $generatedBy == CartRule::GENERATED_BY_REFUND} + {l s='Generated against refund'} + (#{$generatedById}) + {else if $generatedBy == CartRule::GENERATED_BY_ORDER_SLIP} + {l s='Generated against credit slip'} + (#{$generatedById}) + {/if} +

+
+
+ +

{displayPrice price=$cartRule->reduction_amount currency=$cartRule->reduction_currency}

+
+
+ +

+ {$customer->firstname} {$customer->lastname} (#{$customer->id}) +

+
+
+ +

+ {$order->reference} (#{$order->id}) +

+
+ {if !$cartRule->quantity} +
+ +

+ {l s='Used'} +

+
+ {/if} +
+
+{/if} \ No newline at end of file diff --git a/admin/themes/default/template/controllers/customer_threads/helpers/view/view.tpl b/admin/themes/default/template/controllers/customer_threads/helpers/view/view.tpl index 31b65cf8a..2d4a2409f 100644 --- a/admin/themes/default/template/controllers/customer_threads/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/customer_threads/helpers/view/view.tpl @@ -33,7 +33,7 @@ {if isset($next_thread) && $next_thread} {$next_thread.name} - + {/if}
@@ -71,7 +71,7 @@

{if $count_ok} - {l s='[1]%1$d[/1] order(s) validated for a total amount of [2]%2$s[/2]' sprintf=[$count_ok, $total_ok] tags=['', '']} + {l s='[1]%1$d[/1] order(s) validated, total amount paid [2]%2$s[/2]' sprintf=[$count_ok, $total_ok] tags=['', '']} {else} {l s="No orders validated for the moment"} {/if} @@ -115,7 +115,7 @@
{l s="Choose a template"} - --> + --> @@ -159,7 +159,7 @@ }); timer = setInterval("markAsRead()", 3000); }); - + function markAsRead() { $.ajax({ 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 18145ce07..8213ed88d 100644 --- a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl @@ -54,6 +54,12 @@

{if $gender->name}{$gender->name}{else}{l s='Unknown'}{/if}

+
+ +
+

{$customer->phone}

+
+
@@ -197,85 +203,122 @@ {if $orders AND count($orders)} {assign var=count_ok value=count($orders_ok)} {assign var=count_ko value=count($orders_ko)} -
-
-
- - {l s='Valid orders:'} - {$count_ok} - {l s='for a total amount of %s' sprintf=$total_ok} -
-
- - {l s='Invalid orders:'} - {$count_ko} + {if $count_ok || $count_ko} +
+ +
+
+
+
+ {l s='Total amount received: %s' sprintf=$total_ok} +
+
+
+ {if $count_ok} + + + + + + + + + + + + + + {foreach $orders_ok AS $key => $order} + + + + + + + + + + {/foreach} + +
{l s='ID'}{l s='Date'}{l s='Payment'}{l s='Status'}{l s='Products'}{l s='Total spent'}
{$order['id_order']}{dateFormat date=$order['date_add'] full=0}{$order['payment']}{$order['order_state']}{$order['nb_products']}{$order['total_paid_real']} + + {l s='View'} + +
+ {else} +

+ {l s='No valid order found!!'} +

+ {/if} +
+ +
+
+
+ {l s='Order total: %s' sprintf=$total_ko} +
+
+
+ {if $count_ko} + + + + + + + + + + + + + + {foreach $orders_ko AS $key => $order} + + + + + + + + + + {/foreach} + +
{l s='ID'}{l s='Date'}{l s='Payment'}{l s='Status'}{l s='Products'}{l s='Total spent'}
{$order['id_order']}{dateFormat date=$order['date_add'] full=0}{$order['payment']}{$order['order_state']}{$order['nb_products']}{$order['total_paid_real']} + + {l s='View'} + +
+ {else} +

+ {l s='No invalid order found!!'} +

+ {/if} +
-
- - {if $count_ok} - - - - - - - - - - - - - - {foreach $orders_ok AS $key => $order} - - - - - - - - - - {/foreach} - -
{l s='ID'}{l s='Date'}{l s='Payment'}{l s='Status'}{l s='Products'}{l s='Total spent'}
{$order['id_order']}{dateFormat date=$order['date_add'] full=0}{$order['payment']}{$order['order_state']}{$order['nb_products']}{$order['total_paid_real']} - - {l s='View'} - -
{/if} - {if $count_ko} - - - - - - - - - - - - - {foreach $orders_ko AS $key => $order} - - - - - - - - - {/foreach} - -
{l s='ID'}{l s='Date'}{l s='Payment'}{l s='Status'}{l s='Products'}{l s='Total spent'}
{$order['id_order']}{dateFormat date=$order['date_add'] full=0}{$order['payment']}{$order['order_state']}{$order['nb_products']}{$order['total_paid_real']}
- {/if} {else} -

- {l s='%1$s %2$s has not placed any orders yet' sprintf=[$customer->firstname, $customer->lastname]} -

+

+ {l s='%1$s %2$s has not placed any orders yet' sprintf=[$customer->firstname, $customer->lastname]} +

{/if}
@@ -289,7 +332,6 @@ {l s='ID'} {l s='Date'} - {l s='Carrier'} {l s='Total'} @@ -302,7 +344,6 @@ {dateFormat date=$cart['date_upd'] full=0} - {$cart['name']} {$cart['total_price']} {/foreach} @@ -315,33 +356,95 @@ {/if}
{if $products AND count($products)} -
-
- {l s='Purchased products'} {count($products)} +
+
+ {l s='Room types and services'} {count($products)} +
+
+ +
+ {if $count_room_types} +
+ + + + + + + + + + + {foreach $purchasedRoomTypes AS $key => $product} + + + + + + + {/foreach} + +
{l s='ID Order'}{l s='Name'}{l s='Nights booked'}{l s='Booking Date'}
+ + #{$product['id_order']} + + + {$product['product_name']} + {$product['product_quantity']}{dateFormat date=$product['date_add'] full=0}
+
+ {/if} + {if $count_services} +
+ + + + + + + + + + + {foreach $purchasedServices AS $key => $product} + + + + + + + {/foreach} + +
{l s='ID Order'}{l s='Name'}{l s='Quantity'}{l s='Booking Date'}
+ + #{$product['id_order']} + + + {$product['product_name']} + {$product['product_quantity']}{dateFormat date=$product['date_add'] full=0}
+
+ {/if} +
+
- - - - - - - - - - {foreach $products AS $key => $product} - - - - - - {/foreach} - -
{l s='Date'}{l s='Name'}{l s='Quantity'}
{dateFormat date=$product['date_add'] full=0} - - {$product['product_name']} - - {$product['product_quantity']}
-
{/if} {if count($interested)}
@@ -454,7 +557,7 @@ - + diff --git a/admin/themes/default/template/controllers/import/helpers/form/form.tpl b/admin/themes/default/template/controllers/import/helpers/form/form.tpl index 5bf19d342..5d74f7313 100644 --- a/admin/themes/default/template/controllers/import/helpers/form/form.tpl +++ b/admin/themes/default/template/controllers/import/helpers/form/form.tpl @@ -25,7 +25,7 @@
{block name="leadin"}{/block}
{if $module_confirmation}
- {l s='Your .CSV file has been successfully imported into your shop. Don\'t forget to re-build the products\' search index.'} + {l s='Your .CSV file has been successfully imported to your website.'}
{/if}
@@ -63,7 +63,6 @@
  • {l s='Note that the Category import does not support having two categories with the same name.'}
    • -
  • {l s='Note that you can have several products with the same reference.'}
@@ -166,12 +165,12 @@