From 6d12a5b7d7a5e79a9a7a4baca1be97c2f507ff06 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Thu, 7 Mar 2013 18:33:53 +0100 Subject: [PATCH 1/6] // Installer translations --- install-dev/langs/br/install.php | 7 ++++--- install-dev/langs/de/install.php | 9 +++++---- install-dev/langs/es/install.php | 11 ++++++----- install-dev/langs/it/install.php | 9 +++++---- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/install-dev/langs/br/install.php b/install-dev/langs/br/install.php index 92bc138fd..21517c185 100644 --- a/install-dev/langs/br/install.php +++ b/install-dev/langs/br/install.php @@ -5,11 +5,12 @@ return array( 'support' => 'http://support.prestashop.com/en/', ), 'translations' => array( - 'menu_welcome' => 'Bem-vindo !', + 'menu_welcome' => 'Escolha seu idioma', + 'menu_license' => 'Acordo de licenciamento', 'menu_system' => 'Compatibilidade do Sistema', 'menu_database' => 'Configuração do Sistema', - 'menu_configure' => 'Configuração da loja', - 'menu_process' => 'Instalação', + 'menu_configure' => 'Informação da Loja', + 'menu_process' => 'Instalação da Loja', 'Choose the installer language:' => 'Escolha a língua para instalação :', 'Field required' => 'Campos requeridos', 'Invalid shop name' => 'Nome da loja inválido', diff --git a/install-dev/langs/de/install.php b/install-dev/langs/de/install.php index 35172965f..eea0f0ca9 100644 --- a/install-dev/langs/de/install.php +++ b/install-dev/langs/de/install.php @@ -4,11 +4,12 @@ return array( 'phone' => '+33 (0)1.40.18.30.04', ), 'translations' => array( - 'menu_welcome' => 'Willkommen!', + 'menu_welcome' => 'Sprachauswahl', + 'menu_license' => 'Annahme von Lizenzen', 'menu_system' => 'Systemkompatibilität', - 'menu_database' => 'Datenbank Konfiguration', - 'menu_configure' => 'Shop-Konfiguration', - 'menu_process' => 'Installation', + 'menu_database' => ' Systemkonfiguration', + 'menu_configure' => 'Shopinstallation', + 'menu_process' => 'Installation von Shop', 'Choose the installer language:' => 'Bitte wählen Sie Ihre Sprache', 'Field required' => 'Pflichtfeld', 'Invalid shop name' => 'Ungültiger Shopname', diff --git a/install-dev/langs/es/install.php b/install-dev/langs/es/install.php index 4c5d33585..8fcbd383f 100644 --- a/install-dev/langs/es/install.php +++ b/install-dev/langs/es/install.php @@ -4,11 +4,12 @@ return array( 'phone' => '+1 (888) 947-6543', ), 'translations' => array( - 'menu_welcome' => '¡Bienvenido!', - 'menu_system' => 'Compatibilidad sistema', - 'menu_database' => 'Configuración de base de datos', - 'menu_configure' => 'Configuración de la tienda', - 'menu_process' => 'Instalación', + 'menu_welcome' => 'Elegir el idioma', + 'menu_license' => 'Aceptar las licencias', + 'menu_system' => 'Compatibilidad del sistema', + 'menu_database' => 'Configuración del sistema', + 'menu_configure' => 'Información de la tienda', + 'menu_process' => 'Instalación de la tienda', 'Choose the installer language:' => '', 'Field required' => 'Campos requeridos', 'Invalid shop name' => 'Nombre de la tienda no válido', diff --git a/install-dev/langs/it/install.php b/install-dev/langs/it/install.php index e10bf077d..18e1ef30a 100644 --- a/install-dev/langs/it/install.php +++ b/install-dev/langs/it/install.php @@ -4,11 +4,12 @@ return array( 'phone' => '+33 (0)1.40.18.30.04', ), 'translations' => array( - 'menu_welcome' => 'Benvenuto!', + 'menu_welcome' => 'Scelta della lingua', + 'menu_license' => 'Accettazione licenze', 'menu_system' => 'Compatibilità sistema', - 'menu_database' => 'Database', - 'menu_configure' => 'Configurazione negozio', - 'menu_process' => 'Installazione', + 'menu_database' => 'Configurazione sistema', + 'menu_configure' => 'Informazioni negozio', + 'menu_process' => 'Installazione del negozio', 'Choose the installer language:' => 'Scegli la lingua di installazione', 'Field required' => 'Campo richiesto', 'Invalid shop name' => 'nome negozio non valido', From ca85825acdf075c90b79eab3955aa7f0c3ccec74 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Mon, 4 Mar 2013 13:35:48 +0100 Subject: [PATCH 2/6] [-] Fo : Fix bug #PSCFV-7956 select invoice address when adding a first new address --- controllers/front/AddressController.php | 2 +- themes/default/address.tpl | 2 +- themes/default/shopping-cart.tpl | 48 ++++++++++++------------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php index 490e361c6..432669a1a 100644 --- a/controllers/front/AddressController.php +++ b/controllers/front/AddressController.php @@ -237,7 +237,7 @@ class AddressControllerCore extends FrontController else // Update cart address $this->context->cart->autosetProductAddress(); - if (Tools::getValue('type') == 'invoice' && Configuration::get('PS_ORDER_PROCESS_TYPE')) + if ((bool)(Tools::getValue('select_address', false)) == true OR Tools::getValue('type') == 'invoice' && Configuration::get('PS_ORDER_PROCESS_TYPE')) { $this->context->cart->id_address_invoice = (int)$address->id; $this->context->cart->update(); diff --git a/themes/default/address.tpl b/themes/default/address.tpl index 1457760c1..7c33539ef 100644 --- a/themes/default/address.tpl +++ b/themes/default/address.tpl @@ -218,7 +218,7 @@ $(function(){ldelim}

- +

diff --git a/themes/default/shopping-cart.tpl b/themes/default/shopping-cart.tpl index 928a629b7..a6724ea0e 100644 --- a/themes/default/shopping-cart.tpl +++ b/themes/default/shopping-cart.tpl @@ -365,32 +365,32 @@ {if ((!empty($delivery_option) AND !isset($virtualCart)) OR $delivery->id OR $invoice->id) AND !$opc}

{if !isset($formattedAddresses) || (count($formattedAddresses.invoice) == 0 && count($formattedAddresses.delivery) == 0) || (count($formattedAddresses.invoice.formated) == 0 && count($formattedAddresses.delivery.formated) == 0)} - {if $delivery->id} -
    -
  • {l s='Delivery address'} ({$delivery->alias})
    • - {if $delivery->company}
  • {$delivery->company|escape:'htmlall':'UTF-8'}
    • {/if} -
  • {$delivery->firstname|escape:'htmlall':'UTF-8'} {$delivery->lastname|escape:'htmlall':'UTF-8'}
    • -
  • {$delivery->address1|escape:'htmlall':'UTF-8'}
    • - {if $delivery->address2}
  • {$delivery->address2|escape:'htmlall':'UTF-8'}
    • {/if} -
  • {$delivery->postcode|escape:'htmlall':'UTF-8'} {$delivery->city|escape:'htmlall':'UTF-8'}
    • -
  • {$delivery->country|escape:'htmlall':'UTF-8'} {if $delivery_state}({$delivery_state|escape:'htmlall':'UTF-8'}){/if}
    • -
- {/if} - {if $invoice->id} -
    -
  • {l s='Invoice address'} ({$invoice->alias})
    • - {if $invoice->company}
  • {$invoice->company|escape:'htmlall':'UTF-8'}
    • {/if} -
  • {$invoice->firstname|escape:'htmlall':'UTF-8'} {$invoice->lastname|escape:'htmlall':'UTF-8'}
    • -
  • {$invoice->address1|escape:'htmlall':'UTF-8'}
    • - {if $invoice->address2}
  • {$invoice->address2|escape:'htmlall':'UTF-8'}
    • {/if} -
  • {$invoice->postcode|escape:'htmlall':'UTF-8'} {$invoice->city|escape:'htmlall':'UTF-8'}
    • -
  • {$invoice->country|escape:'htmlall':'UTF-8'} {if $invoice_state}({$invoice_state|escape:'htmlall':'UTF-8'}){/if}
    • -
- {/if} + {if $delivery->id} +
    +
  • {l s='Delivery address'} ({$delivery->alias})
    • + {if $delivery->company}
  • {$delivery->company|escape:'htmlall':'UTF-8'}
    • {/if} +
  • {$delivery->firstname|escape:'htmlall':'UTF-8'} {$delivery->lastname|escape:'htmlall':'UTF-8'}
    • +
  • {$delivery->address1|escape:'htmlall':'UTF-8'}
    • + {if $delivery->address2}
  • {$delivery->address2|escape:'htmlall':'UTF-8'}
    • {/if} +
  • {$delivery->postcode|escape:'htmlall':'UTF-8'} {$delivery->city|escape:'htmlall':'UTF-8'}
    • +
  • {$delivery->country|escape:'htmlall':'UTF-8'} {if $delivery_state}({$delivery_state|escape:'htmlall':'UTF-8'}){/if}
    • +
+ {/if} + {if $invoice->id} +
    +
  • {l s='Invoice address'} ({$invoice->alias})
    • + {if $invoice->company}
  • {$invoice->company|escape:'htmlall':'UTF-8'}
    • {/if} +
  • {$invoice->firstname|escape:'htmlall':'UTF-8'} {$invoice->lastname|escape:'htmlall':'UTF-8'}
    • +
  • {$invoice->address1|escape:'htmlall':'UTF-8'}
    • + {if $invoice->address2}
  • {$invoice->address2|escape:'htmlall':'UTF-8'}
    • {/if} +
  • {$invoice->postcode|escape:'htmlall':'UTF-8'} {$invoice->city|escape:'htmlall':'UTF-8'}
    • +
  • {$invoice->country|escape:'htmlall':'UTF-8'} {if $invoice_state}({$invoice_state|escape:'htmlall':'UTF-8'}){/if}
    • +
+ {/if} {else} {foreach from=$formattedAddresses key=k item=address}
    -
  • {if $k eq 'invoice'}{l s='Invoice address'}{elseif $k eq 'delivery'}{l s='Delivery address'}{/if} ({$address.object.alias})
    • +
  • {if $k eq 'invoice'}{l s='Invoice address'}{elseif $k eq 'delivery' && $delivery->id}{l s='Delivery address'}{/if}{if isset($address.object.alias)} ({$address.object.alias}){/if}
    • {foreach $address.ordered as $pattern} {assign var=addressKey value=" "|explode:$pattern}
  • @@ -405,7 +405,7 @@ {/foreach}
{/foreach} -

+
{/if}

{/if} From 70e61c2c4728dc23ced8411d9ec13405f5ce5f77 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Thu, 7 Mar 2013 19:18:52 +0100 Subject: [PATCH 3/6] [*] BO : Add default Unknown.jpg to genders --- img/genders/Unknown.jpg | Bin 0 -> 614 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 img/genders/Unknown.jpg diff --git a/img/genders/Unknown.jpg b/img/genders/Unknown.jpg new file mode 100644 index 0000000000000000000000000000000000000000..8e4544ca89fe3ec6f29c6f69bf0d6b8f7966087b GIT binary patch literal 614 zcmex=O1eh6>7?=bZ znFSgDA7Kz@U|?osKn9F#99%#Nc>xAy1}2~!Gfa|&m5rI5k%>cCP(&Q4Km_PTRKN}t zl@)|&L&z~QF|!DiKe<;G z7Hzm;E$P&MKh$ci(!`bi3#)!=XFdG7`1*A97mk9*HmsRdl(k*`i#FRlw^Qje47SZU zuI-wxxYeDlW#OjX{BO6|MC?2tY^AHAwx_;r&6K_+W`?Jg<~>;H%37A9$o~H(0C?ZG AtpET3 literal 0 HcmV?d00001 From c7da54fe0ee82d8fa5942f998b4e35edad8d2c5d Mon Sep 17 00:00:00 2001 From: gRoussac Date: Fri, 8 Mar 2013 10:02:27 +0100 Subject: [PATCH 4/6] [-] BO : get default language when context language is empty for translation --- classes/Translate.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/Translate.php b/classes/Translate.php index 69e5c1d85..cd4ae4214 100644 --- a/classes/Translate.php +++ b/classes/Translate.php @@ -51,6 +51,8 @@ class TranslateCore if ($_LANGADM == null) { $iso = Context::getContext()->language->iso_code; + if (empty($iso)) + $iso = Language::getIsoById((int)(Configuration::get('PS_LANG_DEFAULT'))); include_once(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php'); } From 7ec0f0e3911f2a08ae49adb916d826feac148b07 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Fri, 8 Mar 2013 11:53:07 +0100 Subject: [PATCH 5/6] // Fixed modules list icons retrieval --- .../template/controllers/modules/content.tpl | 1 - .../template/controllers/modules/filters.tpl | 116 ++- .../template/controllers/modules/header.tpl | 34 +- .../template/controllers/modules/js.tpl | 698 ++++++++---------- .../template/controllers/modules/list.tpl | 237 +++--- .../template/controllers/modules/page.tpl | 4 - classes/module/Module.php | 16 +- controllers/admin/AdminModulesController.php | 1 - 8 files changed, 513 insertions(+), 594 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/modules/content.tpl b/admin-dev/themes/default/template/controllers/modules/content.tpl index 3a3afc34a..58546be45 100644 --- a/admin-dev/themes/default/template/controllers/modules/content.tpl +++ b/admin-dev/themes/default/template/controllers/modules/content.tpl @@ -23,7 +23,6 @@ * International Registered Trademark & Property of PrestaShop SA *} - {if isset($module_content)} {$module_content} {else} diff --git a/admin-dev/themes/default/template/controllers/modules/filters.tpl b/admin-dev/themes/default/template/controllers/modules/filters.tpl index 683885d67..dae64da67 100644 --- a/admin-dev/themes/default/template/controllers/modules/filters.tpl +++ b/admin-dev/themes/default/template/controllers/modules/filters.tpl @@ -25,36 +25,26 @@ {if $add_permission eq '1'} {if isset($logged_on_addons)} -
-

{l s='You are logged into PrestaShop Addons.'}

-
-
- {else} - {if $check_url_fopen eq 'ko' OR $check_openssl eq 'ko'} -
{l s='If you want to be able to fully use the AdminModules panel and have free modules available, you should enable the following configuration on your server:'}
{if $check_url_fopen eq 'ko'}- {l s='Enable allow_url_fopen'}
{/if} {if $check_openssl eq 'ko'}- {l s='Enable php openSSL extension'}
{/if}
- {else} -
-

{l s='Do you have a %s account?' sprintf='PrestaShop Addons'}

@@ -62,67 +52,59 @@
-
- {/if} - {/if} +
 
{/if} - - -
-
- - -
+ + +
+
+ + +
+
+
+ - - -
- - - -   - -   - -   - - -
- -
- - -
- - - -
- + +   + +   + +   + +
+
+ + +
+ +
+ diff --git a/admin-dev/themes/default/template/controllers/modules/header.tpl b/admin-dev/themes/default/template/controllers/modules/header.tpl index bc318a690..9d290bf06 100644 --- a/admin-dev/themes/default/template/controllers/modules/header.tpl +++ b/admin-dev/themes/default/template/controllers/modules/header.tpl @@ -23,27 +23,23 @@ * International Registered Trademark & Property of PrestaShop SA *} -
-
- - - - -
-

Module : {l s='List of modules'}

-
- +
+
+ +
+

Module : {l s='List of modules'}

+
{if $add_permission eq '1'}
diff --git a/admin-dev/themes/default/template/controllers/modules/js.tpl b/admin-dev/themes/default/template/controllers/modules/js.tpl index a7c8d1237..b0bc45df2 100644 --- a/admin-dev/themes/default/template/controllers/modules/js.tpl +++ b/admin-dev/themes/default/template/controllers/modules/js.tpl @@ -1,373 +1,327 @@ -{* -* 2007-2013 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2013 PrestaShop SA - -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - - - + \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/modules/list.tpl b/admin-dev/themes/default/template/controllers/modules/list.tpl index 5ed6b0612..ff01f4620 100644 --- a/admin-dev/themes/default/template/controllers/modules/list.tpl +++ b/admin-dev/themes/default/template/controllers/modules/list.tpl @@ -1,122 +1,115 @@ -{* -* 2007-2013 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - - {if count($modules)} - - - - - - - - - - - - - - - - {foreach from=$modules item=module} - - - - - - - {/foreach} - -
-
- 		{l s='Module name'}
- {if (isset($module->id) && $module->id > 0) || !isset($module->type) || $module->type != 'addonsMustHave'} - confirmUninstall) OR empty($module->confirmUninstall)}rel="false"{else}rel="{$module->confirmUninstall|addslashes}"{/if} - class="noborder"> - {/if} - -
-

{$module->displayName} - {if isset($module->type) && $module->type == 'addonsMustHave'} - {l s='Must Have'} - {else} - {if isset($module->id) && $module->id gt 0} - {l s='Installed'} - {else} - {l s='Not installed'} - {/if} - {/if} -

-
- {if isset($module->author) && !empty($module->author)} -
-
{l s='Developed by'} :
-
{$module->author|truncate:20:'...'}
| -
- {/if} -
-
{l s='Version'} :
-
{$module->version} - {if isset($module->version_addons)}({l s='Update'} {$module->version_addons} {l s='Available on PrestaShop Addons'}){/if} -
| -
-
-
{l s='Category'} :
-
{$module->categoryName}
-
-
-

{if isset($module->description) && $module->description ne ''}{l s='Description'} : {$module->description}{else} {/if}

- {if isset($module->message)}
{$module->message}
{/if} -
- {if !isset($module->not_on_disk)}{$module->optionsHtml}{else} {/if} -
-
- 		- -
- -
- - -
- {else} -

{l s='No modules available in this section.'}

- {/if} - +{* +* 2007-2013 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +{if count($modules)} + + + + + + + + + + {foreach from=$modules item=module} + + + + + + + {/foreach} + +
+
+ 		{l s='Module name'}
+ {if (isset($module->id) && $module->id > 0) || !isset($module->type) || $module->type != 'addonsMustHave'} + confirmUninstall) OR empty($module->confirmUninstall)}rel="false"{else}rel="{$module->confirmUninstall|addslashes}"{/if} + class="noborder"> + {/if} + +
+

{$module->displayName} + {if isset($module->type) && $module->type == 'addonsMustHave'} + {l s='Must Have'} + {else} + {if isset($module->id) && $module->id gt 0} + {l s='Installed'} + {else} + {l s='Not installed'} + {/if} + {/if} +

+
+ {if isset($module->author) && !empty($module->author)} +
+
{l s='Developed by'} :
+
{$module->author|truncate:20:'...'}
| +
+ {/if} +
+
{l s='Version'} :
+
{$module->version} + {if isset($module->version_addons)}({l s='Update'} {$module->version_addons} {l s='Available on PrestaShop Addons'}){/if} +
| +
+
+
{l s='Category'} :
+
{$module->categoryName}
+
+
+

{if isset($module->description) && $module->description ne ''}{l s='Description'} : {$module->description}{else} {/if}

+ {if isset($module->message)}
{$module->message}
{/if} +
+ {if !isset($module->not_on_disk)}{$module->optionsHtml}{else} {/if} +
+
+ 		+ +
+ +
+ + +
+{else} +

{l s='No modules available in this section.'}

+{/if} diff --git a/admin-dev/themes/default/template/controllers/modules/page.tpl b/admin-dev/themes/default/template/controllers/modules/page.tpl index 0ce3a4390..9eaa78feb 100644 --- a/admin-dev/themes/default/template/controllers/modules/page.tpl +++ b/admin-dev/themes/default/template/controllers/modules/page.tpl @@ -24,14 +24,12 @@ *}
- {include file='controllers/modules/header.tpl'} {include file='controllers/modules/filters.tpl'}
@@ -58,10 +56,8 @@
-
{include file='controllers/modules/list.tpl'}
-
diff --git a/classes/module/Module.php b/classes/module/Module.php index 73e3c4c35..41a3c9c80 100644 --- a/classes/module/Module.php +++ b/classes/module/Module.php @@ -1164,10 +1164,10 @@ abstract class ModuleCore $item->active = 0; if (isset($modaddons->img)) { - if (!file_exists('../img/tmp/'.md5($modaddons->name).'.jpg')) - if (!@copy($modaddons->img, '../img/tmp/'.md5($modaddons->name).'.jpg')) - @copy('../img/404.gif', '../img/tmp/'.md5($modaddons->name).'.jpg'); - if (file_exists('../img/tmp/'.md5($modaddons->name).'.jpg')) + if (!file_exists(_PS_TMP_IMG_DIR_.md5($modaddons->name).'.jpg')) + if (!file_put_contents(_PS_TMP_IMG_DIR_.md5($modaddons->name).'.jpg', Tools::file_get_contents($modaddons->img))) + copy(_PS_IMG_DIR_.'404.gif', _PS_TMP_IMG_DIR_.md5($modaddons->name).'.jpg'); + if (file_exists(_PS_TMP_IMG_DIR_.md5($modaddons->name).'.jpg')) $item->image = '../img/tmp/'.md5($modaddons->name).'.jpg'; } if ($item->type == 'addonsMustHave') @@ -1178,10 +1178,10 @@ abstract class ModuleCore foreach ($prices as $currency => $price) if ($id_currency = Currency::getIdByIsoCode($currency)) { - $item->price = (float)$price; - $item->id_currency = (int)$id_currency; - if ($id_default_currency == $id_currency) - break; + $item->price = (float)$price; + $item->id_currency = (int)$id_currency; + if ($id_default_currency == $id_currency) + break; } } $module_list[] = $item; diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 50c848784..0a1dae094 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -26,7 +26,6 @@ class AdminModulesControllerCore extends AdminController { - /* ** @var array map with $_GET keywords and their callback */ From a92ac119013902b37b86f5e4af1f132e36f19874 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Fri, 8 Mar 2013 14:53:19 +0100 Subject: [PATCH 6/6] //small js bug #PSCFV-8162 --- themes/live_edit.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/live_edit.tpl b/themes/live_edit.tpl index 6f764f6a5..e9a7a5f94 100644 --- a/themes/live_edit.tpl +++ b/themes/live_edit.tpl @@ -28,7 +28,7 @@ {/if} var lastMove = ''; var saveOK = '{l s='Module position saved' js=1}'; - var confirmClose = '{l s='Are you sure? If you close this window, its position won\'t be saved' js=1}'; + var confirmClose = "{l s="Are you sure? If you close this window, its position won't be saved" js=1}"; var close = '{l s='Close' js=1}'; var cancel = '{l s='Cancel' js=1}'; var confirm = '{l s='Confirm' js=1}';