From 18ab409eeb675d230e4989765ac468c56000b705 Mon Sep 17 00:00:00 2001 From: PhpMadman Date: Fri, 4 Oct 2013 10:38:03 +0200 Subject: [PATCH 01/14] [*] BO: #PNM-1472 Changed label and transparency range check to 1 Changed label to 1-100 since, there is no need to set transparency to 0, since it will pretty much will be invisible already at 1 --- modules/watermark/watermark.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/watermark/watermark.php b/modules/watermark/watermark.php index 9e396006a..b395dfb54 100644 --- a/modules/watermark/watermark.php +++ b/modules/watermark/watermark.php @@ -97,7 +97,7 @@ class Watermark extends Module if (empty($transparency)) $this->_postErrors[] = $this->l('Transparency required.'); - elseif ($transparency < 0 || $transparency > 100) + elseif ($transparency < 1 || $transparency > 100) $this->_postErrors[] = $this->l('Transparency is not in allowed range.'); if (empty($yalign)) @@ -174,7 +174,7 @@ class Watermark extends Module - '.$this->l('Watermark transparency (0-100)').' + '.$this->l('Watermark transparency (1-100)').' '.$this->l('Watermark X align').' From 2b8d069cf9d9966da6d112a6a9cc3398ed3253f2 Mon Sep 17 00:00:00 2001 From: fram Date: Tue, 5 Nov 2013 12:06:31 +0100 Subject: [PATCH 02/14] [*] LO : Added states to Spanish localization pack --- localization/es.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/localization/es.xml b/localization/es.xml index 8f321d36b..fb2f0038f 100644 --- a/localization/es.xml +++ b/localization/es.xml @@ -170,4 +170,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7226f33f9027b81e16abea7c40b8c56270fae4f1 Mon Sep 17 00:00:00 2001 From: PhpMadman Date: Tue, 5 Nov 2013 20:42:57 +0100 Subject: [PATCH 03/14] [-] BO : Cart was not using order reference --- .../default/template/controllers/carts/helpers/view/view.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl index 514dcaa75..c312aa5f3 100755 --- a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl @@ -50,7 +50,7 @@

{l s='Order information'}

{if $order->id} - {l s='Order #%d' sprintf=$order->id|string_format:"%06d"} + {l s='Order #'}{$order->reference}

{l s='Made on:'} {dateFormat date=$order->date_add}



{else} @@ -187,4 +187,4 @@
 
{/block} - \ No newline at end of file + From b2e5c6090dab6dadf90322308bd470f9a8ae323b Mon Sep 17 00:00:00 2001 From: PrestaLab Date: Tue, 5 Nov 2013 23:33:44 -0800 Subject: [PATCH 04/14] Fixed tags with UTF-8 chars Fixed error Tag->Name is not valid if tag in non latin chars --- classes/Tag.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Tag.php b/classes/Tag.php index 3b57de7b2..e8a8198a9 100644 --- a/classes/Tag.php +++ b/classes/Tag.php @@ -105,7 +105,7 @@ class TagCore extends ObjectModel { if (!Validate::isGenericName($tag)) return false; - $tag = trim(substr($tag, 0, self::$definition['fields']['name']['size'])); + $tag = trim(Tools::substr($tag, 0, self::$definition['fields']['name']['size'])); $tag_obj = new Tag(null, $tag, (int)$id_lang); /* Tag does not exist in database */ From eac7fbb69478175b3d6d9fd067a613a013c03a8b Mon Sep 17 00:00:00 2001 From: PhpMadman Date: Wed, 6 Nov 2013 11:06:46 +0100 Subject: [PATCH 05/14] [-] BO : Cart was not using order reference, corrected syntax --- .../default/template/controllers/carts/helpers/view/view.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl index c312aa5f3..a28971833 100755 --- a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl @@ -50,7 +50,7 @@

{l s='Order information'}

{if $order->id} - {l s='Order #'}{$order->reference} + {l s='Order #%s' sprintf=$order->reference}

{l s='Made on:'} {dateFormat date=$order->date_add}



{else} From 1fb8ef823dbea3798a8109d393a43b8531a94c9a Mon Sep 17 00:00:00 2001 From: gRoussac Date: Wed, 6 Nov 2013 11:50:52 +0100 Subject: [PATCH 06/14] [-] BO : Fix bug #PSCFV-10937, bad escaping for var product_prices in prices.tpl --- .../themes/default/template/controllers/products/prices.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin-dev/themes/default/template/controllers/products/prices.tpl b/admin-dev/themes/default/template/controllers/products/prices.tpl index 47b6908a4..09da3f9c2 100644 --- a/admin-dev/themes/default/template/controllers/products/prices.tpl +++ b/admin-dev/themes/default/template/controllers/products/prices.tpl @@ -249,7 +249,7 @@ $(document).ready(function () {