diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php index 3fd2107ee..29a2ba952 100644 --- a/controllers/front/AddressController.php +++ b/controllers/front/AddressController.php @@ -221,6 +221,8 @@ protected function processSubmitAddress() */ public function initContent() { + $this->show_breadcrump = true; + parent::initContent(); $this->assignCountries(); diff --git a/controllers/front/DiscountController.php b/controllers/front/DiscountController.php index f6853470f..89f93a3cb 100644 --- a/controllers/front/DiscountController.php +++ b/controllers/front/DiscountController.php @@ -37,6 +37,8 @@ class DiscountControllerCore extends FrontController */ public function initContent() { + $this->show_breadcrump = true; + parent::initContent(); $cart_rules = CartRule::getCustomerCartRules($this->context->language->id, $this->context->customer->id, true, false, true); diff --git a/controllers/front/HistoryController.php b/controllers/front/HistoryController.php index 397325c41..e3a8210e4 100644 --- a/controllers/front/HistoryController.php +++ b/controllers/front/HistoryController.php @@ -53,6 +53,8 @@ public function setMedia() */ public function initContent() { + $this->show_breadcrump = true; + parent::initContent(); if ($orders = Order::getCustomerOrders($this->context->customer->id)) { foreach ($orders as &$order) { diff --git a/controllers/front/IdentityController.php b/controllers/front/IdentityController.php index ea8c2af16..5da8ccbd9 100644 --- a/controllers/front/IdentityController.php +++ b/controllers/front/IdentityController.php @@ -126,6 +126,8 @@ public function postProcess() */ public function initContent() { + $this->show_breadcrump = true; + parent::initContent(); if ($this->customer->birthday) { diff --git a/controllers/front/OrderFollowController.php b/controllers/front/OrderFollowController.php index 9247f7749..7bb79d54d 100644 --- a/controllers/front/OrderFollowController.php +++ b/controllers/front/OrderFollowController.php @@ -37,8 +37,9 @@ class OrderFollowControllerCore extends FrontController */ public function initContent() { - parent::initContent(); $this->show_breadcrump = true; + + parent::initContent(); if (isset($this->context->customer->id) && $this->context->customer->id) { $ordersReturns = OrderReturn::getOrdersReturn($this->context->customer->id, Tools::getValue('id_order')); $this->context->smarty->assign('ordersReturns', $ordersReturns); diff --git a/controllers/front/OrderSlipController.php b/controllers/front/OrderSlipController.php index 2b33b6cad..32e283fbe 100644 --- a/controllers/front/OrderSlipController.php +++ b/controllers/front/OrderSlipController.php @@ -48,6 +48,8 @@ public function setMedia() */ public function initContent() { + $this->show_breadcrump = true; + parent::initContent(); $this->context->smarty->assign('ordersSlip', OrderSlip::getOrdersSlip((int)$this->context->cookie->id_customer)); diff --git a/themes/hotel-reservation-theme/address.tpl b/themes/hotel-reservation-theme/address.tpl index 3e3e9da78..e581f5382 100644 --- a/themes/hotel-reservation-theme/address.tpl +++ b/themes/hotel-reservation-theme/address.tpl @@ -22,14 +22,24 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -{capture name=path}{l s='Your address'}{/capture} +{capture name=path} + + {l s='My account'} + + + {$navigationPipe} + + + {l s='Address'} + +{/capture} {if isset($smarty.get.updated) && $smarty.get.updated}

{l s='Your address has been successfully updated.'}

{/if}
-

{l s='Your address'}

+

{l s='Address'}

{if isset($id_address) && (isset($smarty.post.alias) || isset($address->alias))} {l s='Modify address'} @@ -215,7 +225,7 @@

diff --git a/themes/hotel-reservation-theme/discount.tpl b/themes/hotel-reservation-theme/discount.tpl index 25440cad7..18e561050 100644 --- a/themes/hotel-reservation-theme/discount.tpl +++ b/themes/hotel-reservation-theme/discount.tpl @@ -22,10 +22,10 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -{capture name=path}{l s='My account'}{$navigationPipe}{l s='My vouchers'}{/capture} +{capture name=path}{l s='My account'}{$navigationPipe}{l s='Vouchers'}{/capture}

- {l s='My vouchers'} + {l s='Vouchers'}

{if isset($cart_rules) && $nb_cart_rules} @@ -98,7 +98,7 @@
  • - {l s='Back to your account'} + {l s='Back to My account'}
    • diff --git a/themes/hotel-reservation-theme/history.tpl b/themes/hotel-reservation-theme/history.tpl index 8135b8fbc..b6eeee269 100644 --- a/themes/hotel-reservation-theme/history.tpl +++ b/themes/hotel-reservation-theme/history.tpl @@ -27,10 +27,10 @@ {l s='My account'} {$navigationPipe} - {l s='Order history'} + {l s='Bookings'} {/capture} {include file="$tpl_dir./errors.tpl"} -

    {l s='Order history'}

    +

    {l s='Bookings'}

    {l s='Here are the orders you\'ve placed since your account was created.'}

    {if $slowValidation}

    {l s='If you have just placed an order, it may take a few minutes for it to be validated. Please refresh this page if your order is missing.'}

    @@ -127,7 +127,7 @@
  • - {l s='Back to Your Account'} + {l s='Back to My account'}
    • diff --git a/themes/hotel-reservation-theme/identity.tpl b/themes/hotel-reservation-theme/identity.tpl index b84a30800..bba309d88 100644 --- a/themes/hotel-reservation-theme/identity.tpl +++ b/themes/hotel-reservation-theme/identity.tpl @@ -31,12 +31,12 @@ {$navigationPipe} - {l s='Your personal information'} + {l s='Personal information'} {/capture}

    - {l s='Your personal information'} + {l s='Personal information'}

    {include file="$tpl_dir./errors.tpl"} @@ -206,7 +206,7 @@
  • - {l s='Back to your account'} + {l s='Back to My account'}
    • diff --git a/themes/hotel-reservation-theme/my-account.tpl b/themes/hotel-reservation-theme/my-account.tpl index 66570d7aa..4bbc44231 100644 --- a/themes/hotel-reservation-theme/my-account.tpl +++ b/themes/hotel-reservation-theme/my-account.tpl @@ -35,20 +35,20 @@
    {if $voucherAllowed || isset($HOOK_CUSTOMER_ACCOUNT) && $HOOK_CUSTOMER_ACCOUNT !=''}
    diff --git a/themes/hotel-reservation-theme/order-follow.tpl b/themes/hotel-reservation-theme/order-follow.tpl index ce1fa0f6b..4b0871ab0 100644 --- a/themes/hotel-reservation-theme/order-follow.tpl +++ b/themes/hotel-reservation-theme/order-follow.tpl @@ -31,7 +31,7 @@ {$navigationPipe} - {l s='Booking Refund Requests'} + {l s='Booking refund requests'} {/capture} @@ -86,6 +86,6 @@
    \ No newline at end of file diff --git a/themes/hotel-reservation-theme/order-slip.tpl b/themes/hotel-reservation-theme/order-slip.tpl index 846b25e84..1f4cf0c4b 100644 --- a/themes/hotel-reservation-theme/order-slip.tpl +++ b/themes/hotel-reservation-theme/order-slip.tpl @@ -106,7 +106,7 @@
  • - {l s='Back to your account'} + {l s='Back to My account'}