Merge remote-tracking branch 'origin/development' into development
This commit is contained in:
Fabio Chelly
@@ -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*/
|
||||
|
||||
@@ -236,7 +236,7 @@
|
||||
{if isset($fields_value[$input.name].image) && $fields_value[$input.name].image}
|
||||
<div id="image">
|
||||
{$fields_value[$input.name].image}
|
||||
<p align="center">{l s='File size'} {$fields_value[$input.name].size}kb</p>
|
||||
<p align="center">{l s='File size'} {$fields_value[$input.name].size}{l s='kb'}</p>
|
||||
<a href="{$current}&{$identifier}={$form_id}&token={$token}&deleteImage=1">
|
||||
<img src="../img/admin/delete.gif" alt="{l s='Delete'}" /> {l s='Delete'}
|
||||
</a>
|
||||
|
||||
+4
-1
@@ -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');
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
|
Can't render this file because it contains an unexpected character in line 2 and column 718.
|
@@ -201,4 +201,59 @@
|
||||
<unit type="base_distance" value="m" />
|
||||
<unit type="long_distance" value="km" />
|
||||
</units>
|
||||
|
||||
<state>
|
||||
<state name="Άγιο Όρος" iso_code="GR-69" country="GR" zone="Europe"/>
|
||||
<state name="Αιτωλοακαρνανίας" iso_code="GR-01" country="GR" zone="Europe"/>
|
||||
<state name="Αργολίδας" iso_code="GR-11" country="GR" zone="Europe"/>
|
||||
<state name="Αρκαδίας" iso_code="GR-12" country="GR" zone="Europe"/>
|
||||
<state name="Άρτας" iso_code="GR-31" country="GR" zone="Europe"/>
|
||||
<state name="Αττικής" iso_code="GR-A1" country="GR" zone="Europe"/>
|
||||
<state name="Αχαΐας" iso_code="GR-13" country="GR" zone="Europe"/>
|
||||
<state name="Βοιωτίας" iso_code="GR-03" country="GR" zone="Europe"/>
|
||||
<state name="Γρεβενών" iso_code="GR-51" country="GR" zone="Europe"/>
|
||||
<state name="Δράμας" iso_code="GR-52" country="GR" zone="Europe"/>
|
||||
<state name="Δωδεκανήσου" iso_code="GR-81" country="GR" zone="Europe"/>
|
||||
<state name="Ευρυτανίας" iso_code="GR-05" country="GR" zone="Europe"/>
|
||||
<state name="Εύβοιας" iso_code="GR-04" country="GR" zone="Europe"/>
|
||||
<state name="Έβρου" iso_code="GR-71" country="GR" zone="Europe"/>
|
||||
<state name="Ζακύνθου" iso_code="GR-21" country="GR" zone="Europe"/>
|
||||
<state name="Ηλείας" iso_code="GR-14" country="GR" zone="Europe"/>
|
||||
<state name="Ημαθίας" iso_code="GR-53" country="GR" zone="Europe"/>
|
||||
<state name="Ηρακλείου" iso_code="GR-91" country="GR" zone="Europe"/>
|
||||
<state name="Θεσπρωτίας" iso_code="GR-32" country="GR" zone="Europe"/>
|
||||
<state name="Θεσσαλονίκης" iso_code="GR-54" country="GR" zone="Europe"/>
|
||||
<state name="Ιωαννίνων" iso_code="GR-33" country="GR" zone="Europe"/>
|
||||
<state name="Κέρκυρας" iso_code="GR-22" country="GR" zone="Europe"/>
|
||||
<state name="Καβάλας" iso_code="GR-55" country="GR" zone="Europe"/>
|
||||
<state name="Καρδίτσας" iso_code="GR-41" country="GR" zone="Europe"/>
|
||||
<state name="Καστοριάς" iso_code="GR-56" country="GR" zone="Europe"/>
|
||||
<state name="Κεφαλληνίας" iso_code="GR-23" country="GR" zone="Europe"/>
|
||||
<state name="Κιλκίς" iso_code="GR-57" country="GR" zone="Europe"/>
|
||||
<state name="Κοζάνης" iso_code="GR-58" country="GR" zone="Europe"/>
|
||||
<state name="Κορινθίας" iso_code="GR-15" country="GR" zone="Europe"/>
|
||||
<state name="Κυκλάδων" iso_code="GR-82" country="GR" zone="Europe"/>
|
||||
<state name="Λάρισας" iso_code="GR-42" country="GR" zone="Europe"/>
|
||||
<state name="Λέσβου" iso_code="GR-83" country="GR" zone="Europe"/>
|
||||
<state name="Λακωνίας" iso_code="GR-16" country="GR" zone="Europe"/>
|
||||
<state name="Λασιθίου" iso_code="GR-92" country="GR" zone="Europe"/>
|
||||
<state name="Λευκάδας" iso_code="GR-24" country="GR" zone="Europe"/>
|
||||
<state name="Μαγνησίας" iso_code="GR-43" country="GR" zone="Europe"/>
|
||||
<state name="Μεσσηνίας" iso_code="GR-17" country="GR" zone="Europe"/>
|
||||
<state name="Ξάνθης" iso_code="GR-72" country="GR" zone="Europe"/>
|
||||
<state name="Πέλλας" iso_code="GR-59" country="GR" zone="Europe"/>
|
||||
<state name="Πιερίας" iso_code="GR-61" country="GR" zone="Europe"/>
|
||||
<state name="Πρέβεζας" iso_code="GR-34" country="GR" zone="Europe"/>
|
||||
<state name="Ρεθύμνου" iso_code="GR-93" country="GR" zone="Europe"/>
|
||||
<state name="Ροδόπης" iso_code="GR-73" country="GR" zone="Europe"/>
|
||||
<state name="Σάμου" iso_code="GR-84" country="GR" zone="Europe"/>
|
||||
<state name="Σερρών" iso_code="GR-62" country="GR" zone="Europe"/>
|
||||
<state name="Τρικάλων" iso_code="GR-44" country="GR" zone="Europe"/>
|
||||
<state name="Φθιώτιδας" iso_code="GR-06" country="GR" zone="Europe"/>
|
||||
<state name="Φλώρινας" iso_code="GR-63" country="GR" zone="Europe"/>
|
||||
<state name="Φωκίδας" iso_code="GR-07" country="GR" zone="Europe"/>
|
||||
<state name="Χίου" iso_code="GR-85" country="GR" zone="Europe"/>
|
||||
<state name="Χαλκιδικής" iso_code="GR-64" country="GR" zone="Europe"/>
|
||||
<state name="Χανίων" iso_code="GR-94" country="GR" zone="Europe"/>
|
||||
</state>
|
||||
</localizationPack>
|
||||
|
||||
@@ -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);
|
||||
});
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<module>
|
||||
<name>mailalerts</name>
|
||||
<displayName><![CDATA[Mail alerts]]></displayName>
|
||||
<version><![CDATA[2.7]]></version>
|
||||
<version><![CDATA[2.8]]></version>
|
||||
<description><![CDATA[Sends e-mail notifications to customers and merchants.]]></description>
|
||||
<author><![CDATA[PrestaShop]]></author>
|
||||
<tab><![CDATA[administration]]></tab>
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -98,6 +98,7 @@ var moderation_active = {$moderation_active};
|
||||
<div id="new_comment_form">
|
||||
<form id="id_new_comment_form" action="#">
|
||||
<h2 class="title">{l s='Write your review' mod='productcomments'}</h2>
|
||||
{if isset($product) && $product}
|
||||
<div class="product clearfix">
|
||||
<img src="{$link->getImageLink($product->link_rewrite, $productcomment_cover, 'home_default')|escape:'html'}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$product->name|escape:html:'UTF-8'}" />
|
||||
<div class="product_desc">
|
||||
@@ -105,7 +106,7 @@ var moderation_active = {$moderation_active};
|
||||
{$product->description_short}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/if}
|
||||
<div class="new_comment_form_content">
|
||||
<h2>{l s='Write your review' mod='productcomments'}</h2>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user