From b4a583a57effdcdd971ffc63243a5eb535a24ce2 Mon Sep 17 00:00:00 2001 From: abhisheks Date: Wed, 22 Nov 2023 16:55:00 +0530 Subject: [PATCH 1/7] refactor: update new products module --- .../views/templates/hook/ps_newproducts.tpl | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/ps_newproducts/views/templates/hook/ps_newproducts.tpl b/modules/ps_newproducts/views/templates/hook/ps_newproducts.tpl index 0bb9779..4b895e0 100644 --- a/modules/ps_newproducts/views/templates/hook/ps_newproducts.tpl +++ b/modules/ps_newproducts/views/templates/hook/ps_newproducts.tpl @@ -22,18 +22,17 @@ * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) * International Registered Trademark & Property of PrestaShop SA *} - -
-

+
+

{l s='New products' d='Shop.Theme.Catalog'}

-
+
{foreach from=$products item="product"} {include file="catalog/_partials/miniatures/product.tpl" product=$product} {/foreach}
- - {l s='All new products' d='Shop.Theme.Catalog'} + + {l s='All new products' d='Shop.Theme.Catalog'}
From c3124f5ea246b7b975c7ae532bdbbc5feb16b649 Mon Sep 17 00:00:00 2001 From: abhisheks Date: Sun, 26 Nov 2023 11:50:29 +0530 Subject: [PATCH 2/7] refactor: add icons for account links --- templates/customer/_partials/my-account-links.tpl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/templates/customer/_partials/my-account-links.tpl b/templates/customer/_partials/my-account-links.tpl index 1892017..e2bdbf8 100644 --- a/templates/customer/_partials/my-account-links.tpl +++ b/templates/customer/_partials/my-account-links.tpl @@ -23,12 +23,14 @@ * International Registered Trademark & Property of PrestaShop SA *} {block name='my_account_links'} -
+ {l s='Back to your account' d='Shop.Theme.Customeraccount'} - + {l s='Home' d='Shop.Theme.Global'} +
{/block} From 1badadaa3c918a99af0de68b76d4519837d93f79 Mon Sep 17 00:00:00 2001 From: abhisheks Date: Sun, 26 Nov 2023 11:50:56 +0530 Subject: [PATCH 3/7] refactor:override hook for wishlist module --- .../templates/hook/displayCustomerAccount.tpl | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 modules/blockwishlist/views/templates/hook/displayCustomerAccount.tpl diff --git a/modules/blockwishlist/views/templates/hook/displayCustomerAccount.tpl b/modules/blockwishlist/views/templates/hook/displayCustomerAccount.tpl new file mode 100644 index 0000000..579baf7 --- /dev/null +++ b/modules/blockwishlist/views/templates/hook/displayCustomerAccount.tpl @@ -0,0 +1,26 @@ + +{** + * Copyright since 2007 PrestaShop SA and Contributors + * PrestaShop is an International Registered Trademark & Property of PrestaShop SA + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License version 3.0 + * that is bundled with this package in the file LICENSE.md. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + *} + + + + + {$wishlistsTitlePage} + + From accf657ee603c271b952d235e3e629fca12d0d4c Mon Sep 17 00:00:00 2001 From: abhisheks Date: Sun, 26 Nov 2023 11:51:14 +0530 Subject: [PATCH 4/7] refactor: update my-account page --- templates/customer/my-account.tpl | 62 ++++++++++++++++--------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/templates/customer/my-account.tpl b/templates/customer/my-account.tpl index 27e9a0b..869cc4a 100644 --- a/templates/customer/my-account.tpl +++ b/templates/customer/my-account.tpl @@ -25,67 +25,71 @@ {extends file='customer/page.tpl'} {block name='page_title'} - {l s='Your account' d='Shop.Theme.Customeraccount'} +

+ {l s='Your account' d='Shop.Theme.Customeraccount'} +

{/block} {block name='page_content'} -
-
+
+
- - - + + + {l s='Information' d='Shop.Theme.Customeraccount'} {if $customer.addresses|count} - - - + + + {l s='Addresses' d='Shop.Theme.Customeraccount'} {else} - - - + + + {l s='Add first address' d='Shop.Theme.Customeraccount'} {/if} {if !$configuration.is_catalog} - - - + + + {l s='Order history and details' d='Shop.Theme.Customeraccount'} {/if} {if !$configuration.is_catalog} - - - - {l s='Credit slips' d='Shop.Theme.Customeraccount'} - - + {** + + + + {l s='Credit slips' d='Shop.Theme.Customeraccount'} + + + *} {/if} {if $configuration.voucher_enabled && !$configuration.is_catalog} - - - + + + {l s='Vouchers' d='Shop.Theme.Customeraccount'} {/if} {if $configuration.return_enabled && !$configuration.is_catalog} - - - + + + {l s='Merchandise returns' d='Shop.Theme.Customeraccount'} @@ -102,8 +106,8 @@ {block name='page_footer'} {block name='my_account_links'} -
- +
+ {l s='Sign out' d='Shop.Theme.Actions'}
From c72869ec3fcb3e99921ff2ac7b89b5816c53bf9d Mon Sep 17 00:00:00 2001 From: abhisheks Date: Sun, 26 Nov 2023 18:25:22 +0530 Subject: [PATCH 5/7] fix: product images are resized automatically while while switching --- templates/catalog/_partials/product-cover-thumbnails.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/catalog/_partials/product-cover-thumbnails.tpl b/templates/catalog/_partials/product-cover-thumbnails.tpl index aaf8111..396d329 100644 --- a/templates/catalog/_partials/product-cover-thumbnails.tpl +++ b/templates/catalog/_partials/product-cover-thumbnails.tpl @@ -22,15 +22,15 @@ * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) * International Registered Trademark & Property of PrestaShop SA *} -
+
{block name='product_cover'} -
- {$product.cover.legend} +
+ {$product.cover.legend}
{/block} {block name='product_images'} -
+
    {foreach from=$product.images item=image}
  • From 5e612c5b4f100727d25fd15a851d5e02b78dead4 Mon Sep 17 00:00:00 2001 From: abhisheks Date: Sun, 26 Nov 2023 18:25:46 +0530 Subject: [PATCH 6/7] refactor: update orders history page --- templates/customer/history.tpl | 90 ++++++++++++---------------------- 1 file changed, 32 insertions(+), 58 deletions(-) diff --git a/templates/customer/history.tpl b/templates/customer/history.tpl index 422757f..63b36d3 100644 --- a/templates/customer/history.tpl +++ b/templates/customer/history.tpl @@ -25,95 +25,69 @@ {extends file='customer/page.tpl'} {block name='page_title'} - {l s='Order history' d='Shop.Theme.Customeraccount'} +

    + {l s='Order history' d='Shop.Theme.Customeraccount'} +

    {/block} {block name='page_content'} -
    {l s='Here are the orders you\'ve placed since your account was created.' d='Shop.Theme.Customeraccount'}
    +
    {l s='Here are the orders you\'ve placed since your account was created.' d='Shop.Theme.Customeraccount'}
    {if $orders} - +
    - - - + + + {foreach from=$orders item=order} - - - - - - + + + + - - {/foreach}
    {l s='Order reference' d='Shop.Theme.Checkout'} {l s='Date' d='Shop.Theme.Checkout'} {l s='Total price' d='Shop.Theme.Checkout'}{l s='Payment' d='Shop.Theme.Checkout'}{l s='Status' d='Shop.Theme.Checkout'}{l s='Invoice' d='Shop.Theme.Checkout'}{l s='Payment' d='Shop.Theme.Checkout'}{l s='Status' d='Shop.Theme.Checkout'}{l s='Invoice' d='Shop.Theme.Checkout'}  
    {$order.details.reference}{$order.details.order_date}{$order.totals.total.value}{$order.details.payment} - +
    {$order.details.reference} + {$order.details.order_date}{$order.totals.total.value}{$order.details.payment} {$order.history.current.ostate_name} - + {if $order.details.invoice_url} - + + + {else} - {/if} + - {l s='Details' d='Shop.Theme.Customeraccount'} + +

    + {l s='Details' d='Shop.Theme.Customeraccount'} +

    {if $order.details.reorder_url} - {l s='Reorder' d='Shop.Theme.Actions'} + + +

    + {l s='Reorder' d='Shop.Theme.Actions'} +

    +     {/if}
    - -
    - {foreach from=$orders item=order} -
    -
    -
    -

    {$order.details.reference}

     -
    {$order.details.order_date}
    -
    {$order.totals.total.value}
    -
    - - {$order.history.current.ostate_name} - -
    -
    -
    - - {if $order.details.reorder_url} - - {/if} -
    -
    -
    - {/foreach} + {else} +
    + You have not placed any orders yet !
    - {/if} {/block} From 03169550176d091d30e50c770f8915b22f50eed3 Mon Sep 17 00:00:00 2001 From: abhisheks Date: Mon, 27 Nov 2023 10:50:20 +0530 Subject: [PATCH 7/7] refactor: add basic layout and update icons for addresses page --- .../customer/_partials/block-address.tpl | 18 +++++++------- templates/customer/addresses.tpl | 24 +++++++++++-------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/templates/customer/_partials/block-address.tpl b/templates/customer/_partials/block-address.tpl index 433672d..04ecf13 100644 --- a/templates/customer/_partials/block-address.tpl +++ b/templates/customer/_partials/block-address.tpl @@ -23,23 +23,21 @@ * International Registered Trademark & Property of PrestaShop SA *} {block name='address_block_item'} - +
    {/block} diff --git a/templates/customer/addresses.tpl b/templates/customer/addresses.tpl index 8d59bc7..e6121c9 100644 --- a/templates/customer/addresses.tpl +++ b/templates/customer/addresses.tpl @@ -25,21 +25,25 @@ {extends file='customer/page.tpl'} {block name='page_title'} - {l s='Your addresses' d='Shop.Theme.Customeraccount'} +

    + {l s='Your addresses' d='Shop.Theme.Customeraccount'} +

    {/block} {block name='page_content'} - {foreach $customer.addresses as $address} -
    - {block name='customer_address'} - {include file='customer/_partials/block-address.tpl' address=$address} - {/block} -
    - {/foreach} +
    + {foreach $customer.addresses as $address} +
    + {block name='customer_address'} + {include file='customer/_partials/block-address.tpl' address=$address} + {/block} +
    + {/foreach} +
    - - + + {l s='Create new address' d='Shop.Theme.Actions'}