diff --git a/admin-dev/themes/default/css/modules.css b/admin-dev/themes/default/css/modules.css index 59eb3f29c..4db7804bd 100644 --- a/admin-dev/themes/default/css/modules.css +++ b/admin-dev/themes/default/css/modules.css @@ -34,7 +34,7 @@ .toolbarBox .process-icon-new-module { background-image: url('../img/process-icon-new-module.png')} .toolbarBox .process-icon-new-module-addon { background-image: url('../img/process-icon-new-module-addon.png')} -div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1} +div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:11} /*FILTER MODULE*/ diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl index 8d53a000c..6c8b10f62 100644 --- a/admin-dev/themes/default/template/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/helpers/form/form.tpl @@ -236,7 +236,7 @@ {if isset($fields_value[$input.name].image) && $fields_value[$input.name].image}
{$fields_value[$input.name].image} -

{l s='File size'} {$fields_value[$input.name].size}kb

+

{l s='File size'} {$fields_value[$input.name].size}{l s='kb'}

{l s='Delete'} {l s='Delete'} diff --git a/classes/Hook.php b/classes/Hook.php index d0a56d14e..7ed27a3de 100644 --- a/classes/Hook.php +++ b/classes/Hook.php @@ -326,7 +326,10 @@ class HookCore extends ObjectModel if ($frontend) { $sql->leftJoin('module_group', 'mg', 'mg.`id_module` = m.`id_module`'); - $sql->where('mg.id_shop = '.((int)$context->shop->id).' AND mg.`id_group` IN ('.implode(', ', $groups).')'); + if (Validate::isLoadedObject($context->shop)) + $sql->where('mg.id_shop = '.((int)$context->shop->id).' AND mg.`id_group` IN ('.implode(', ', $groups).')'); + else + $sql->where('mg.`id_group` IN ('.implode(', ', $groups).')'); $sql->groupBy('hm.id_hook, hm.id_module'); } diff --git a/docs/csv_import/Exemples-Import CSV - 1.4-Addresses-US-Mono.csv b/docs/csv_import/addresses_import.csv similarity index 100% rename from docs/csv_import/Exemples-Import CSV - 1.4-Addresses-US-Mono.csv rename to docs/csv_import/addresses_import.csv diff --git a/docs/csv_import/alias_import.csv b/docs/csv_import/alias_import.csv new file mode 100644 index 000000000..77007ea6a --- /dev/null +++ b/docs/csv_import/alias_import.csv @@ -0,0 +1,5 @@ +id;Alias *;Search *;Active (0/1) +1;ano, anno, nona;nano;1 +2;ipdo, idop, podi;ipod;1 +3;McBook, Mbcook;MacBook;1 +4;Blekin;Belkin;1 diff --git a/docs/csv_import/Exemples-Import CSV - 1.5-Categorie-US-Mono.csv b/docs/csv_import/categories_import.csv similarity index 100% rename from docs/csv_import/Exemples-Import CSV - 1.5-Categorie-US-Mono.csv rename to docs/csv_import/categories_import.csv diff --git a/docs/csv_import/Exemples-Import CSV - 1.7-Combinations-US-Mono.csv b/docs/csv_import/combinations_import.csv similarity index 100% rename from docs/csv_import/Exemples-Import CSV - 1.7-Combinations-US-Mono.csv rename to docs/csv_import/combinations_import.csv diff --git a/docs/csv_import/Exemples-Import CSV - 1.1-Customer-US-Mono.csv b/docs/csv_import/customers_import.csv similarity index 100% rename from docs/csv_import/Exemples-Import CSV - 1.1-Customer-US-Mono.csv rename to docs/csv_import/customers_import.csv diff --git a/docs/csv_import/Exemples-Import CSV - 1.2-Manufacturer-US-Mono.csv b/docs/csv_import/manufacturers_import.csv similarity index 100% rename from docs/csv_import/Exemples-Import CSV - 1.2-Manufacturer-US-Mono.csv rename to docs/csv_import/manufacturers_import.csv diff --git a/docs/csv_import/Exemples-Import CSV - 1.6-Products-US-Mono.csv b/docs/csv_import/products_import.csv similarity index 100% rename from docs/csv_import/Exemples-Import CSV - 1.6-Products-US-Mono.csv rename to docs/csv_import/products_import.csv diff --git a/docs/csv_import/Exemples-Import CSV - 1.3-Supplier-US-Mono.csv b/docs/csv_import/suppliers_import.csv similarity index 100% rename from docs/csv_import/Exemples-Import CSV - 1.3-Supplier-US-Mono.csv rename to docs/csv_import/suppliers_import.csv diff --git a/docs/csv_import/Exemples-Import CSV - 1.9-Details Supply orders-US-Mono.csv b/docs/csv_import/supply_orders_details_import.csv similarity index 100% rename from docs/csv_import/Exemples-Import CSV - 1.9-Details Supply orders-US-Mono.csv rename to docs/csv_import/supply_orders_details_import.csv diff --git a/docs/csv_import/Exemples-Import CSV - 1.8-Supply orders-US-Mono.csv b/docs/csv_import/supply_orders_import.csv similarity index 100% rename from docs/csv_import/Exemples-Import CSV - 1.8-Supply orders-US-Mono.csv rename to docs/csv_import/supply_orders_import.csv diff --git a/localization/gr.xml b/localization/gr.xml index 474ffc12e..3918f377b 100644 --- a/localization/gr.xml +++ b/localization/gr.xml @@ -201,4 +201,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/blocklayered/blocklayered.js b/modules/blocklayered/blocklayered.js index 0edae4fd8..e1ec5b2de 100644 --- a/modules/blocklayered/blocklayered.js +++ b/modules/blocklayered/blocklayered.js @@ -230,12 +230,11 @@ function initLayered() function paginationButton() { $('#pagination a').not(':hidden').each(function () { - if ($(this).attr('href').search(/&|\?p=/) == -1) { - var page = 1; - } - else { - var page = $(this).attr('href').replace(/^.*[&|\?]p=(\d+).*$/, '$1'); - } + if ($(this).attr('href').search(/[&|\?]p=/) == -1) + var page = 1; + else + var page = $(this).attr('href').replace(/^.*[&|\?]p=(\d+).*$/, '$1'); + var location = window.location.href.replace(/#.*$/, ''); $(this).attr('href', location+current_friendly_url.replace(/\/page-(\d+)/, '')+'/page-'+page); }); diff --git a/modules/mailalerts/config.xml b/modules/mailalerts/config.xml index 98984a992..699578ed4 100755 --- a/modules/mailalerts/config.xml +++ b/modules/mailalerts/config.xml @@ -2,7 +2,7 @@ mailalerts - + diff --git a/modules/mailalerts/mailalerts.php b/modules/mailalerts/mailalerts.php index 57ed8cb91..8dddab040 100644 --- a/modules/mailalerts/mailalerts.php +++ b/modules/mailalerts/mailalerts.php @@ -46,7 +46,7 @@ class MailAlerts extends Module { $this->name = 'mailalerts'; $this->tab = 'administration'; - $this->version = '2.7'; + $this->version = '2.8'; $this->author = 'PrestaShop'; $this->need_instance = 0; @@ -383,7 +383,7 @@ class MailAlerts extends Module '{invoice_state}' => $invoice->id_state ? $invoice_state->name : '', '{invoice_phone}' => $invoice->phone ? $invoice->phone : $invoice->phone_mobile, '{invoice_other}' => $invoice->other, - '{order_name}' => sprintf('%06d', $order->id), + '{order_name}' => $order->reference, '{shop_name}' => $configuration['PS_SHOP_NAME'], '{date}' => $order_date_text, '{carrier}' => (($carrier->name == '0') ? $configuration['PS_SHOP_NAME'] : $carrier->name), diff --git a/modules/productcomments/productcomments.tpl b/modules/productcomments/productcomments.tpl index 710b6665c..5e3c16fb3 100644 --- a/modules/productcomments/productcomments.tpl +++ b/modules/productcomments/productcomments.tpl @@ -98,6 +98,7 @@ var moderation_active = {$moderation_active};

{l s='Write your review' mod='productcomments'}

+ {if isset($product) && $product}
{$product->name|escape:html:'UTF-8'}
@@ -105,7 +106,7 @@ var moderation_active = {$moderation_active}; {$product->description_short}
- + {/if}

{l s='Write your review' mod='productcomments'}