From dfab3014ead633a34377042bcf6bd4cd98617c83 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 6 Mar 2013 08:51:33 +0100 Subject: [PATCH 1/7] [-]BO: Fixes issue with logo name. Upgraded shops sometimes gets a -1 on the logo filename even if the multishop feature is turned off. Causing the BO and FO to link to the wrong file. --- controllers/admin/AdminThemesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index e0562d4cd..876ac9e3d 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -614,7 +614,7 @@ class AdminThemesControllerCore extends AdminController $ext = ($field_name == 'PS_STORES_ICON') ? '.gif' : '.jpg'; $logo_name = $logo_prefix.'-'.(int)$id_shop.$ext; - if (Context::getContext()->shop->getContext() == Shop::CONTEXT_ALL || $id_shop == 0) + if (Context::getContext()->shop->getContext() == Shop::CONTEXT_ALL || $id_shop == 0 || (bool)Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE')==false) $logo_name = $logo_prefix.$ext; if ($field_name == 'PS_STORES_ICON') From 7f5a78a120aa9e77c4be1122d80459baa5e1f602 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 12 Apr 2013 18:51:50 +0800 Subject: [PATCH 2/7] Update AdminThemesController.php --- controllers/admin/AdminThemesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index 876ac9e3d..eadcea7b4 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -614,7 +614,7 @@ class AdminThemesControllerCore extends AdminController $ext = ($field_name == 'PS_STORES_ICON') ? '.gif' : '.jpg'; $logo_name = $logo_prefix.'-'.(int)$id_shop.$ext; - if (Context::getContext()->shop->getContext() == Shop::CONTEXT_ALL || $id_shop == 0 || (bool)Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE')==false) + if (Context::getContext()->shop->getContext() == Shop::CONTEXT_ALL || $id_shop == 0 || Shop::isFeatureActive()==false) $logo_name = $logo_prefix.$ext; if ($field_name == 'PS_STORES_ICON') From f7ef4e0350edcbf70587e051c19edeb447b0457b Mon Sep 17 00:00:00 2001 From: ccauw Date: Tue, 16 Apr 2013 16:21:23 +0300 Subject: [PATCH 3/7] [*] BO : Add block "override_form_extra" in helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [*] BO : Add block "override_form_extra" in list_header.tpl {if !$simple_header}
{block name="override_form_extra"}{/block} In AdminXxxxController, If we display list which are filtered by "variable" like index.php?controller=AdminXxxx&variable=val&token=... When using pagination or columns filters, the controller is called without our variable. There are two methods to retrieve our variable: cookie or form Post. To use the second opportunity, we need to put hidden input "variable" in the form. So we need à block in the form to override. --- admin-dev/themes/default/template/helpers/list/list_header.tpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl index 1a821e4f6..b8df4bd49 100644 --- a/admin-dev/themes/default/template/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl @@ -80,6 +80,9 @@ {if !$simple_header} + + {block name="override_form_extra"}{/block} + {/if} From 38eb16eb480e02a4174b5cd3a6af13608809b2fe Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Tue, 23 Apr 2013 11:40:08 +0200 Subject: [PATCH 4/7] Merge Pull Request #53 - Thanks @Caleydon --- modules/blockbestsellers/blockbestsellers.tpl | 2 +- modules/blockcurrencies/blockcurrencies.tpl | 2 +- modules/blocklink/blocklink.tpl | 5 ++-- .../blockpermanentlinks-footer.tpl | 8 +++---- .../blockpermanentlinks.tpl | 4 ++-- modules/blockwishlist/blockwishlist-ajax.tpl | 2 +- modules/blockwishlist/blockwishlist-extra.tpl | 4 +++- modules/blockwishlist/blockwishlist.tpl | 4 ++-- modules/blockwishlist/managewishlist.tpl | 14 +++++------ modules/blockwishlist/view.tpl | 8 +++---- .../views/templates/hook/payment.tpl | 2 +- .../loyalty/views/templates/front/loyalty.tpl | 24 ++++++++++++------- .../views/templates/hook/my-account.tpl | 6 ++++- .../templates/front/mailalerts-account.tpl | 10 ++++---- .../views/templates/hook/my-account.tpl | 2 +- .../views/templates/hook/product.tpl | 2 +- .../views/templates/front/program.tpl | 19 ++++++++------- .../views/templates/hook/my-account.tpl | 2 +- .../views/templates/hook/shopping-cart.tpl | 2 +- 19 files changed, 70 insertions(+), 52 deletions(-) diff --git a/modules/blockbestsellers/blockbestsellers.tpl b/modules/blockbestsellers/blockbestsellers.tpl index 836d07a90..c9609627a 100644 --- a/modules/blockbestsellers/blockbestsellers.tpl +++ b/modules/blockbestsellers/blockbestsellers.tpl @@ -26,7 +26,7 @@
-

{l s='Top sellers' mod='blockbestsellers'}

+

{l s='Top sellers' mod='blockbestsellers'}

{if $best_sellers|@count > 0}