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 09decd44b..2fd68d44f 100644 --- a/admin/themes/default/template/controllers/carts/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/carts/helpers/view/view.tpl @@ -195,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 26684cbd3..4f52451c7 100644 --- a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl @@ -673,6 +673,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/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 @@ *}