From b362c808dc4467bf87384bc8f8a68fb3503075f7 Mon Sep 17 00:00:00 2001 From: Nils-Helge Garli Hegvik Date: Wed, 31 Jul 2013 12:25:35 +0200 Subject: [PATCH 1/3] Fixed fieldset issue when customer is a guest --- .../default/template/controllers/orders/helpers/view/view.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl index c43c3c0fc..6c484a558 100755 --- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -170,9 +170,9 @@ {l s='Account registered:'} {dateFormat date=$customer->date_add full=true}
{l s='Valid orders placed:'} {$customerStats['nb_orders']}
{l s='Total spent since registration:'} {displayPrice price=Tools::ps_round(Tools::convertPrice($customerStats['total_orders'], $currency), 2) currency=$currency->id}
- {/if} {/if} + {if (sizeof($sources))} From fd339d96b2b3d51196b2c86ee75ae4abea735c76 Mon Sep 17 00:00:00 2001 From: Yoozio Date: Wed, 31 Jul 2013 12:29:05 +0200 Subject: [PATCH 2/3] [*] Security : deny access to this folder as already done for classes --- override/.htaccess | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 override/.htaccess diff --git a/override/.htaccess b/override/.htaccess new file mode 100644 index 000000000..896fbc5a3 --- /dev/null +++ b/override/.htaccess @@ -0,0 +1,2 @@ +Order deny,allow +Deny from all \ No newline at end of file From 1187e7cb0991601f43708e8da0cac489a1721b9d Mon Sep 17 00:00:00 2001 From: Axome Date: Wed, 31 Jul 2013 14:15:33 +0200 Subject: [PATCH 3/3] [*] BO : Fix statistics redirection when change date When going into a special stats module (for exemple "statsproduct") if you change the date, Prestashop redirect to the "home" of statistics. --- .../themes/default/template/controllers/stats/calendar.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/stats/calendar.tpl b/admin-dev/themes/default/template/controllers/stats/calendar.tpl index 31e607224..7e96f3a7e 100644 --- a/admin-dev/themes/default/template/controllers/stats/calendar.tpl +++ b/admin-dev/themes/default/template/controllers/stats/calendar.tpl @@ -25,7 +25,7 @@
-
+ @@ -51,4 +51,4 @@ }); }); -
\ No newline at end of file +