diff --git a/admin/themes/default/sass/controllers/_products.sass b/admin/themes/default/sass/controllers/_products.sass index ee8e97e75..492efa75b 100644 --- a/admin/themes/default/sass/controllers/_products.sass +++ b/admin/themes/default/sass/controllers/_products.sass @@ -1,5 +1,31 @@ #leave_bprice margin-left: 0px +.padding-top-20 + padding-top: 20px +.modal-subtitle + font-weight: 400 + color: #333333 + font-size: 13px + padding-bottom: 10px +.rooms-disable-dates-title + .rooms-disable-dates + thead + tr + background-color: #f1f1f1 + margin-top: 15px + padding-bottom: 5px + font-size: 13px + border-bottom: solid 1px #EAEDEF +.rooms_bulk_actions + .dropdown-menu + li > a:hover + cursor: pointer +#bulk-update-rooms-button[disabled] + &:hover + cursor: not-allowed + border-color: $btn-default-border +.add_disable_date_row_container + margin-top: 5px #deactiveDatesModal .fc-popover-body .fc-daygrid-event-harness @@ -114,4 +140,4 @@ padding: 15px border-radius: 6px .tooltip_action_block - min-width: unset \ No newline at end of file + min-width: unset diff --git a/admin/themes/default/sass/partials/_forms.sass b/admin/themes/default/sass/partials/_forms.sass index b18d679e3..02037f992 100644 --- a/admin/themes/default/sass/partials/_forms.sass +++ b/admin/themes/default/sass/partials/_forms.sass @@ -67,7 +67,7 @@ textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[ty @include box-shadow(none) &.btn-default[disabled] border-color: $gray-light - color: $gray-light + color: $main-color background-color: lighten($gray-light,35%) .dropdown-menu diff --git a/admin/themes/default/template/controllers/carts/helpers/view/view.tpl b/admin/themes/default/template/controllers/carts/helpers/view/view.tpl index 41f4ee2fe..2fd68d44f 100644 --- a/admin/themes/default/template/controllers/carts/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/carts/helpers/view/view.tpl @@ -109,7 +109,7 @@ {displayWtPriceWithCurrency price=$room['feature_price_tax_excl'] currency=$currency} - {if (isset($room['extra_demands']) && $room['extra_demands']) || (isset($room['additional_service']) && $room['additional_service'])} + {if (isset($room['selected_demands']) && $room['selected_demands']) || (isset($room['selected_services']) && $room['selected_services'])} {displayWtPriceWithCurrency price=($room['demand_price'] + $room['additional_service_price'] + $room['additional_services_auto_add_price'])|escape:'html':'UTF-8' currency=$currency} @@ -118,7 +118,7 @@ {/if} - {if (isset($room['extra_demands']) && $room['extra_demands']) || (isset($room['additional_service']) && $room['additional_service'])} + {if (isset($room['selected_demands']) && $room['selected_demands']) || (isset($room['selected_services']) && $room['selected_services'])} {displayWtPriceWithCurrency price=($room['amt_with_qty'] + $room['additional_services_auto_add_price'] + $room['demand_price'] + $room['additional_service_price'])|escape:'html':'UTF-8' currency=$currency} {else} {displayWtPriceWithCurrency price=$room['amt_with_qty']|escape:'html':'UTF-8' currency=$currency} @@ -166,7 +166,13 @@
-

{if isset($roomDemand['adv_option']) && $roomDemand['adv_option']}{convertPrice price = $roomDemand['adv_option'][$idGlobalDemand]['price']|escape:'html':'UTF-8'}{else}{convertPrice price = $roomDemand['price']|escape:'html':'UTF-8'}{/if}

+

+ {if isset($roomDemand['adv_option']) && $roomDemand['adv_option']} + {convertPrice price = $roomDemand['adv_option'][$demand['id_option']]['price']|escape:'html':'UTF-8'} + {else} + {convertPrice price = $roomDemand['price']|escape:'html':'UTF-8'} + {/if} +

{/if} @@ -189,30 +195,31 @@ {if isset($room['selected_services']) && $room['selected_services']} {foreach $room['selected_services'] as $service}
-
-
-
-

{$service['name']|escape:'html':'UTF-8'}

- {if $service.allow_multiple_quantity} -
- {l s='Quantity:'} {$service.quantity} -
- {/if} -
+
+
+
+
{$service['name']|escape:'html':'UTF-8'}
+ {if $service.allow_multiple_quantity} +
+ {l s='Quantity:'} {$service.quantity} +
+ {/if}
-
- {if $service['auto_add_to_cart'] && $service['price_addition_type'] == Product::PRICE_ADDITION_TYPE_INDEPENDENT} - {l s='Convenience fee'} - {/if} - {if $service['auto_add_to_cart'] && $service['price_addition_type'] == Product::PRICE_ADDITION_TYPE_WITH_ROOM} - {l s='Auto added'} - {/if} -
-
- {convertPrice price=$service.total_price} -
+
+ {if $service['auto_add_to_cart'] && $service['price_addition_type'] == Product::PRICE_ADDITION_TYPE_INDEPENDENT} + {l s='Convenience fee'} + {/if} + {if $service['auto_add_to_cart'] && $service['price_addition_type'] == Product::PRICE_ADDITION_TYPE_WITH_ROOM} + {l s='Auto added'} + {/if} +
+
+ {convertPrice price=$service.total_price} +
+
+

{/foreach} {/if}
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 8213ed88d..467ea386e 100644 --- a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl @@ -664,6 +664,38 @@ {/if}
+ {if $customer_guests && count($customer_guests)} +
+
+ + {l s='Customer Guests'} + {count($customer_guests)} +
+ + + + + + + + + + + + {foreach $customer_guests AS $key => $customer_guest} + + + + + + + + + {/foreach} + +
{l s='Email'}{l s='First name'}{l s='Last name'}{l s='phone'}{l s='Actions'}
{$customer_guest['email']}{$customer_guest['firstname']}{$customer_guest['lastname']}{$customer_guest['phone']}
+
+ {/if} diff --git a/admin/themes/default/template/controllers/customers/modals/_customer_guest_form.tpl b/admin/themes/default/template/controllers/customers/modals/_customer_guest_form.tpl new file mode 100644 index 000000000..12e9baa32 --- /dev/null +++ b/admin/themes/default/template/controllers/customers/modals/_customer_guest_form.tpl @@ -0,0 +1,53 @@ +{* +* 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 +*} + +
+
+
+
+ +
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+
diff --git a/modules/wkfooteraboutblock/views/index.php b/admin/themes/default/template/controllers/customers/modals/index.php similarity index 89% rename from modules/wkfooteraboutblock/views/index.php rename to admin/themes/default/template/controllers/customers/modals/index.php index 534dc97aa..ccbf6cb72 100644 --- a/modules/wkfooteraboutblock/views/index.php +++ b/admin/themes/default/template/controllers/customers/modals/index.php @@ -1,6 +1,6 @@ -* @copyright 2010-2018 Webkul IN +* @copyright 2010-2020 Webkul IN * @license https://store.webkul.com/license.html */ @@ -25,5 +25,5 @@ header('Cache-Control: no-store, no-cache, must-revalidate'); header('Cache-Control: post-check=0, pre-check=0', false); header('Pragma: no-cache'); -header('Location: ../../../'); +header('Location: ../../../../../../'); exit; diff --git a/admin/themes/default/template/controllers/normal_products/informations.tpl b/admin/themes/default/template/controllers/normal_products/informations.tpl index a9ad62206..74d3a5b85 100644 --- a/admin/themes/default/template/controllers/normal_products/informations.tpl +++ b/admin/themes/default/template/controllers/normal_products/informations.tpl @@ -446,12 +446,11 @@
{include - file="controllers/products/textarea_lang.tpl" + file="controllers/normal_products/textarea_lang.tpl" languages=$languages input_name='description_short' - class="autoload_rte" input_value=$product->description_short - max=$PS_PRODUCT_SHORT_DESC_LIMIT} + maxlength=$PS_SHORT_DESC_LIMIT}
{*
diff --git a/admin/themes/default/template/controllers/orders/_cart_booking_demands.tpl b/admin/themes/default/template/controllers/orders/_cart_booking_demands.tpl index 3ab29983b..e2e384fc2 100644 --- a/admin/themes/default/template/controllers/orders/_cart_booking_demands.tpl +++ b/admin/themes/default/template/controllers/orders/_cart_booking_demands.tpl @@ -18,82 +18,77 @@ *}