Ne)K@`}15eU~7l$`-WVtd+
zP_;9{sOk-A?L6DEeHLfXts2}V0~b4Yzh7lNGr993fO}d(W-*=Hs3hk((wm;p5ople
z8r&rV7af{bh*b!t$q5|+-1)Cq?`EEDtr7R}RFIr_B-W7^uPRw)5%^eKX3~JW@@$W;6@Wj0P4HH8$4_`)RO{WU#9d>?#dGt)
z#g&@GawC*4>PumctO2)Ko|c;8E0AQ$N8uTg(dmz(R1>O^5~o<@DDGB>|SeHJRs&22h&q&PRP^2?**+`MetSaohr
zwr!<6Hy_(JQJ&AwkaY6mxS+twCt);VcgxLMcRTEopa
ze0gjQH(M1Sw}+c)_|hhBmSv}h7ICv|5Rcl#&F~GQc5$=w;!myOX6D6b?b>e!UVQX0
zUQMc8Q4Q|;&7=8fyqHX@Ur-V5Y2}xUo<`3vll$5iRD`?2(DH2bI9@HAUQZS7GX3FK
zC0
Date: Tue, 23 Apr 2013 12:36:52 +0200
Subject: [PATCH 13/40] // Remove "core" for the themes translations in the
translation tool
---
.../translations/helpers/view/main.tpl | 15 +++++++++++----
controllers/admin/AdminTranslationsController.php | 9 ++++-----
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
index a5a6cc20e..89748e739 100644
--- a/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
+++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
@@ -33,22 +33,29 @@
document.getElementById('typeTranslationForm').submit();
}
- function addThemeSelect(el)
+ function addThemeSelect()
{
- var list_type_for_theme = [{foreach $translations_type_for_theme as $type}'{$type}', {/foreach}];
- var type = el.value;
+ var list_type_for_theme = ['front', 'modules', 'pdf', 'mails'];
+ var type = $('select[name=type]').val();
$('select[name=theme]').hide();
for (i=0; i < list_type_for_theme.length; i++)
if (list_type_for_theme[i] == type)
+ {
$('select[name=theme]').show();
+ if (type == 'front')
+ $('select[name=theme]').children('option[value=""]').attr('disabled', true)
+ else
+ $('select[name=theme]').children('option[value=""]').attr('disabled', false)
+ }
else
$('select[name=theme]').val('{$theme_default}');
}
$(document).ready(function(){
+ addThemeSelect();
$('select[name=type]').change(function() {
- addThemeSelect(this);
+ addThemeSelect();
});
});
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index 496c34b0d..4fb9dd5a7 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -52,9 +52,6 @@ class AdminTranslationsControllerCore extends AdminController
/** @var array : List of theme by translation type : FRONT, BACK, ERRORS... */
protected $translations_informations = array();
- /** @var array : List of theme by translation type : FRONT, BACK, ERRORS... */
- protected $translations_type_for_theme = array('front', 'modules', 'pdf', 'mails');
-
/** @var array : List of all languages */
protected $languages;
@@ -199,7 +196,6 @@ class AdminTranslationsControllerCore extends AdminController
'token' => $this->token,
'languages' => $this->languages,
'translations_type' => $this->translations_informations,
- 'translations_type_for_theme' => $this->translations_type_for_theme,
'packs_to_install' => $packs_to_install,
'packs_to_update' => $packs_to_update,
'url_submit' => self::$currentIndex.'&token='.$this->token,
@@ -1591,7 +1587,10 @@ class AdminTranslationsControllerCore extends AdminController
public function initFormFront()
{
if (!$this->theme_exists(Tools::getValue('theme')))
- throw new PrestaShopException(sprintf(Tools::displayError('Invalid theme "%s"'), Tools::getValue('theme')));
+ {
+ $this->errors[] = sprintf(Tools::displayError('Invalid theme "%s"'), Tools::getValue('theme'));
+ return;
+ }
$missing_translations_front = array();
$name_var = $this->translations_informations[$this->type_selected]['var'];
From bec335441e86da7348da777e1206624d334620b0 Mon Sep 17 00:00:00 2001
From: Damien Metzger
Date: Tue, 23 Apr 2013 14:57:24 +0200
Subject: [PATCH 14/40] // Change link to the documentation in the installer
---
install-dev/langs/br/install.php | 2 +-
install-dev/langs/de/install.php | 2 +-
install-dev/langs/es/install.php | 2 +-
install-dev/langs/it/install.php | 2 +-
install-dev/langs/pl/install.php | 2 +-
install-dev/langs/ru/install.php | 2 +-
install-dev/theme/views/database.phtml | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/install-dev/langs/br/install.php b/install-dev/langs/br/install.php
index 7fcacdf9b..26022236e 100644
--- a/install-dev/langs/br/install.php
+++ b/install-dev/langs/br/install.php
@@ -200,7 +200,7 @@ return array(
'Your Account' => 'Sua informação pessoal',
'This email address will be your username to access your store\'s back office.' => 'Este endereço de email será seu nome de usuário para acessar a área administrativa da sua loja.',
'PrestaShop can provide you with guidance on a regular basis by sending you tips on how to optimize the management of your store which will help you grow your business. If you do not wish to receive these tips, please uncheck this box.' => 'O PrestaShop pode oferecer orientações à você diariamente ao enviar dicas de como otimizar o gerenciamente da sua loja, o que vai lhe ajudar a crescer seu negócio. Se você não quer receber essas dicas, por favor desmarque este quadrinho.',
- 'To use PrestaShop, you must create a database to collect all of your store’s data-related activities.' => 'Para usar o PrestaShop, você deve criar um banco de dados para coletar todas as informações relacionadas com as atividades de sua loja.',
+ 'To use PrestaShop, you must create a database to collect all of your store’s data-related activities.' => 'Para usar o PrestaShop, você deve criar um banco de dados para coletar todas as informações relacionadas com as atividades de sua loja.',
'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Por favor, complete os campos abaixo para que o PrestaShop possa conectar com seu database.',
'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'O port padrão é 3306. Para usar um port diferente, adicione o número do port no final do endereço do seu servidor por exemplo “:4242”.',
'Test your database connection now!' => 'Teste a conexão do seu banco de dados agora!',
diff --git a/install-dev/langs/de/install.php b/install-dev/langs/de/install.php
index 12d9451a5..01dfa68ba 100644
--- a/install-dev/langs/de/install.php
+++ b/install-dev/langs/de/install.php
@@ -193,7 +193,7 @@ return array(
'Your Account' => 'Ihre persönlichen Informationen',
'This email address will be your username to access your store\'s back office.' => 'Bitte bedenken Sie, dass diese E-Mail-Adresse Ihre Identifizierung ist, um ins Verwaltungsinterface Ihres Shops zu gelangen.',
'PrestaShop can provide you with guidance on a regular basis by sending you tips on how to optimize the management of your store which will help you grow your business. If you do not wish to receive these tips, please uncheck this box.' => 'PrestaShop kann Sie regelmäßig anleiten und Ihnen Tipps für die Shopverwaltung und Aktivitätsentwicklung geben. Wenn Sie keine Tipps wünschen, dann entfernen Sie bitte den Haken in diesem Kästchen.',
- 'To use PrestaShop, you must create a database to collect all of your store’s data-related activities.' => 'Um PrestaShop zu nutzen, müssen Sie eine Datenbank erstellen, auf der alle Daten zur Aktivität Ihres Shops gespeichert werden können.',
+ 'To use PrestaShop, you must create a database to collect all of your store’s data-related activities.' => 'Um PrestaShop zu nutzen, müssen Sie eine Datenbank erstellen, auf der alle Daten zur Aktivität Ihres Shops gespeichert werden können.',
'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'Wenn Sie einen anderen Port als den Standardport (3306) nutzen möchten, fügen Sie zu Ihrer Serveradresse die Nummer xx Ihres Ports hinzu.',
'Test your database connection now!' => 'Testen Sie die Verbindung mit Ihrer Datenbank',
'PrestaShop Installation Assistant' => 'Installationsassistent',
diff --git a/install-dev/langs/es/install.php b/install-dev/langs/es/install.php
index 128022863..174a90c37 100644
--- a/install-dev/langs/es/install.php
+++ b/install-dev/langs/es/install.php
@@ -193,7 +193,7 @@ return array(
'Your Account' => 'Tu cuenta',
'This email address will be your username to access your store\'s back office.' => 'Esta dirección de correo electrónico corresponderá a tu usuario en el acceso al interfaz de administración de tu tienda Online.',
'PrestaShop can provide you with guidance on a regular basis by sending you tips on how to optimize the management of your store which will help you grow your business. If you do not wish to receive these tips, please uncheck this box.' => 'PrestaShop te puede proporcionar orientación con el envío de consejos sobre cómo optimizar y gestionar tu tienda, que te ayudarán a tener éxito en tu negocio. Si no deseas recibir estos consejos, por favor desmarca esta casilla.',
- 'To use PrestaShop, you must create a database to collect all of your store’s data-related activities.' => 'Para utilizar PrestaShop, debes crear una base de datos para poder recoger todos los datos relacionados con tu actividad.',
+ 'To use PrestaShop, you must create a database to collect all of your store’s data-related activities.' => 'Para utilizar PrestaShop, debes crear una base de datos para poder recoger todos los datos relacionados con tu actividad.',
'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Por favor, rellena estos datos con el fin de que PrestaShop pueda conectarse a tu base de datos.',
'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'El puerto utilizado por defecto es el 3306. Si utilizas un puerto diferente, añade este número de puerto al final de la dirección del servidor con dos puntos, por ejemplo ":4242".',
'Test your database connection now!' => '¡Comprueba la conexión de tu base de datos ahora!',
diff --git a/install-dev/langs/it/install.php b/install-dev/langs/it/install.php
index a6a048608..88e10bbd6 100644
--- a/install-dev/langs/it/install.php
+++ b/install-dev/langs/it/install.php
@@ -214,7 +214,7 @@ return array(
'Cannot copy flag language "%s"' => 'Impossibile copiare la bandiera per la lingua "%s"',
'Must be alphanumeric string with at least 8 characters' => 'Deve essere una stringa alfanumerica di almeno 8 caratteri',
'Sign-up to the newsletter' => 'Mi abbono alla newsletter',
- 'To use PrestaShop, you must create a database to collect all of your store’s data-related activities.' => 'Per usare PrestaShop, devi creare un database per riunire tutti i dati inerenti alle attività del tuo negozio.',
+ 'To use PrestaShop, you must create a database to collect all of your store’s data-related activities.' => 'Per usare PrestaShop, devi creare un database per riunire tutti i dati inerenti alle attività del tuo negozio.',
'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Compila i campi sottostanti per far sì che PrestaShop possa connettersi al tuo database.',
'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'La porta di default è 3306. Per usare un\'altra porta, digita il numero della porta alla fine del tuo indirizzo di server. Per esempio: "4242".',
'Test your database connection now!' => 'Verifica subito la connessione al tuo database!',
diff --git a/install-dev/langs/pl/install.php b/install-dev/langs/pl/install.php
index ac0afe668..886e12164 100644
--- a/install-dev/langs/pl/install.php
+++ b/install-dev/langs/pl/install.php
@@ -157,7 +157,7 @@ return array(
'By default, the PHP mail() function is used' => 'Domyślnie - PHP mail () funkcja jest używana.',
'SMTP server address:' => 'Adres serwera SMTP:',
'PrestaShop can provide you with guidance on a regular basis by sending you tips on how to optimize the management of your store which will help you grow your business. If you do not wish to receive these tips, please uncheck this box.' => 'PrestaShop wysyła regularnie wskazówki dotyczące optymalizacji zarządzania sklepem. Jeśli nie chcesz ich otrzymywać, odznacz pole.',
- 'To use PrestaShop, you must create a database to collect all of your store’s data-related activities.' => 'Aby korzystać z PrestaShop, musisz stworzyć baze danych , w celu zebrania wszystkich danych dotyczących funkcjonowania Twojego sklepu.',
+ 'To use PrestaShop, you must create a database to collect all of your store’s data-related activities.' => 'Aby korzystać z PrestaShop, musisz stworzyć baze danych , w celu zebrania wszystkich danych dotyczących funkcjonowania Twojego sklepu.',
'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'Jeśli chcesz użyć innego portu niż port domyślny (3306), dodaj ":XX" do adresu Twojego serwera - gdzie XX oznacza numer portu.',
'If you are experiencing problems during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Jeśli spotkałeś się z problemami podczas instalacji, skontaktuj się z naszym zespołem %s.',
'PrestaShop Installation Assistant' => 'Asystent instalacji PrestaShop',
diff --git a/install-dev/langs/ru/install.php b/install-dev/langs/ru/install.php
index 01ab96d28..13789adc5 100644
--- a/install-dev/langs/ru/install.php
+++ b/install-dev/langs/ru/install.php
@@ -209,7 +209,7 @@ return array(
'Installation Assistant' => 'Помощник установки',
'License Agreements' => 'Лицензионное соглшение',
'Print my login information' => 'Распечатать информацию о моем аккаунте',
- 'To use PrestaShop, you must create a database to collect all of your store’s data-related activities.' => 'Для использования PrestaShop, Вам следует создать базу данных , чтобы сгруппровать информацию Вашего магазина.',
+ 'To use PrestaShop, you must create a database to collect all of your store’s data-related activities.' => 'Для использования PrestaShop, Вам следует создать базу данных , чтобы сгруппровать информацию Вашего магазина.',
'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Заполните поля ниже, чтобы PrestaShop смог уствновить соединение с Вашей с базой данных ',
'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'Порт по умолчанию: 3306. Если Вы используете другой порт, то введите номер порта в конце адреса Вашего сервера. пример: ":4242".',
'Continue the installation in:' => 'Продолжить установку:',
diff --git a/install-dev/theme/views/database.phtml b/install-dev/theme/views/database.phtml
index fdfbc664c..8dae7d7a9 100644
--- a/install-dev/theme/views/database.phtml
+++ b/install-dev/theme/views/database.phtml
@@ -4,7 +4,7 @@
l('Configure your database by filling out the following fields:') ?>
- l('To use PrestaShop, you must create a database to collect all of your store’s data-related activities.') ?>
+ l('To use PrestaShop, you must create a database to collect all of your store’s data-related activities.') ?>
l('Please complete the fields below in order for PrestaShop to connect to your database. ') ?>
From 4162591e3ea23a57d6fb8204e831768dfb7beae8 Mon Sep 17 00:00:00 2001
From: Damien Metzger
Date: Tue, 23 Apr 2013 15:30:17 +0200
Subject: [PATCH 15/40] // Fixed Chrome issue with cart rules
---
.../default/template/controllers/cart_rules/conditions.tpl | 4 ++--
.../themes/default/template/controllers/cart_rules/form.js | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
index e8fecdbf5..158c4d117 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
@@ -207,12 +207,12 @@
{l s='Product selection'}
-
+
{foreach from=$product_rule_groups item='product_rule_group'}
{$product_rule_group}
{/foreach}
-
+
{l s='Product selection'}
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.js b/admin-dev/themes/default/template/controllers/cart_rules/form.js
index ff7c38d9a..82cc6c8af 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/form.js
+++ b/admin-dev/themes/default/template/controllers/cart_rules/form.js
@@ -25,6 +25,7 @@
function addProductRuleGroup()
{
+ $('#product_rule_group_table').show();
product_rule_groups_counter += 1;
product_rule_counters[product_rule_groups_counter] = 0;
From 8d4723247e768cb89313a2b9d925efaf6e398e0d Mon Sep 17 00:00:00 2001
From: Damien Metzger
Date: Tue, 23 Apr 2013 15:35:21 +0200
Subject: [PATCH 16/40] [-] FO : Fixed product comparator CSS
---
themes/default/css/comparator.css | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/themes/default/css/comparator.css b/themes/default/css/comparator.css
index 5d537272a..44af9522a 100644
--- a/themes/default/css/comparator.css
+++ b/themes/default/css/comparator.css
@@ -40,7 +40,7 @@ table#product_comparison {
margin-bottom:10px;
padding-left:10px;
color:#0088cc;
- background:url(../../img/arrow_right_1.png) no-repeat 0 4px transparent;
+ background:url(../img/arrow_right_1.png) no-repeat 0 4px transparent;
}
.prices_container {height:50px}
@@ -68,7 +68,7 @@ table#product_comparison {
padding-right:16px;
font-weight:bold;
text-align:right;
- background:url(../../img/icon/delete.gif) no-repeat 100% 1px transparent;
+ background:url(../img/icon/delete.gif) no-repeat 100% 1px transparent;
}
.ajax_add_to_cart_button {
@@ -82,7 +82,7 @@ table#product_comparison {
height: 26px;
left: -12px;
width: 26px;
- background: url(../../img/icon/pict_add_cart.png) no-repeat 0 0 transparent
+ background: url(../img/icon/pict_add_cart.png) no-repeat 0 0 transparent
}
From 697a305848d090a2ed0ebb41eec6f7ce9d6a3be8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?=
Date: Tue, 23 Apr 2013 15:51:30 +0200
Subject: [PATCH 17/40] // small text change
---
error500.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/error500.html b/error500.html
index c761bceb7..d72dc2183 100644
--- a/error500.html
+++ b/error500.html
@@ -9,8 +9,8 @@
- Something goes wrong.
- Try to refresh the page. Also feel free to contact us with our contact-form if the problem persists.
+ Oops, something went wrong.
+ Try to refresh this page or feel free to contact us if the problem persists.
From 318a13655365429a0f640cad85b4ba58f2ca16c9 Mon Sep 17 00:00:00 2001
From: Damien Metzger
Date: Tue, 23 Apr 2013 16:45:52 +0200
Subject: [PATCH 18/40] [-] FO : invoice: do not display taxes table if there
is not tax to display
---
classes/order/OrderInvoice.php | 13 ++---
pdf/invoice.tax-tab.tpl | 90 +++++++++++++++++-----------------
2 files changed, 53 insertions(+), 50 deletions(-)
diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php
index ea74e877e..2ab0cdf47 100644
--- a/classes/order/OrderInvoice.php
+++ b/classes/order/OrderInvoice.php
@@ -384,21 +384,22 @@ class OrderInvoiceCore extends ObjectModel
*/
public function getEcoTaxTaxesBreakdown()
{
- $res = Db::getInstance()->executeS('
+ $result = Db::getInstance()->executeS('
SELECT `ecotax_tax_rate` as `rate`, SUM(`ecotax` * `product_quantity`) as `ecotax_tax_excl`, SUM(`ecotax` * `product_quantity`) as `ecotax_tax_incl`
FROM `'._DB_PREFIX_.'order_detail`
WHERE `id_order` = '.(int)$this->id_order.'
AND `id_order_invoice` = '.(int)$this->id.'
- GROUP BY `ecotax_tax_rate`'
- );
+ GROUP BY `ecotax_tax_rate`');
- if ($res)
- foreach ($res as &$row)
+ $taxes = array();
+ foreach ($result as $row)
+ if ($row['ecotax_tax_excl'] > 0)
{
$row['ecotax_tax_incl'] = Tools::ps_round($row['ecotax_tax_excl'] + ($row['ecotax_tax_excl'] * $row['rate'] / 100), 2);
$row['ecotax_tax_excl'] = Tools::ps_round($row['ecotax_tax_excl'], 2);
+ $taxes[] = $row;
}
- return $res;
+ return $taxes;
}
/**
diff --git a/pdf/invoice.tax-tab.tpl b/pdf/invoice.tax-tab.tpl
index bcc6d4b67..685bbbd5f 100755
--- a/pdf/invoice.tax-tab.tpl
+++ b/pdf/invoice.tax-tab.tpl
@@ -22,6 +22,8 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
+
+{if $tax_exempt || ((isset($product_tax_breakdown) && $product_tax_breakdown|@count > 0) || (isset($ecotax_tax_breakdown) && $ecotax_tax_breakdown|@count > 0))}
@@ -41,56 +43,56 @@
{if isset($product_tax_breakdown)}
- {foreach $product_tax_breakdown as $rate => $product_tax_infos}
-
-
- {if !isset($pdf_product_tax_written)}
- {l s='Products' pdf='true'}
- {assign var=pdf_product_tax_written value=1}
+ {foreach $product_tax_breakdown as $rate => $product_tax_infos}
+
+
+ {if !isset($pdf_product_tax_written)}
+ {l s='Products' pdf='true'}
+ {assign var=pdf_product_tax_written value=1}
+ {/if}
+
+ {$rate} %
+ {if !$use_one_after_another_method}
+
+ {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$product_tax_infos.total_price_tax_excl}
+
+ {/if}
+ {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$product_tax_infos.total_amount}
+
+ {/foreach}
{/if}
-
- {$rate} %
- {if !$use_one_after_another_method}
-
- {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$product_tax_infos.total_price_tax_excl}
-
- {/if}
- {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$product_tax_infos.total_amount}
-
- {/foreach}
- {/if}
- {if isset($shipping_tax_breakdown)}
- {foreach $shipping_tax_breakdown as $shipping_tax_infos}
-
-
- {if !isset($pdf_shipping_tax_written)}
- {l s='Shipping' pdf='true'}
- {assign var=pdf_shipping_tax_written value=1}
+ {if isset($shipping_tax_breakdown)}
+ {foreach $shipping_tax_breakdown as $shipping_tax_infos}
+
+
+ {if !isset($pdf_shipping_tax_written)}
+ {l s='Shipping' pdf='true'}
+ {assign var=pdf_shipping_tax_written value=1}
+ {/if}
+
+ {$shipping_tax_infos.rate} %
+ {if !$use_one_after_another_method}
+ {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_tax_excl}
{/if}
-
- {$shipping_tax_infos.rate} %
- {if !$use_one_after_another_method}
- {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_tax_excl}
- {/if}
- {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_amount}
-
- {/foreach}
+ {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_amount}
+
+ {/foreach}
{/if}
{if isset($ecotax_tax_breakdown)}
- {foreach $ecotax_tax_breakdown as $ecotax_tax_infos}
- {if $ecotax_tax_infos.ecotax_tax_excl > 0}
-
- {l s='Ecotax' pdf='true'}
- {$ecotax_tax_infos.rate } %
- {if !$use_one_after_another_method}
- {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$ecotax_tax_infos.ecotax_tax_excl}
+ {foreach $ecotax_tax_breakdown as $ecotax_tax_infos}
+ {if $ecotax_tax_infos.ecotax_tax_excl > 0}
+
+ {l s='Ecotax' pdf='true'}
+ {$ecotax_tax_infos.rate } %
+ {if !$use_one_after_another_method}
+ {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$ecotax_tax_infos.ecotax_tax_excl}
+ {/if}
+ {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=($ecotax_tax_infos.ecotax_tax_incl - $ecotax_tax_infos.ecotax_tax_excl)}
+
{/if}
- {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=($ecotax_tax_infos.ecotax_tax_incl - $ecotax_tax_infos.ecotax_tax_excl)}
-
- {/if}
- {/foreach}
+ {/foreach}
{/if}
{/if}
@@ -98,4 +100,4 @@
-
+{/if}
\ No newline at end of file
From 2d1a4ed1809ddbaaf40e0c1f2810db58630ff924 Mon Sep 17 00:00:00 2001
From: Vincent Terenti
Date: Tue, 23 Apr 2013 19:10:31 +0200
Subject: [PATCH 19/40] // Fix translation behavior
---
controllers/admin/AdminTranslationsController.php | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index 4fb9dd5a7..bc2c4ef5f 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -920,9 +920,7 @@ class AdminTranslationsControllerCore extends AdminController
foreach ($matches as $key)
{
$md5_key = md5($key);
- $module_key = null;
- if ($theme_name)
- $module_key = '<{'.Tools::strtolower($module_name).'}'.strtolower($theme_name).'>'.Tools::strtolower($template_name).'_'.$md5_key;
+ $module_key = '<{'.Tools::strtolower($module_name).'}'.strtolower($theme_name).'>'.Tools::strtolower($template_name).'_'.$md5_key;
$default_key = '<{'.Tools::strtolower($module_name).'}prestashop>'.Tools::strtolower($template_name).'_'.$md5_key;
// to avoid duplicate entry
if (!in_array($module_key, $array_check_duplicate))
@@ -930,13 +928,13 @@ class AdminTranslationsControllerCore extends AdminController
$array_check_duplicate[] = $module_key;
if (!isset($this->modules_translations[$theme_name][$module_name][$template_name][$key]['trad']))
$this->total_expression++;
-
- if ($module_key && array_key_exists($module_key, $GLOBALS[$name_var]))
+ if ($theme_name && array_key_exists($module_key, $GLOBALS[$name_var]))
$this->modules_translations[$theme_name][$module_name][$template_name][$key]['trad'] = html_entity_decode($GLOBALS[$name_var][$module_key], ENT_COMPAT, 'UTF-8');
elseif (array_key_exists($default_key, $GLOBALS[$name_var]))
$this->modules_translations[$theme_name][$module_name][$template_name][$key]['trad'] = html_entity_decode($GLOBALS[$name_var][$default_key], ENT_COMPAT, 'UTF-8');
else
{
+ //d(array($module_key, $default_key, $key, $GLOBALS[$name_var]));
$this->modules_translations[$theme_name][$module_name][$template_name][$key]['trad'] = '';
$this->missing_translations++;
}
From d16f30f32235e859c6e66490784e79e6a5c2fce9 Mon Sep 17 00:00:00 2001
From: Damien Metzger
Date: Tue, 23 Apr 2013 20:25:28 +0200
Subject: [PATCH 20/40] // Fix module translation in the core
---
.../translations/helpers/view/translation_modules.tpl | 2 +-
controllers/admin/AdminTranslationsController.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
index 0125cc184..81fae60f5 100644
--- a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
+++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
@@ -117,7 +117,7 @@
{$key|stripslashes}
=
{* Prepare name string for md5() *}
- {capture assign="name"}{strtolower($module_name)}_{strtolower($theme_name)}_{strtolower($template_name)}_{md5($key)}{/capture}
+ {capture assign="name"}{strtolower($module_name)}{if $theme_name}_{strtolower($theme_name)}{/if}_{strtolower($template_name)}_{md5($key)}{/capture}
{if $key|strlen < $textarea_sized}
'.strtolower($template_name).'_'.md5($key).'\'';
}
From 83f132aa7897a3978456e126bcc9067fa195eb22 Mon Sep 17 00:00:00 2001
From: Damien Metzger
Date: Wed, 24 Apr 2013 10:29:02 +0200
Subject: [PATCH 21/40] // Write theme translations... in the theme
---
controllers/admin/AdminTranslationsController.php | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index 399c85afe..e4d223b2d 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -789,6 +789,8 @@ class AdminTranslationsControllerCore extends AdminController
{
$str_write = '';
$cache_file[$theme_name.'-'.$file_name] = true;
+ if (!Tools::file_exists_cache(dirname($file_name)))
+ mkdir(dirname($file_name), 0777, true);
if (!Tools::file_exists_cache($file_name))
file_put_contents($file_name, '');
if (!is_writable($file_name))
@@ -2530,12 +2532,16 @@ class AdminTranslationsControllerCore extends AdminController
$i18n_dir = $this->translations_informations[$this->type_selected]['dir'];
if (is_dir($i18n_dir.$module))
$root_dir = $i18n_dir;
+
if (Tools::file_exists_cache($root_dir.$module.'/translations/'.$lang.'.php'))
$lang_file = $root_dir.$module.'/translations/'.$lang.'.php';
- else
+ elseif (Tools::file_exists_cache($root_dir.$module.'/'.$lang.'.php'))
$lang_file = $root_dir.$module.'/'.$lang.'.php';
@include($lang_file);
$this->getModuleTranslations();
+ // If a theme is selected, then the destination translation file must be in the theme
+ if ($this->theme_selected)
+ $lang_file = $this->translations_informations[$this->type_selected]['override']['dir'].$module.'/translations/'.$lang.'.php';
$this->recursiveGetModuleFiles($root_dir.$module.'/', $array_files, $module, $lang_file, $is_default);
}
@@ -2547,7 +2553,7 @@ class AdminTranslationsControllerCore extends AdminController
$root_dir = $i18n_dir;
if (Tools::file_exists_cache($root_dir.$module.'/translations/'.$lang.'.php'))
$lang_file = $root_dir.$module.'/translations/'.$lang.'.php';
- else
+ elseif (Tools::file_exists_cache($root_dir.$module.'/'.$lang.'.php'))
$lang_file = $root_dir.$module.'/'.$lang.'.php';
@include($lang_file);
$this->getModuleTranslations();
From 75dd65f20756bec5b991e660b6e5b344f4b81760 Mon Sep 17 00:00:00 2001
From: Damien Metzger
Date: Wed, 24 Apr 2013 15:29:00 +0200
Subject: [PATCH 22/40] // Small fix translations
---
controllers/admin/AdminTranslationsController.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index e4d223b2d..6963d0b3e 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -806,10 +806,10 @@ class AdminTranslationsControllerCore extends AdminController
foreach ($files as $file)
{
- if (preg_match('/^(.*).(tpl|php)$/', $file) && Tools::file_exists_cache($file_path = $dir.$file) && !in_array($file, self::$ignore_folder))
+ if (preg_match('/^(.*).(tpl|php)$/', $file) && Tools::file_exists_cache($dir.$file) && !in_array($file, self::$ignore_folder))
{
// Get content for this file
- $content = file_get_contents($file_path);
+ $content = file_get_contents($dir.$file);
// Get file type
$type_file = substr($file, -4) == '.tpl' ? 'tpl' : 'php';
@@ -2546,7 +2546,7 @@ class AdminTranslationsControllerCore extends AdminController
}
// Then we load the overriden translation file
- if (isset($this->translations_informations[$this->type_selected]['override']))
+ if ($this->theme_selected && isset($this->translations_informations[$this->type_selected]['override']))
{
$i18n_dir = $this->translations_informations[$this->type_selected]['override']['dir'];
if (is_dir($i18n_dir.$module))
From feb1edc076e80e4e401182430207284bcef7b47e Mon Sep 17 00:00:00 2001
From: Damien Metzger
Date: Wed, 24 Apr 2013 15:45:58 +0200
Subject: [PATCH 23/40] // Small translation fix
---
controllers/admin/AdminTranslationsController.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index 6963d0b3e..f70db38f7 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -2545,6 +2545,7 @@ class AdminTranslationsControllerCore extends AdminController
$this->recursiveGetModuleFiles($root_dir.$module.'/', $array_files, $module, $lang_file, $is_default);
}
+ $root_dir = $initial_root_dir;
// Then we load the overriden translation file
if ($this->theme_selected && isset($this->translations_informations[$this->type_selected]['override']))
{
From 7cafc7bdf539b2ad924b4c2ce2ec670c2744e40b Mon Sep 17 00:00:00 2001
From: Damien Metzger
Date: Wed, 24 Apr 2013 16:27:45 +0200
Subject: [PATCH 24/40] // Fixed warning in translations
---
controllers/admin/AdminTranslationsController.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index f70db38f7..3456183b3 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -2533,9 +2533,8 @@ class AdminTranslationsControllerCore extends AdminController
if (is_dir($i18n_dir.$module))
$root_dir = $i18n_dir;
- if (Tools::file_exists_cache($root_dir.$module.'/translations/'.$lang.'.php'))
- $lang_file = $root_dir.$module.'/translations/'.$lang.'.php';
- elseif (Tools::file_exists_cache($root_dir.$module.'/'.$lang.'.php'))
+ $lang_file = $root_dir.$module.'/translations/'.$lang.'.php';
+ if (!Tools::file_exists_cache($root_dir.$module.'/translations/'.$lang.'.php') && Tools::file_exists_cache($root_dir.$module.'/'.$lang.'.php'))
$lang_file = $root_dir.$module.'/'.$lang.'.php';
@include($lang_file);
$this->getModuleTranslations();
From 5967c6ebbe824e77b3778cdcf74c6f1e9827007e Mon Sep 17 00:00:00 2001
From: vAugagneur
Date: Fri, 19 Apr 2013 11:44:29 +0200
Subject: [PATCH 25/40] //new addons url in install process
---
install-dev/theme/view.css | 2 +-
install-dev/theme/views/process.phtml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/install-dev/theme/view.css b/install-dev/theme/view.css
index 7bf852018..98fafdf2e 100644
--- a/install-dev/theme/view.css
+++ b/install-dev/theme/view.css
@@ -627,7 +627,7 @@ ul#optional {
#prestastore,
#prestastore_update {
- height:210px;
+ height:590px;
width:645px;
border:none;
/*-moz-border-radius: 5px;
diff --git a/install-dev/theme/views/process.phtml b/install-dev/theme/views/process.phtml
index 3383edae2..2406cdbc7 100644
--- a/install-dev/theme/views/process.phtml
+++ b/install-dev/theme/views/process.phtml
@@ -75,7 +75,7 @@ var process_steps = process_steps) ?>;
-