From fcac6d30d4d54c2404283bba29daf306735d9683 Mon Sep 17 00:00:00 2001 From: Rodney Figaro Date: Mon, 5 Dec 2016 10:09:23 +0100 Subject: [PATCH 1/7] #11881 - update inscription popup with "accept GCV" once / checkbox removed --- themes/site/footer.tpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/themes/site/footer.tpl b/themes/site/footer.tpl index 880cad6f..b62468bf 100755 --- a/themes/site/footer.tpl +++ b/themes/site/footer.tpl @@ -275,8 +275,7 @@
- - +
From f9af2a5dbb2d3b7396c828421f0e48e503e30f70 Mon Sep 17 00:00:00 2001 From: Rodney Figaro Date: Mon, 5 Dec 2016 10:16:20 +0100 Subject: [PATCH 2/7] #11881 - add link to TOS in register popup --- override/classes/controller/FrontController.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/override/classes/controller/FrontController.php b/override/classes/controller/FrontController.php index d287a33d..ac36c7e8 100644 --- a/override/classes/controller/FrontController.php +++ b/override/classes/controller/FrontController.php @@ -169,10 +169,11 @@ class FrontController extends FrontControllerCore if($this->context->customer->isLogged()) $this->context->smarty->assign('customerObj', $this->context->customer); -/*if($_SERVER['REMOTE_ADDR'] == '80.13.158.176' || $_SERVER['REMOTE_ADDR'] == '88.120.248.124' ) { - error_log(print_r($this->context->cookie,true),1,"thomas@antadis.com"); -}*/ - + // TOS + $cms = new CMS(Configuration::get('PS_CONDITIONS_CMS_ID'), $this->context->language->id); + $link_conditions = $this->context->link->getCMSLink($cms, $cms->link_rewrite, (bool)Configuration::get('PS_SSL_ENABLED')); + + $this->context->smarty->assign('link_conditions', $link_conditions); } } \ No newline at end of file From 1c085d908fad467cce8c5052588101e1d4167937 Mon Sep 17 00:00:00 2001 From: Rodney Figaro Date: Mon, 5 Dec 2016 11:50:46 +0100 Subject: [PATCH 3/7] #11881 - inverse "professionnel / particulier" / add hidden input newsletter --- themes/site/footer.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/themes/site/footer.tpl b/themes/site/footer.tpl index b62468bf..1289321a 100755 --- a/themes/site/footer.tpl +++ b/themes/site/footer.tpl @@ -264,19 +264,19 @@
-
- - -
+
+ + +
- +
From 629d21a5076637c5f8b0b64aaea11bd6e69b803e Mon Sep 17 00:00:00 2001 From: PLESK5 Date: Tue, 6 Dec 2016 17:05:37 +0100 Subject: [PATCH 4/7] make module cheque visible in front --- themes/site/modules/cheque/views/templates/hook/payment.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/site/modules/cheque/views/templates/hook/payment.tpl b/themes/site/modules/cheque/views/templates/hook/payment.tpl index 51c2e25f..24b7a7b5 100755 --- a/themes/site/modules/cheque/views/templates/hook/payment.tpl +++ b/themes/site/modules/cheque/views/templates/hook/payment.tpl @@ -22,7 +22,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -
- {**} - {/if} + {if $launch_popup}