query($sql))
while ($message = Db::getInstance()->nextRow($messages))
{
if(is_array($message))
{
- $sql = 'UPDATE `'._DB_PREFIX_.'customer_message` SET message = \''.pSQL(Tools::htmlentitiesDecodeUTF8(str_replace('&', '&', $message['message']))).'\'
+ $sql = 'UPDATE `'._DB_PREFIX_.'customer_message` SET message = \''.pSQL(preg_replace('/'.$pattern.'/', '', Tools::htmlentitiesDecodeUTF8(str_replace('&', '&', $message['message'])))).'\'
WHERE id_customer_message = '.(int)$message['id_customer_message'];
Db::getInstance()->execute($sql);
}
diff --git a/install-dev/upgrade/sql/1.5.0.0.sql b/install-dev/upgrade/sql/1.5.0.0.sql
index 94a1e36d6..12392446b 100755
--- a/install-dev/upgrade/sql/1.5.0.0.sql
+++ b/install-dev/upgrade/sql/1.5.0.0.sql
@@ -1,4 +1,7 @@
SET NAMES 'utf8';
+
+DROP TABLE IF EXISTS `PREFIX_group_shop`;
+
CREATE TABLE IF NOT EXISTS `PREFIX_group_shop` (
`id_group_shop` int(11) unsigned NOT NULL AUTO_INCREMENT,
`name` varchar(64) CHARACTER SET utf8 NOT NULL,
diff --git a/install-dev/upgrade/sql/1.5.0.10.sql b/install-dev/upgrade/sql/1.5.0.10.sql
index 99860f0f5..82899d281 100644
--- a/install-dev/upgrade/sql/1.5.0.10.sql
+++ b/install-dev/upgrade/sql/1.5.0.10.sql
@@ -4,6 +4,8 @@
UPDATE `PREFIX_meta` SET `page` = 'contact' WHERE `page` = 'contact-form';
+DROP TABLE IF EXISTS `PREFIX_shop_group`;
+
RENAME TABLE `PREFIX_group_shop` TO `PREFIX_shop_group`;
ALTER TABLE `PREFIX_shop_group` CHANGE `id_group_shop` `id_shop_group` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT;
ALTER TABLE `PREFIX_shop` CHANGE `id_group_shop` `id_shop_group` INT( 11 ) UNSIGNED NOT NULL;
diff --git a/install-dev/upgrade/sql/1.5.5.0.sql b/install-dev/upgrade/sql/1.5.5.0.sql
index 27118c735..c93e293ac 100644
--- a/install-dev/upgrade/sql/1.5.5.0.sql
+++ b/install-dev/upgrade/sql/1.5.5.0.sql
@@ -22,6 +22,7 @@ CHANGE `module_name` `module_name` VARCHAR(64) NULL DEFAULT NULL;
/* PHP:remove_tab(AdminRangePrice); */;
/* PHP:remove_tab(AdminRangeWeight); */;
+
ALTER TABLE `PREFIX_log` ADD `id_employee` INT(10) UNSIGNED NULL DEFAULT NULL AFTER `object_id`;
SET @id_parent = (SELECT IFNULL(id_tab, 1) FROM `PREFIX_tab` WHERE `class_name` = 'AdminPriceRule' LIMIT 1);
@@ -33,6 +34,6 @@ ALTER TABLE `PREFIX_product_shop` DROP INDEX `date_add`, ADD INDEX `date_add` (`
UPDATE `PREFIX_hook` SET `live_edit` = '1' WHERE `name` LIKE 'leftcolumn';
-UPDATE `PREFIX_configuration` SET `name` = '0' WHERE `name` LIKE 'PS_LEGACY_IMAGES' AND `value` LIKE '1';
+UPDATE `PREFIX_configuration` SET `value` = '0' WHERE `name` LIKE 'PS_LEGACY_IMAGES' AND `value` = 1;
INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES('PS_SMARTY_CONSOLE_KEY', 'SMARTY_DEBUG', NOW(), NOW());
diff --git a/install-dev/upgrade/sql/1.5.6.0.sql b/install-dev/upgrade/sql/1.5.6.0.sql
new file mode 100644
index 000000000..5f5521cff
--- /dev/null
+++ b/install-dev/upgrade/sql/1.5.6.0.sql
@@ -0,0 +1 @@
+ALTER TABLE `PREFIX_manufacturer_lang` CHANGE `short_description` `short_description` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;
\ No newline at end of file
diff --git a/js/admin-products.js b/js/admin-products.js
index dcc79c6d5..60739d768 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -1326,8 +1326,9 @@ product_tabs['Suppliers'] = new function(){
$('#suppliers_accordion').accordion({
collapsible: true,
autoHeight: true,
- heightStyle: "content"});
- }, 1000);
+ heightStyle: "content"
+ });
+ }, 1000);
// Resize the accordion once the page is visible because of the bug with accordions initialized
// inside a display:none block not having the correct size.
diff --git a/js/admin.js b/js/admin.js
index a3ec20612..793de6bd1 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -119,7 +119,8 @@ function copy2friendlyURL()
function copyMeta2friendlyURL()
{
- $('#input_link_rewrite_' + id_language).val(str2url($('#name_' + id_language).val().replace(/^[0-9]+\./, ''), 'UTF-8'));
+ if (!$('input[name="id_cms"]').length)
+ $('#link_rewrite_' + id_language).val(str2url($('#name_' + id_language).val().replace(/^[0-9]+\./, ''), 'UTF-8'));
}
function updateCurrentText()
@@ -183,10 +184,15 @@ function changeFormLanguage(id_language_new, iso_code, employee_cookie)
// For multishop checkboxes
$('.multishop_lang_'+id_language_new).show().siblings('div[class^=\'multishop_lang_\']').hide();
-
$('.language_flags').hide();
if (employee_cookie)
- $.post("ajax.php", { form_language_id: id_language_new });
+ $.post("index.php", {
+ action: 'formLanguage',
+ tab: 'AdminEmployees',
+ ajax: 1,
+ token: employee_token,
+ form_language_id: id_language_new
+ });
id_language = id_language_new;
updateCurrentText();
diff --git a/js/admin_carrier_wizard.js b/js/admin_carrier_wizard.js
index 3c6c7b4a1..40980de70 100644
--- a/js/admin_carrier_wizard.js
+++ b/js/admin_carrier_wizard.js
@@ -25,7 +25,6 @@
$(document).ready(function() {
- validateAndAddRangeButtonDisplay();
bind_inputs();
initCarrierWizard();
if (parseInt($('input[name="is_free"]:checked').val()))
@@ -45,7 +44,8 @@ function initCarrierWizard()
'onLeaveStep' : onLeaveStepCallback,
'onFinish' : onFinishCallback,
'transitionEffect' : 'slideleft',
- 'enableAllSteps' : enableAllSteps
+ 'enableAllSteps' : enableAllSteps,
+ 'keyNavigation' : false
});
displayRangeType();
}
@@ -64,7 +64,7 @@ function displayRangeType()
$('.price_unit').show();
$('.weight_unit').hide();
}
-
+ is_freeClick($('input[name="is_free"]:checked'));
$('.range_type').html(string);
}
@@ -105,8 +105,8 @@ function onLeaveStepCallback(obj, context)
{
if (context.toStep == nbr_steps)
displaySummary();
-
- return validateSteps(context.fromStep); // return false to stay on step and true to continue navigation
+
+ return validateSteps(context.fromStep, context.toStep); // return false to stay on step and true to continue navigation
}
function displaySummary()
@@ -127,39 +127,49 @@ function displaySummary()
// Tax and calculation mode for the shipping cost
tmp = summary_translation_shipping_cost.replace('@s2', '' + $('#id_tax_rules_group option:selected').text() + ' ');
- if ($('#billing_price').attr('checked'))
- tmp = tmp.replace('@s1', summary_translation_price);
- else if ($('#billing_weight').attr('checked'))
- tmp = tmp.replace('@s1', summary_translation_weight);
- else
- tmp = tmp.replace('@s1', '' + summary_translation_undefined + ' ');
+
+ if ($('#billing_price').attr('checked'))
+ tmp = tmp.replace('@s1', summary_translation_price);
+ else if ($('#billing_weight').attr('checked'))
+ tmp = tmp.replace('@s1', summary_translation_weight);
+ else
+ tmp = tmp.replace('@s1', '' + summary_translation_undefined + ' ');
+
+
+
$('#summary_shipping_cost').html(tmp);
// Weight or price ranges
- $('#summary_range').html(summary_translation_range);
+ $('#summary_range').html(summary_translation_range+' '+summary_translation_range_limit);
+
+
+ if ($('input[name="shipping_method"]:checked').val() == 1)
+ unit = PS_WEIGHT_UNIT;
+ else
+ unit = currency_sign;
+
var range_inf = summary_translation_undefined;
var range_sup = summary_translation_undefined;
- /*
-$('input[name$="range_inf[]"]').each(function(){
- if (!isNaN(parseFloat($(this).val())) && (range_inf == summary_translation_undefined || range_inf < $(this).val()))
+ $('tr.range_inf td input').each( function()
+ {
+ if (!isNaN(parseFloat($(this).val())) && (range_inf == summary_translation_undefined || range_inf > $(this).val()))
range_inf = $(this).val();
});
-*/
- range_inf = $('tr.range_inf td input:first').val();
- range_sup = $('tr.range_sup td input:last').val();
- $('input[name$="range_sup[]"]').each(function(){
- if (!isNaN(parseFloat($(this).val())) && (range_sup == summary_translation_undefined || range_sup > $(this).val()))
+ $('tr.range_sup td input').each( function(){
+ if (!isNaN(parseFloat($(this).val())) && (range_sup == summary_translation_undefined || range_sup < $(this).val()))
range_sup = $(this).val();
});
+
$('#summary_range').html(
$('#summary_range').html()
- .replace('@s1', '' + range_inf + ' ')
- .replace('@s2', '' + range_sup + ' ')
+ .replace('@s1', '' + range_inf +' '+ unit + ' ')
+ .replace('@s2', '' + range_sup +' '+ unit + ' ')
.replace('@s3', '' + $('#range_behavior option:selected').text().toLowerCase() + ' ')
);
-
+ if ($('#is_free_on').attr('checked'))
+ $('span.is_free').hide();
// Delivery zones
$('#summary_zones').html('');
$('.input_zone').each(function(){
@@ -182,34 +192,43 @@ $('input[name$="range_inf[]"]').each(function(){
});
}
-function validateSteps(step_number)
+function validateSteps(fromStep, toStep)
{
- $('.wizard_error').remove();
var is_ok = true;
- form = $('#carrier_wizard #step-'+step_number+' form');
- $.ajax({
- type:"POST",
- url : validate_url,
- async: false,
- dataType: 'json',
- data : form.serialize()+'&step_number='+step_number+'&action=validate_step&ajax=1',
- success : function(datas)
- {
- if (datas.has_error)
+ if ((multistore_enable && fromStep == 3) || (!multistore_enable && fromStep == 2))
+ {
+ if (toStep > fromStep && !$('#is_free_on').attr('checked') && !validateRange(2))
+ is_ok = false;
+ }
+
+ $('.wizard_error').remove();
+ if (is_ok)
+ {
+ form = $('#carrier_wizard #step-'+fromStep+' form');
+ $.ajax({
+ type:"POST",
+ url : validate_url,
+ async: false,
+ dataType: 'json',
+ data : form.serialize()+'&step_number='+fromStep+'&action=validate_step&ajax=1',
+ success : function(datas)
{
- is_ok = false;
-
- $('input').focus( function () {
- $(this).removeClass('field_error');
- });
- displayError(datas.errors, step_number);
- resizeWizard();
+ if (datas.has_error)
+ {
+ is_ok = false;
+
+ $('input').focus( function () {
+ $(this).removeClass('field_error');
+ });
+ displayError(datas.errors, fromStep);
+ resizeWizard();
+ }
+ },
+ error: function(XMLHttpRequest, textStatus, errorThrown) {
+ jAlert("TECHNICAL ERROR: \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
}
- },
- error: function(XMLHttpRequest, textStatus, errorThrown) {
- jAlert("TECHNICAL ERROR: \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
- }
- });
+ });
+ }
return is_ok;
}
@@ -252,21 +271,6 @@ function bind_inputs()
return false;
});
- /*
-$('#validate_range_button').off('click').on('click', function () {
- index = $('tr.fees_all td:last').index();
- if (validateRange(index))
- {
- enableRange(index);
- $('.currency_sign').show();
- }
- else
- disableRange(index);
- validateAndAddRangeButtonDisplay();
- return false;
- });
-*/
-
$('tr.fees td input:checkbox').off('change').on('change', function () {
if($(this).is(':checked'))
@@ -294,22 +298,31 @@ $('#validate_range_button').off('click').on('click', function () {
enableRange(index);
else
disableRange(index);
- validateAndAddRangeButtonDisplay();
return false;
}
});
+ $('tr.fees_all td input:text').keypress( function (evn) {
+ index = $(this).parent('td').index();
+ if (evn.keyCode == 13)
+ return false;
+ });
+
$('tr.range_sup td input:text, tr.range_inf td input:text').typeWatch({
captureLength: 0,
highlight: false,
wait: 1000,
callback: function() {
-
index = $(this.el).closest('td').index();
- if (validateRange(index))
- enableRange(index);
- else
- disableRange(index);
+ range_sup = $('tr.range_sup td:eq('+index+')').children('input:text').val().trim();
+ range_inf = $('tr.range_inf td:eq('+index+')').children('input:text').val().trim();
+ if (range_sup != '' && range_inf != '')
+ {
+ if (validateRange(index))
+ enableRange(index);
+ else
+ disableRange(index);
+ }
}
});
@@ -379,9 +392,9 @@ function showFees()
{
//enable only if zone is active
tr = $(this).closest('tr');
- if ($(tr).index() > 2 && $(tr).find('td:eq(1) input').attr('checked') && $('tr.fees_all td:eq('+$(this).index()+')').hasClass('validated') || $(tr).hasClass('range_sup') || $(tr).hasClass('range_inf'))
- $(this).find('input:text').val('').removeAttr('disabled');
-
+ validate = $('tr.fees_all td:eq('+$(this).index()+')').hasClass('validated');
+ if ($(tr).index() > 2 && $(tr).find('td:eq(1) input').attr('checked') && validate || !$(tr).hasClass('range_sup') || !$(tr).hasClass('range_inf'))
+ $(this).find('input:text').removeAttr('disabled');
$(this).find('input:text, button').css('background-color', '').css('border-color', '');
$(this).find('button').css('background-color', '').css('border-color', '').removeAttr('disabled');
$(this).css('background-color', '');
@@ -456,12 +469,26 @@ function validateRange(index)
return is_ok;
}
+function enableZone(index)
+{
+ $('tr.fees').each( function () {
+ $(this).find('td:eq('+index+')').children('input').removeAttr('disabled');
+ });
+}
+
+function disableZone(index)
+{
+ $('tr.fees').each( function () {
+ $(this).find('td:eq('+index+')').children('input').attr('disabled', 'disabled');
+ });
+}
+
function enableRange(index)
{
$('tr.fees').each( function () {
//only enable fees for enabled zones
if ($(this).find('td').find('input:checkbox').attr('checked') == 'checked')
- $(this).find('td:eq('+index+')').find('input').removeAttr('disabled');
+ enableZone(index);
});
$('span.fees_all').show();
$('tr.fees_all td:eq('+index+')').find('input').show().removeAttr('disabled');
@@ -476,7 +503,7 @@ function disableRange(index)
$('tr.fees').each( function () {
//only enable fees for enabled zones
if ($(this).find('td').find('input:checkbox').attr('checked') == 'checked')
- $(this).find('td:eq('+index+')').find('input').attr('disabled', 'disabled');
+ disableZone(index);
});
$('tr.fees_all td:eq('+index+')').find('input').attr('disabled', 'disabled');
$('tr.fees_all td:eq('+index+')').removeClass('validated').addClass('not_validated');
@@ -502,7 +529,6 @@ function add_new_range()
});
$('tr.delete_range td:last').after(''+labelDelete+'');
- validateAndAddRangeButtonDisplay();
bind_inputs();
rebuildTabindex();
displayRangeType();
@@ -540,22 +566,7 @@ function rebuildTabindex()
});
}
-function validateAndAddRangeButtonDisplay()
-{
- return;
- if ($('tr.fees_all td:last').hasClass('validated'))
- {
- $('.validate_range').hide();
- $('.new_range').show();
- }
- else
- {
- $('.validate_range').show();
- $('.new_range').hide();
- }
-}
-
-function reorderRange(current_index, new_index)
+function repositionRange(current_index, new_index)
{
$('tr.range_sup, tr.range_inf, tr.fees_all, tr.fees, tr.delete_range ').each(function () {
$(this).find('td:eq('+current_index+')').each( function () {
@@ -565,11 +576,13 @@ function reorderRange(current_index, new_index)
});
}
-function checkRangeContinuity()
+function checkRangeContinuity(reordering)
{
+ return true;
+ reordering = typeof reordering !== 'undefined' ? reordering : false;
res = true;
- return true;//TODO
- $('tr.range_sup td').not('.range_type, .range_sign, tr.range_sup').each( function ()
+
+ $('tr.range_sup td').not('.range_type, .range_sign').each( function ()
{
index = $(this).index();
if (index > 2)
@@ -580,11 +593,58 @@ function checkRangeContinuity()
prev_range_sup = parseFloat($('tr.range_sup td:eq('+prev_index+')').find('input:text').val().trim());
prev_range_inf = parseFloat($('tr.range_inf td:eq('+prev_index+')').find('input:text').val().trim());
if (range_inf < prev_range_inf || range_sup < prev_range_sup)
+ {
res = false;
+ if (reordering)
+ {
+ new_position = getCorrectRangePosistion(range_inf, range_sup);
+ if (new_position)
+ repositionRange(index, new_position);
+ }
+ }
}
});
if (res)
$('.ranges_not_follow').fadeOut();
else
$('.ranges_not_follow').fadeIn();
+ resizeWizard();
+}
+
+function getCorrectRangePosistion(current_inf, current_sup)
+{
+ new_position = false;
+ $('tr.range_sup td').not('.range_type, .range_sign').each( function ()
+ {
+ index = $(this).index();
+ range_sup = parseFloat($('tr.range_sup td:eq('+index+')').children('input:text').val().trim());
+ next_range_inf = 0
+ if ($('tr.range_inf td:eq('+index+1+')').length)
+ next_range_inf = parseFloat($('tr.range_inf td:eq('+index+1+')').children('input:text').val().trim());
+ if (current_inf >= range_sup && current_sup < next_range_inf)
+ new_position = index;
+ });
+ return new_position;
+}
+
+function checkAllZones(elt)
+{
+ if($(elt).is(':checked'))
+ {
+ $('.input_zone').attr('checked', 'checked');
+ $('.fees input:text').each( function () {
+ index = $(this).parent().index();
+ if ($('tr.fees_all td:eq('+index+')').hasClass('validated'))
+ {
+ $(this).removeAttr('disabled');
+ $('.fees_all td:eq('+index+') input:text').removeAttr('disabled');
+ }
+ });
+ }
+ else
+ {
+ $('.input_zone').removeAttr('checked');
+ $('.fees input:text, .fees_all input:text').attr('disabled', 'disabled').val('');
+ }
+
}
\ No newline at end of file
diff --git a/js/form.js b/js/form.js
index a8c1c5738..c1432c34e 100644
--- a/js/form.js
+++ b/js/form.js
@@ -26,9 +26,9 @@
function ajaxStates (id_state_selected)
{
$.ajax({
- url: "ajax.php",
+ url: "index.php",
cache: false,
- data: "ajaxStates=1&no_empty=1&id_country="+$('#id_country').val() + "&id_state=" + $('#id_state').val(),
+ data: "token="+state_token+"&ajax=1&action=states&tab=AdminStates&no_empty=1&id_country="+$('#id_country').val() + "&id_state=" + $('#id_state').val(),
success: function(html)
{
if (html == 'false')
@@ -59,4 +59,4 @@ function ajaxStates (id_state_selected)
}
});
}
-}
\ No newline at end of file
+}
diff --git a/js/jquery/jquery-migrate-1.2.1.js b/js/jquery/jquery-migrate-1.2.1.js
new file mode 100644
index 000000000..e6fc3fbea
--- /dev/null
+++ b/js/jquery/jquery-migrate-1.2.1.js
@@ -0,0 +1,521 @@
+/*!
+ * jQuery Migrate - v1.2.1 - 2013-05-08
+ * https://github.com/jquery/jquery-migrate
+ * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT
+ */
+(function( jQuery, window, undefined ) {
+// See http://bugs.jquery.com/ticket/13335
+// "use strict";
+jQuery.migrateMute = true;
+
+var warnedAbout = {};
+
+// List of warnings already given; public read only
+jQuery.migrateWarnings = [];
+
+// Set to true to prevent console output; migrateWarnings still maintained
+// jQuery.migrateMute = false;
+
+// Show a message on the console so devs know we're active
+if ( !jQuery.migrateMute && window.console && window.console.log ) {
+ window.console.log("JQMIGRATE: Logging is active");
+}
+
+// Set to false to disable traces that appear with warnings
+if ( jQuery.migrateTrace === undefined ) {
+ jQuery.migrateTrace = true;
+}
+
+// Forget any warnings we've already given; public
+jQuery.migrateReset = function() {
+ warnedAbout = {};
+ jQuery.migrateWarnings.length = 0;
+};
+
+function migrateWarn( msg) {
+ var console = window.console;
+ if ( !warnedAbout[ msg ] ) {
+ warnedAbout[ msg ] = true;
+ jQuery.migrateWarnings.push( msg );
+ if ( console && console.warn && !jQuery.migrateMute ) {
+ console.warn( "JQMIGRATE: " + msg );
+ if ( jQuery.migrateTrace && console.trace ) {
+ console.trace();
+ }
+ }
+ }
+}
+
+function migrateWarnProp( obj, prop, value, msg ) {
+ if ( Object.defineProperty ) {
+ // On ES5 browsers (non-oldIE), warn if the code tries to get prop;
+ // allow property to be overwritten in case some other plugin wants it
+ try {
+ Object.defineProperty( obj, prop, {
+ configurable: true,
+ enumerable: true,
+ get: function() {
+ migrateWarn( msg );
+ return value;
+ },
+ set: function( newValue ) {
+ migrateWarn( msg );
+ value = newValue;
+ }
+ });
+ return;
+ } catch( err ) {
+ // IE8 is a dope about Object.defineProperty, can't warn there
+ }
+ }
+
+ // Non-ES5 (or broken) browser; just set the property
+ jQuery._definePropertyBroken = true;
+ obj[ prop ] = value;
+}
+
+if ( document.compatMode === "BackCompat" ) {
+ // jQuery has never supported or tested Quirks Mode
+ migrateWarn( "jQuery is not compatible with Quirks Mode" );
+}
+
+
+var attrFn = jQuery( "", { type: "button" } ).
+ if ( name === "type" && value !== undefined && rnoType.test( elem.nodeName ) && elem.parentNode ) {
+ migrateWarn("Can't change the 'type' of an input or button in IE 6/7/8");
+ }
+
+ // Restore boolHook for boolean property/attribute synchronization
+ if ( !jQuery.attrHooks[ lowerName ] && rboolean.test( lowerName ) ) {
+ jQuery.attrHooks[ lowerName ] = {
+ get: function( elem, name ) {
+ // Align boolean attributes with corresponding properties
+ // Fall back to attribute presence where some booleans are not supported
+ var attrNode,
+ property = jQuery.prop( elem, name );
+ return property === true || typeof property !== "boolean" &&
+ ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
+
+ name.toLowerCase() :
+ undefined;
+ },
+ set: function( elem, value, name ) {
+ var propName;
+ if ( value === false ) {
+ // Remove boolean attributes when set to false
+ jQuery.removeAttr( elem, name );
+ } else {
+ // value is true since we know at this point it's type boolean and not false
+ // Set boolean attributes to the same name and set the DOM property
+ propName = jQuery.propFix[ name ] || name;
+ if ( propName in elem ) {
+ // Only set the IDL specifically if it already exists on the element
+ elem[ propName ] = true;
+ }
+
+ elem.setAttribute( name, name.toLowerCase() );
+ }
+ return name;
+ }
+ };
+
+ // Warn only for attributes that can remain distinct from their properties post-1.9
+ if ( ruseDefault.test( lowerName ) ) {
+ migrateWarn( "jQuery.fn.attr('" + lowerName + "') may use property instead of attribute" );
+ }
+ }
+
+ return oldAttr.call( jQuery, elem, name, value );
+};
+
+// attrHooks: value
+jQuery.attrHooks.value = {
+ get: function( elem, name ) {
+ var nodeName = ( elem.nodeName || "" ).toLowerCase();
+ if ( nodeName === "button" ) {
+ return valueAttrGet.apply( this, arguments );
+ }
+ if ( nodeName !== "input" && nodeName !== "option" ) {
+ migrateWarn("jQuery.fn.attr('value') no longer gets properties");
+ }
+ return name in elem ?
+ elem.value :
+ null;
+ },
+ set: function( elem, value ) {
+ var nodeName = ( elem.nodeName || "" ).toLowerCase();
+ if ( nodeName === "button" ) {
+ return valueAttrSet.apply( this, arguments );
+ }
+ if ( nodeName !== "input" && nodeName !== "option" ) {
+ migrateWarn("jQuery.fn.attr('value', val) no longer sets properties");
+ }
+ // Does not return so that setAttribute is also used
+ elem.value = value;
+ }
+};
+
+
+var matched, browser,
+ oldInit = jQuery.fn.init,
+ oldParseJSON = jQuery.parseJSON,
+ // Note: XSS check is done below after string is trimmed
+ rquickExpr = /^([^<]*)(<[\w\W]+>)([^>]*)$/;
+
+// $(html) "looks like html" rule change
+jQuery.fn.init = function( selector, context, rootjQuery ) {
+ var match;
+
+ if ( selector && typeof selector === "string" && !jQuery.isPlainObject( context ) &&
+ (match = rquickExpr.exec( jQuery.trim( selector ) )) && match[ 0 ] ) {
+ // This is an HTML string according to the "old" rules; is it still?
+ if ( selector.charAt( 0 ) !== "<" ) {
+ migrateWarn("$(html) HTML strings must start with '<' character");
+ }
+ if ( match[ 3 ] ) {
+ migrateWarn("$(html) HTML text after last tag is ignored");
+ }
+ // Consistently reject any HTML-like string starting with a hash (#9521)
+ // Note that this may break jQuery 1.6.x code that otherwise would work.
+ if ( match[ 0 ].charAt( 0 ) === "#" ) {
+ migrateWarn("HTML string cannot start with a '#' character");
+ jQuery.error("JQMIGRATE: Invalid selector string (XSS)");
+ }
+ // Now process using loose rules; let pre-1.8 play too
+ if ( context && context.context ) {
+ // jQuery object as context; parseHTML expects a DOM object
+ context = context.context;
+ }
+ if ( jQuery.parseHTML ) {
+ return oldInit.call( this, jQuery.parseHTML( match[ 2 ], context, true ),
+ context, rootjQuery );
+ }
+ }
+ return oldInit.apply( this, arguments );
+};
+jQuery.fn.init.prototype = jQuery.fn;
+
+// Let $.parseJSON(falsy_value) return null
+jQuery.parseJSON = function( json ) {
+ if ( !json && json !== null ) {
+ migrateWarn("jQuery.parseJSON requires a valid JSON string");
+ return null;
+ }
+ return oldParseJSON.apply( this, arguments );
+};
+
+jQuery.uaMatch = function( ua ) {
+ ua = ua.toLowerCase();
+
+ var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
+ /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
+ /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
+ /(msie) ([\w.]+)/.exec( ua ) ||
+ ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
+ [];
+
+ return {
+ browser: match[ 1 ] || "",
+ version: match[ 2 ] || "0"
+ };
+};
+
+// Don't clobber any existing jQuery.browser in case it's different
+if ( !jQuery.browser ) {
+ matched = jQuery.uaMatch( navigator.userAgent );
+ browser = {};
+
+ if ( matched.browser ) {
+ browser[ matched.browser ] = true;
+ browser.version = matched.version;
+ }
+
+ // Chrome is Webkit, but Webkit is also Safari.
+ if ( browser.chrome ) {
+ browser.webkit = true;
+ } else if ( browser.webkit ) {
+ browser.safari = true;
+ }
+
+ jQuery.browser = browser;
+}
+
+// Warn if the code tries to get jQuery.browser
+migrateWarnProp( jQuery, "browser", jQuery.browser, "jQuery.browser is deprecated" );
+
+jQuery.sub = function() {
+ function jQuerySub( selector, context ) {
+ return new jQuerySub.fn.init( selector, context );
+ }
+ jQuery.extend( true, jQuerySub, this );
+ jQuerySub.superclass = this;
+ jQuerySub.fn = jQuerySub.prototype = this();
+ jQuerySub.fn.constructor = jQuerySub;
+ jQuerySub.sub = this.sub;
+ jQuerySub.fn.init = function init( selector, context ) {
+ if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
+ context = jQuerySub( context );
+ }
+
+ return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
+ };
+ jQuerySub.fn.init.prototype = jQuerySub.fn;
+ var rootjQuerySub = jQuerySub(document);
+ migrateWarn( "jQuery.sub() is deprecated" );
+ return jQuerySub;
+};
+
+
+// Ensure that $.ajax gets the new parseJSON defined in core.js
+jQuery.ajaxSetup({
+ converters: {
+ "text json": jQuery.parseJSON
+ }
+});
+
+
+var oldFnData = jQuery.fn.data;
+
+jQuery.fn.data = function( name ) {
+ var ret, evt,
+ elem = this[0];
+
+ // Handles 1.7 which has this behavior and 1.8 which doesn't
+ if ( elem && name === "events" && arguments.length === 1 ) {
+ ret = jQuery.data( elem, name );
+ evt = jQuery._data( elem, name );
+ if ( ( ret === undefined || ret === evt ) && evt !== undefined ) {
+ migrateWarn("Use of jQuery.fn.data('events') is deprecated");
+ return evt;
+ }
+ }
+ return oldFnData.apply( this, arguments );
+};
+
+
+var rscriptType = /\/(java|ecma)script/i,
+ oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack;
+
+jQuery.fn.andSelf = function() {
+ migrateWarn("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()");
+ return oldSelf.apply( this, arguments );
+};
+
+// Since jQuery.clean is used internally on older versions, we only shim if it's missing
+if ( !jQuery.clean ) {
+ jQuery.clean = function( elems, context, fragment, scripts ) {
+ // Set context per 1.8 logic
+ context = context || document;
+ context = !context.nodeType && context[0] || context;
+ context = context.ownerDocument || context;
+
+ migrateWarn("jQuery.clean() is deprecated");
+
+ var i, elem, handleScript, jsTags,
+ ret = [];
+
+ jQuery.merge( ret, jQuery.buildFragment( elems, context ).childNodes );
+
+ // Complex logic lifted directly from jQuery 1.8
+ if ( fragment ) {
+ // Special handling of each script element
+ handleScript = function( elem ) {
+ // Check if we consider it executable
+ if ( !elem.type || rscriptType.test( elem.type ) ) {
+ // Detach the script and store it in the scripts array (if provided) or the fragment
+ // Return truthy to indicate that it has been handled
+ return scripts ?
+ scripts.push( elem.parentNode ? elem.parentNode.removeChild( elem ) : elem ) :
+ fragment.appendChild( elem );
+ }
+ };
+
+ for ( i = 0; (elem = ret[i]) != null; i++ ) {
+ // Check if we're done after handling an executable script
+ if ( !( jQuery.nodeName( elem, "script" ) && handleScript( elem ) ) ) {
+ // Append to fragment and handle embedded scripts
+ fragment.appendChild( elem );
+ if ( typeof elem.getElementsByTagName !== "undefined" ) {
+ // handleScript alters the DOM, so use jQuery.merge to ensure snapshot iteration
+ jsTags = jQuery.grep( jQuery.merge( [], elem.getElementsByTagName("script") ), handleScript );
+
+ // Splice the scripts into ret after their former ancestor and advance our index beyond them
+ ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
+ i += jsTags.length;
+ }
+ }
+ }
+ }
+
+ return ret;
+ };
+}
+
+var eventAdd = jQuery.event.add,
+ eventRemove = jQuery.event.remove,
+ eventTrigger = jQuery.event.trigger,
+ oldToggle = jQuery.fn.toggle,
+ oldLive = jQuery.fn.live,
+ oldDie = jQuery.fn.die,
+ ajaxEvents = "ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",
+ rajaxEvent = new RegExp( "\\b(?:" + ajaxEvents + ")\\b" ),
+ rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
+ hoverHack = function( events ) {
+ if ( typeof( events ) !== "string" || jQuery.event.special.hover ) {
+ return events;
+ }
+ if ( rhoverHack.test( events ) ) {
+ migrateWarn("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'");
+ }
+ return events && events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
+ };
+
+// Event props removed in 1.9, put them back if needed; no practical way to warn them
+if ( jQuery.event.props && jQuery.event.props[ 0 ] !== "attrChange" ) {
+ jQuery.event.props.unshift( "attrChange", "attrName", "relatedNode", "srcElement" );
+}
+
+// Undocumented jQuery.event.handle was "deprecated" in jQuery 1.7
+if ( jQuery.event.dispatch ) {
+ migrateWarnProp( jQuery.event, "handle", jQuery.event.dispatch, "jQuery.event.handle is undocumented and deprecated" );
+}
+
+// Support for 'hover' pseudo-event and ajax event warnings
+jQuery.event.add = function( elem, types, handler, data, selector ){
+ if ( elem !== document && rajaxEvent.test( types ) ) {
+ migrateWarn( "AJAX events should be attached to document: " + types );
+ }
+ eventAdd.call( this, elem, hoverHack( types || "" ), handler, data, selector );
+};
+jQuery.event.remove = function( elem, types, handler, selector, mappedTypes ){
+ eventRemove.call( this, elem, hoverHack( types ) || "", handler, selector, mappedTypes );
+};
+
+jQuery.fn.error = function() {
+ var args = Array.prototype.slice.call( arguments, 0);
+ migrateWarn("jQuery.fn.error() is deprecated");
+ args.splice( 0, 0, "error" );
+ if ( arguments.length ) {
+ return this.bind.apply( this, args );
+ }
+ // error event should not bubble to window, although it does pre-1.7
+ this.triggerHandler.apply( this, args );
+ return this;
+};
+
+jQuery.fn.toggle = function( fn, fn2 ) {
+
+ // Don't mess with animation or css toggles
+ if ( !jQuery.isFunction( fn ) || !jQuery.isFunction( fn2 ) ) {
+ return oldToggle.apply( this, arguments );
+ }
+ migrateWarn("jQuery.fn.toggle(handler, handler...) is deprecated");
+
+ // Save reference to arguments for access in closure
+ var args = arguments,
+ guid = fn.guid || jQuery.guid++,
+ i = 0,
+ toggler = function( event ) {
+ // Figure out which function to execute
+ var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+ jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+ // Make sure that clicks stop
+ event.preventDefault();
+
+ // and execute the function
+ return args[ lastToggle ].apply( this, arguments ) || false;
+ };
+
+ // link all the functions, so any of them can unbind this click handler
+ toggler.guid = guid;
+ while ( i < args.length ) {
+ args[ i++ ].guid = guid;
+ }
+
+ return this.click( toggler );
+};
+
+jQuery.fn.live = function( types, data, fn ) {
+ migrateWarn("jQuery.fn.live() is deprecated");
+ if ( oldLive ) {
+ return oldLive.apply( this, arguments );
+ }
+ jQuery( this.context ).on( types, this.selector, data, fn );
+ return this;
+};
+
+jQuery.fn.die = function( types, fn ) {
+ migrateWarn("jQuery.fn.die() is deprecated");
+ if ( oldDie ) {
+ return oldDie.apply( this, arguments );
+ }
+ jQuery( this.context ).off( types, this.selector || "**", fn );
+ return this;
+};
+
+// Turn global events into document-triggered events
+jQuery.event.trigger = function( event, data, elem, onlyHandlers ){
+ if ( !elem && !rajaxEvent.test( event ) ) {
+ migrateWarn( "Global events are undocumented and deprecated" );
+ }
+ return eventTrigger.call( this, event, data, elem || document, onlyHandlers );
+};
+jQuery.each( ajaxEvents.split("|"),
+ function( _, name ) {
+ jQuery.event.special[ name ] = {
+ setup: function() {
+ var elem = this;
+
+ // The document needs no shimming; must be !== for oldIE
+ if ( elem !== document ) {
+ jQuery.event.add( document, name + "." + jQuery.guid, function() {
+ jQuery.event.trigger( name, null, elem, true );
+ });
+ jQuery._data( this, name, jQuery.guid++ );
+ }
+ return false;
+ },
+ teardown: function() {
+ if ( this !== document ) {
+ jQuery.event.remove( document, name + "." + jQuery._data( this, name ) );
+ }
+ return false;
+ }
+ };
+ }
+);
+
+
+})( jQuery, window );
diff --git a/js/tools.js b/js/tools.js
index cc84ad854..4da024b8c 100644
--- a/js/tools.js
+++ b/js/tools.js
@@ -294,6 +294,44 @@ function removeQuotes(value)
return value;
}
+/**
+ * Display a MessageBox
+ * @param {string} msg
+ * @param {string} title (optional)
+ */
+function fancyMsgBox(msg, title)
+{
+ if (title) msg = "" + title + " " + msg + "
";
+ msg += "
";
+ $.fancybox( msg, {'autoDimensions': false, 'width': 500, 'height': 'auto', 'transitionIn': 'none', 'transitionOut': 'none'} );
+}
+
+/**
+ * Display a messageDialog with different buttons including a callback for each one
+ * @param {string} question
+ * @param {mixed} title Optional title for the dialog box. Send false if you don't want any title
+ * @param {object} buttons Associative array containg a list of {buttonCaption: callbackFunctionName, ...}. Use an empty space instead of function name for no callback
+ * @param {mixed} otherParams Optional data sent to the callback function
+ */
+function fancyChooseBox(question, title, buttons, otherParams)
+{
+ var msg, funcName, action;
+ if (title) msg = "" + title + " " + question + "
";
+ msg += "";
+ var i = 0;
+ for (var caption in buttons) {
+ if (!buttons.hasOwnProperty(caption)) continue;
+ funcName = buttons[caption];
+ if (typeof otherParams == 'undefined') otherParams = 0;
+ otherParams = escape(JSON.stringify(otherParams));
+ action = funcName ? "$.fancybox.close();window['" + funcName + "'](JSON.parse(unescape('" + otherParams + "')), " + i + ")" : "$.fancybox.close()";
+ msg += '
";
+ $.fancybox( msg, {'autoDimensions': false, 'width': 500, 'height': 'auto', 'transitionIn': 'none', 'transitionOut': 'none'} );
+}
+
//On dom ready
$().ready(function()
{
diff --git a/localization/ar.xml b/localization/ar.xml
index 7b067c659..aafcb96b3 100644
--- a/localization/ar.xml
+++ b/localization/ar.xml
@@ -1,7 +1,7 @@
-
+
+
+
-
diff --git a/localization/cz.xml b/localization/cz.xml
index ced586411..83d042e7e 100644
--- a/localization/cz.xml
+++ b/localization/cz.xml
@@ -1,16 +1,17 @@
-
-
+
-
+
-
-
-
-
-
blockadvertising
- 1
diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js
index b0de33fd0..97448ffef 100644
--- a/modules/blockcart/ajax-cart.js
+++ b/modules/blockcart/ajax-cart.js
@@ -214,26 +214,46 @@ var ajaxCart = {
$element = $('#bigpic');
var $picture = $element.clone();
var pictureOffsetOriginal = $element.offset();
+ pictureOffsetOriginal.right = $(window).innerWidth() - pictureOffsetOriginal.left - $element.width();
- if ($picture.size())
- $picture.css({'position': 'absolute', 'top': pictureOffsetOriginal.top, 'left': pictureOffsetOriginal.left});
+ if ($picture.length)
+ {
+ $picture.css({
+ position: 'absolute',
+ top: pictureOffsetOriginal.top,
+ right: pictureOffsetOriginal.right
+ });
+ }
var pictureOffset = $picture.offset();
- if ($('#cart_block')[0] && $('#cart_block').offset().top && $('#cart_block').offset().left)
- var cartBlockOffset = $('#cart_block').offset();
- else
- var cartBlockOffset = $('#shopping_cart').offset();
+ var cartBlock = $('#cart_block');
+ if (!$('#cart_block')[0] || !$('#cart_block').offset().top || !$('#cart_block').offset().left)
+ cartBlock = $('#shopping_cart');
+ var cartBlockOffset = cartBlock.offset();
+ cartBlockOffset.right = $(window).innerWidth() - cartBlockOffset.left - cartBlock.width();
// Check if the block cart is activated for the animation
- if (cartBlockOffset != undefined && $picture.size())
+ if (cartBlockOffset != undefined && $picture.length)
{
$picture.appendTo('body');
- $picture.css({ 'position': 'absolute', 'top': $picture.css('top'), 'left': $picture.css('left'), 'z-index': 4242 })
- .animate({ 'width': $element.attr('width')*0.66, 'height': $element.attr('height')*0.66, 'opacity': 0.2, 'top': cartBlockOffset.top + 30, 'left': cartBlockOffset.left + 15 }, 1000)
- .fadeOut(100, function() {
- ajaxCart.updateCartInformation(jsonData, addedFromProductPage);
- $(this).remove();
- });
+ $picture
+ .css({
+ position: 'absolute',
+ top: pictureOffsetOriginal.top,
+ right: pictureOffsetOriginal.right,
+ zIndex: 4242
+ })
+ .animate({
+ width: $element.attr('width')*0.66,
+ height: $element.attr('height')*0.66,
+ opacity: 0.2,
+ top: cartBlockOffset.top + 30,
+ right: cartBlockOffset.right + 15
+ }, 1000)
+ .fadeOut(100, function() {
+ ajaxCart.updateCartInformation(jsonData, addedFromProductPage);
+ $(this).remove();
+ });
}
else
ajaxCart.updateCartInformation(jsonData, addedFromProductPage);
diff --git a/modules/blockcart/config.xml b/modules/blockcart/config.xml
index 3647d19d7..cb1badd0e 100755
--- a/modules/blockcart/config.xml
+++ b/modules/blockcart/config.xml
@@ -1,9 +1,9 @@
blockcart
- 1
diff --git a/modules/blockcategories/category-tree-branch.tpl b/modules/blockcategories/category-tree-branch.tpl
index 71ab1125e..63bbcb73e 100644
--- a/modules/blockcategories/category-tree-branch.tpl
+++ b/modules/blockcategories/category-tree-branch.tpl
@@ -24,7 +24,8 @@
*}
- {$node.name|escape:'htmlall':'UTF-8'}
+ {$node.name|escape:'htmlall':'UTF-8'}
{if $node.children|@count > 0}
{foreach from=$node.children item=child name=categoryTreeBranch}
diff --git a/modules/blockcms/blockcms.php b/modules/blockcms/blockcms.php
index 2075ddc5b..2b808b6f6 100755
--- a/modules/blockcms/blockcms.php
+++ b/modules/blockcms/blockcms.php
@@ -757,7 +757,7 @@ class BlockCms extends Module
//get all cmd block to duplicate in new shop
$cms_blocks = Db::getInstance()->executeS('
SELECT * FROM `'._DB_PREFIX_.'cms_block` cb
- LEFT JOIN `'._DB_PREFIX_.'cms_block_shop` cbf
+ JOIN `'._DB_PREFIX_.'cms_block_shop` cbf
ON (cb.`id_cms_block` = cbf.`id_cms_block` AND cbf.`id_shop` = '.(int)$params['old_id_shop'].') ');
if (count($cms_blocks))
diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php
index d5d0b0016..91ebe0cd2 100644
--- a/modules/blocklayered/blocklayered.php
+++ b/modules/blocklayered/blocklayered.php
@@ -260,14 +260,14 @@ class BlockLayered extends Module
Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_product_attribute WHERE id_product = '.(int)$id_product);
Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'layered_product_attribute` (`id_attribute`, `id_product`, `id_attribute_group`, `id_shop`)
- SELECT pac.id_attribute, pa.id_product, ag.id_attribute_group, '.(version_compare(_PS_VERSION_,'1.5','>') ? 'product_attribute_shop.`id_shop`' : '1').'
- FROM '._DB_PREFIX_.'product_attribute pa
- '.(version_compare(_PS_VERSION_,'1.5','>') ? Shop::addSqlAssociation('product_attribute', 'pa') : '').'
+ SELECT pac.id_attribute, pa.id_product, ag.id_attribute_group, product_attribute_shop.`id_shop`
+ FROM '._DB_PREFIX_.'product_attribute pa'.
+ Shop::addSqlAssociation('product_attribute', 'pa').'
INNER JOIN '._DB_PREFIX_.'product_attribute_combination pac ON pac.id_product_attribute = pa.id_product_attribute
INNER JOIN '._DB_PREFIX_.'attribute a ON (a.id_attribute = pac.id_attribute)
INNER JOIN '._DB_PREFIX_.'attribute_group ag ON ag.id_attribute_group = a.id_attribute_group
'.(is_null($id_product) ? '' : 'AND pa.id_product = '.(int)$id_product).'
- GROUP BY a.id_attribute, pa.id_product '.(version_compare(_PS_VERSION_,'1.5','>') ? ', product_attribute_shop.`id_shop`' : ''));
+ GROUP BY a.id_attribute, pa.id_product , product_attribute_shop.`id_shop`');
return 1;
}
@@ -445,17 +445,22 @@ class BlockLayered extends Module
static $_MODULES = array();
global $_MODULE;
- if (version_compare(_PS_VERSION_,'1.5','>'))
$file = _PS_MODULE_DIR_.$this->name.'/translations/'.Language::getIsoById($id_lang).'.php';
- else
- $file = _PS_MODULE_DIR_.$this->name.'/'.Language::getIsoById($id_lang).'.php';
if (!array_key_exists($id_lang, $_MODULES))
{
- if (!file_exists($file))
+ if (file_exists($file1 = _PS_MODULE_DIR_.$this->name.'/translations/'.Language::getIsoById($id_lang).'.php'))
+ {
+ include($file1);
+ $_MODULES[$id_lang] = $_MODULE;
+ }
+ elseif (file_exists($file2 = _PS_MODULE_DIR_.$this->name.'/'.Language::getIsoById($id_lang).'.php'))
+ {
+ include($file2);
+ $_MODULES[$id_lang] = $_MODULE;
+ }
+ else
return $string;
- include($file);
- $_MODULES[$id_lang] = $_MODULE;
}
$string = str_replace('\'', '\\\'', $string);
@@ -482,8 +487,7 @@ class BlockLayered extends Module
public function hookProductListAssign($params)
{
global $smarty;
- if (version_compare(_PS_VERSION_,'1.5','<') && !Configuration::get('PS_LAYERED_INDEXED')
- || version_compare(_PS_VERSION_,'1.5','>') && !Configuration::getGlobalValue('PS_LAYERED_INDEXED'))
+ if (!Configuration::getGlobalValue('PS_LAYERED_INDEXED'))
return;
// Inform the hook was executed
$params['hookExecuted'] = true;
@@ -564,14 +568,11 @@ class BlockLayered extends Module
$default_form_language = (int)(Configuration::get('PS_LANG_DEFAULT'));
$lang_value = array();
- if (version_compare(_PS_VERSION_,'1.5','>'))
$return = '
';
- else
- $return = '';
-
+
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(
'SELECT url_name, meta_title, id_lang FROM '._DB_PREFIX_.'layered_indexable_feature_value_lang_value
WHERE id_feature_value = '.(int)$params['id_feature_value']);
@@ -592,8 +593,7 @@ class BlockLayered extends Module
'.$this->l('Invalid characters:').' <>;=#{}_
'.$this->l('Specific URL format in block layered generation').'
';
- if (version_compare(_PS_VERSION_,'1.5','<'))
- $return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'url_name', true, true);
+
$return .= '
@@ -607,9 +607,7 @@ class BlockLayered extends Module
'.$this->l('Specific format for meta title').'
';
-
- if (version_compare(_PS_VERSION_,'1.5','<'))
- $return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'meta_title', true, true);
+
$return .= '
@@ -651,13 +649,10 @@ class BlockLayered extends Module
$default_form_language = (int)(Configuration::get('PS_LANG_DEFAULT'));
$lang_value = array();
- if (version_compare(_PS_VERSION_,'1.5','>'))
- $return = '
+ $return = '
';
- else
- $return = '';
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(
'SELECT url_name, meta_title, id_lang FROM '._DB_PREFIX_.'layered_indexable_attribute_lang_value
@@ -679,8 +674,7 @@ class BlockLayered extends Module
'.$this->l('Invalid characters:').' <>;=#{}_
'.$this->l('Specific URL format in block layered generation').'
';
- if (version_compare(_PS_VERSION_,'1.5','<'))
- $return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'url_name', true, true);
+
$return .= '
@@ -694,8 +688,7 @@ class BlockLayered extends Module
'.$this->l('Specific format for meta title').'
';
- if (version_compare(_PS_VERSION_,'1.5','<'))
- $return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'meta_title', true, true);
+
$return .= '
@@ -784,13 +777,10 @@ class BlockLayered extends Module
else
$on = (bool)$indexable;
- if (version_compare(_PS_VERSION_,'1.5','>'))
- $return = '
- ';
- else
- $return = '';
+ $return = '
+ ';
$return .= '
'.$this->l('URL:').'
@@ -806,8 +796,7 @@ class BlockLayered extends Module
'.$this->l('Invalid characters:').' <>;=#{}_
'.$this->l('Specific URL format in block layered generation').'
';
- if (version_compare(_PS_VERSION_,'1.5','<'))
- $return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'url_name', true, true);
+
$return .= '
@@ -821,8 +810,7 @@ class BlockLayered extends Module
'.$this->l('Specific format for meta title').'
';
- if (version_compare(_PS_VERSION_,'1.5','<'))
- $return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'meta_title', true, true);
+
$return .= '
@@ -858,13 +846,10 @@ class BlockLayered extends Module
else
$on = (bool)$indexable;
- if (version_compare(_PS_VERSION_,'1.5','>'))
- $return = '
- ';
- else
- $return = '';
+ $return = '
+ ';
$return .= '
'.$this->l('URL:').'
@@ -880,8 +865,7 @@ class BlockLayered extends Module
'.$this->l('Invalid characters:').' <>;=#{}_
'.$this->l('Specific URL format in block layered generation').'
';
- if (version_compare(_PS_VERSION_,'1.5','<'))
- $return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'url_name', true, true);
+
$return .= '
@@ -895,8 +879,7 @@ class BlockLayered extends Module
'.$this->l('Specific format for meta title').'
';
- if (version_compare(_PS_VERSION_,'1.5','<'))
- $return .= $this->displayFlags($languages, $default_form_language, 'flag_fields', 'meta_title', true, true);
+
$return .= '
@@ -934,30 +917,18 @@ class BlockLayered extends Module
private static function indexPrices($cursor = null, $full = false, $ajax = false, $smart = false)
{
if ($full)
- if (version_compare(_PS_VERSION_,'1.5','>'))
- $nb_products = (int)Db::getInstance()->getValue('
- SELECT count(DISTINCT p.`id_product`)
- FROM '._DB_PREFIX_.'product p
- INNER JOIN `'._DB_PREFIX_.'product_shop` ps
- ON (ps.`id_product` = p.`id_product` AND ps.`active` = 1)');
+ $nb_products = (int)Db::getInstance()->getValue('
+ SELECT count(DISTINCT p.`id_product`)
+ FROM '._DB_PREFIX_.'product p
+ INNER JOIN `'._DB_PREFIX_.'product_shop` ps
+ ON (ps.`id_product` = p.`id_product` AND ps.`active` = 1 AND ps.`visibility` IN ("both", "catalog"))');
else
- $nb_products = (int)Db::getInstance()->getValue('
- SELECT count(DISTINCT p.`id_product`)
- FROM '._DB_PREFIX_.'product p
- WHERE `active` = 1');
- else
- if (version_compare(_PS_VERSION_,'1.5','>'))
- $nb_products = (int)Db::getInstance()->getValue('
- SELECT COUNT(DISTINCT p.`id_product`) FROM `'._DB_PREFIX_.'product` p
- INNER JOIN `'._DB_PREFIX_.'product_shop` ps
- ON (ps.`id_product` = p.`id_product` AND ps.`active` = 1)
- LEFT JOIN `'._DB_PREFIX_.'layered_price_index` psi ON (psi.id_product = p.id_product)
- WHERE psi.id_product IS NULL');
- else
- $nb_products = (int)Db::getInstance()->getValue('
- SELECT COUNT(DISTINCT p.`id_product`) FROM `'._DB_PREFIX_.'product` p
- LEFT JOIN `'._DB_PREFIX_.'layered_price_index` psi ON (psi.id_product = p.id_product)
- WHERE `active` = 1 AND psi.id_product IS NULL');
+ $nb_products = (int)Db::getInstance()->getValue('
+ SELECT COUNT(DISTINCT p.`id_product`) FROM `'._DB_PREFIX_.'product` p
+ INNER JOIN `'._DB_PREFIX_.'product_shop` ps
+ ON (ps.`id_product` = p.`id_product` AND ps.`active` = 1 AND ps.`visibility` IN ("both", "catalog"))
+ LEFT JOIN `'._DB_PREFIX_.'layered_price_index` psi ON (psi.id_product = p.id_product)
+ WHERE psi.id_product IS NULL');
$max_executiontime = @ini_get('max_execution_time');
if ($max_executiontime > 5 || $max_executiontime <= 0)
@@ -990,11 +961,8 @@ class BlockLayered extends Module
return '{"cursor": '.$cursor.', "count": '.($nb_products).'}';
else
{
- if (version_compare(_PS_VERSION_,'1.5','>'))
- Configuration::updateGlobalValue('PS_LAYERED_INDEXED', 1);
- else
- Configuration::updateValue('PS_LAYERED_INDEXED', 1);
-
+ Configuration::updateGlobalValue('PS_LAYERED_INDEXED', 1);
+
if ($ajax)
return '{"result": "ok"}';
else
@@ -1013,40 +981,23 @@ class BlockLayered extends Module
$cursor = 0;
if ($full)
- if (version_compare(_PS_VERSION_,'1.5','>'))
$query = '
SELECT p.`id_product`
FROM `'._DB_PREFIX_.'product` p
INNER JOIN `'._DB_PREFIX_.'product_shop` ps
- ON (ps.`id_product` = p.`id_product` AND ps.`active` = 1)
- GROUP BY p.`id_product`
- ORDER BY p.`id_product` LIMIT '.(int)$cursor.','.(int)$length;
- else
- $query = '
- SELECT p.`id_product`
- FROM `'._DB_PREFIX_.'product` p
- WHERE `active` = 1
+ ON (ps.`id_product` = p.`id_product` AND ps.`active` = 1 AND ps.`visibility` IN ("both", "catalog"))
GROUP BY p.`id_product`
ORDER BY p.`id_product` LIMIT '.(int)$cursor.','.(int)$length;
else
- if (version_compare(_PS_VERSION_,'1.5','>'))
$query = '
SELECT p.`id_product`
FROM `'._DB_PREFIX_.'product` p
INNER JOIN `'._DB_PREFIX_.'product_shop` ps
- ON (ps.`id_product` = p.`id_product` AND ps.`active` = 1)
+ ON (ps.`id_product` = p.`id_product` AND ps.`active` = 1 AND ps.`visibility` IN ("both", "catalog"))
LEFT JOIN `'._DB_PREFIX_.'layered_price_index` psi ON (psi.id_product = p.id_product)
WHERE psi.id_product IS NULL
GROUP BY p.`id_product`
ORDER BY p.`id_product` LIMIT 0,'.(int)$length;
- else
- $query = '
- SELECT p.`id_product`
- FROM `'._DB_PREFIX_.'product` p
- LEFT JOIN `'._DB_PREFIX_.'layered_price_index` psi ON (psi.id_product = p.id_product)
- WHERE `active` = 1 AND psi.id_product IS NULL
- GROUP BY p.`id_product`
- ORDER BY p.`id_product` LIMIT 0,'.(int)$length;
foreach (Db::getInstance()->executeS($query) as $product)
self::indexProductPrices((int)$product['id_product'], ($smart && $full));
@@ -1065,24 +1016,15 @@ class BlockLayered extends Module
$groups = array();
}
- $shop_list = array();
- if (version_compare(_PS_VERSION_,'1.5','>'))
- $shop_list = Shop::getShops(false, null, true);
- else
- $shop_list[] = 0;
+ $shop_list = Shop::getShops(false, null, true);
foreach ($shop_list as $id_shop)
{
static $currency_list = null;
if (is_null($currency_list))
- {
- if (version_compare(_PS_VERSION_,'1.5','>'))
- $currency_list = Currency::getCurrencies(false, 1, new Shop($id_shop));
- else
- $currency_list = Currency::getCurrencies(false, 1);
- }
-
+ $currency_list = Currency::getCurrencies(false, 1, new Shop($id_shop));
+
$min_price = array();
$max_price = array();
@@ -1090,26 +1032,14 @@ class BlockLayered extends Module
Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'layered_price_index` WHERE `id_product` = '.(int)$id_product.' AND `id_shop` = '.(int)$id_shop);
if (Configuration::get('PS_LAYERED_FILTER_PRICE_USETAX'))
- {
- if (version_compare(_PS_VERSION_,'1.5','>'))
- $max_tax_rate = Db::getInstance()->getValue('
- SELECT max(t.rate) max_rate
- FROM `'._DB_PREFIX_.'product_shop` p
- LEFT JOIN `'._DB_PREFIX_.'tax_rules_group` trg ON (trg.id_tax_rules_group = p.id_tax_rules_group AND p.id_shop = '.(int)$shop_list.')
- LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr ON (tr.id_tax_rules_group = trg.id_tax_rules_group)
- LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.id_tax = tr.id_tax AND t.active = 1)
- WHERE id_product = '.(int)$id_product.'
- GROUP BY id_product');
- else
- $max_tax_rate = Db::getInstance()->getValue('
- SELECT max(t.rate) max_rate
- FROM `'._DB_PREFIX_.'product` p
- LEFT JOIN `'._DB_PREFIX_.'tax_rules_group` trg ON (trg.id_tax_rules_group = p.id_tax_rules_group)
- LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr ON (tr.id_tax_rules_group = trg.id_tax_rules_group)
- LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.id_tax = tr.id_tax AND t.active = 1)
- WHERE id_product = '.(int)$id_product.'
- GROUP BY id_product');
- }
+ $max_tax_rate = Db::getInstance()->getValue('
+ SELECT max(t.rate) max_rate
+ FROM `'._DB_PREFIX_.'product_shop` p
+ LEFT JOIN `'._DB_PREFIX_.'tax_rules_group` trg ON (trg.id_tax_rules_group = p.id_tax_rules_group AND p.id_shop = '.(int)$shop_list.')
+ LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr ON (tr.id_tax_rules_group = trg.id_tax_rules_group)
+ LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.id_tax = tr.id_tax AND t.active = 1)
+ WHERE id_product = '.(int)$id_product.'
+ GROUP BY id_product');
else
$max_tax_rate = 0;
@@ -1240,10 +1170,7 @@ class BlockLayered extends Module
// Title attributes (ex: /, )
$description = strtolower(rtrim(substr($description, 0, -2)));
// kewords attributes (ex: , , )
- if (version_compare(_PS_VERSION_, '1.5', '>'))
- $category_metas = Meta::getMetaTags($id_lang, 'category', $title);
- else
- $category_metas = Tools::getMetaTags($id_lang, '', $title);
+ $category_metas = Meta::getMetaTags($id_lang, 'category', $title);
if (!empty($title))
{
@@ -1257,22 +1184,12 @@ class BlockLayered extends Module
if (!empty($keywords))
$smarty->assign('meta_keywords', rtrim($category_title.', '.$keywords.', '.$category_metas['meta_keywords'], ', '));
- if (version_compare(_PS_VERSION_, '1.5', '>'))
- {
- $this->context->controller->addJS(($this->_path).'blocklayered.js');
- $this->context->controller->addJS(_PS_JS_DIR_.'jquery/jquery-ui-1.8.10.custom.min.js');
- $this->context->controller->addJQueryUI('ui.slider');
- $this->context->controller->addCSS(($this->_path).'blocklayered-15.css', 'all');
- $this->context->controller->addJQueryPlugin('scrollTo');
- }
- else
- {
- Tools::addJS(($this->_path).'blocklayered.js');
- Tools::addJS(_PS_JS_DIR_.'jquery/jquery-ui-1.8.10.custom.min.js');
- Tools::addCSS(_PS_CSS_DIR_.'jquery-ui-1.8.10.custom.css', 'all');
- Tools::addCSS(($this->_path).'blocklayered.css', 'all');
- Tools::addJS(_PS_JS_DIR_.'jquery/jquery.scrollTo-1.4.2-min.js');
- }
+
+ $this->context->controller->addJS(($this->_path).'blocklayered.js');
+ $this->context->controller->addJS(_PS_JS_DIR_.'jquery/jquery-ui-1.8.10.custom.min.js');
+ $this->context->controller->addJQueryUI('ui.slider');
+ $this->context->controller->addCSS(($this->_path).'blocklayered-15.css', 'all');
+ $this->context->controller->addJQueryPlugin('scrollTo');
$filters = $this->getSelectedFilters();
@@ -1352,8 +1269,7 @@ class BlockLayered extends Module
if ($filter_block['nbr_filterBlocks'] == 0)
return false;
- if (basename($_SERVER['PHP_SELF']) == 'category.php' && version_compare(_PS_VERSION_, '1.5', '<')
- || version_compare(_PS_VERSION_, '1.5', '>') && Dispatcher::getInstance()->getController() == 'category')
+ if (Dispatcher::getInstance()->getController() == 'category')
return '
-
-
{if isset($filter.is_color_group) && $filter.is_color_group}
-
{if isset($filter.is_color_group) && $filter.is_color_group}
-
blocklayered
- 1
diff --git a/modules/blockmanufacturer/config.xml b/modules/blockmanufacturer/config.xml
index 4912655e5..666c6ee0c 100755
--- a/modules/blockmanufacturer/config.xml
+++ b/modules/blockmanufacturer/config.xml
@@ -1,9 +1,9 @@
blockmanufacturer
- 1
diff --git a/modules/blockmyaccountfooter/blockmyaccount.css b/modules/blockmyaccountfooter/blockmyaccount.css
index 0d416fbcf..38720d562 100644
--- a/modules/blockmyaccountfooter/blockmyaccount.css
+++ b/modules/blockmyaccountfooter/blockmyaccount.css
@@ -1,6 +1,7 @@
/* block myaccount */
-.myaccount ul {margin-bottom:10px}
-.myaccount li {border-bottom: 1px solid #eee}
+.myaccount ul {margin-bottom:10px;}
+.myaccount .bullet .icon {display: none;}
+.myaccount li {border-bottom: 1px solid #eee;}
.myaccount li a {
display: block;
padding: 7px 11px 5px 22px;
@@ -10,16 +11,14 @@
.myaccount p.logout {
padding-bottom:0;
font-weight:bold;
- text-align:right
+ text-align:right;
}
-
-
/* block myaccount in footer */
#footer .myaccount .title_block, #footer .myaccount h4 {background: none;}
#footer .myaccount .logout {display:none;}
#footer .myaccount .title_block, #footer .myaccount h4 {
padding:0 0 10px 0;
- background:none
+ background:none;
}
#footer .myaccount ul {margin-bottom:0}
#footer .myaccount li {border-bottom:none}
@@ -27,7 +26,6 @@
display: block;
padding:0;
color: #fff;
- background: none
-}
-#footer .myaccount li.lnk_wishlist img {display:none
+ background: none;
}
+#footer .myaccount li.lnk_wishlist img {display:none;}
\ No newline at end of file
diff --git a/modules/blocknewproducts/blocknewproducts.php b/modules/blocknewproducts/blocknewproducts.php
index d5ca90eda..ae04a77ee 100644
--- a/modules/blocknewproducts/blocknewproducts.php
+++ b/modules/blocknewproducts/blocknewproducts.php
@@ -111,7 +111,10 @@ class BlockNewProducts extends Module
{
if (!$this->isCached('blocknewproducts.tpl', $this->getCacheId()))
{
- if (!Configuration::get('PS_BLOCK_NEWPRODUCTS_DISPLAY') && !($newProducts = Product::getNewProducts((int)$params['cookie']->id_lang, 0, (int)Configuration::get('NEW_PRODUCTS_NBR'))))
+ if (!Configuration::get('PS_BLOCK_NEWPRODUCTS_DISPLAY'))
+ return;
+ $newProducts = Product::getNewProducts((int) $params['cookie']->id_lang, 0, (int) Configuration::get('NEW_PRODUCTS_NBR'));
+ if (!$newProducts)
return;
$this->smarty->assign(array(
@@ -151,4 +154,4 @@ class BlockNewProducts extends Module
{
$this->_clearCache('blocknewproducts.tpl');
}
-}
\ No newline at end of file
+}
diff --git a/modules/blocknewsletter/config.xml b/modules/blocknewsletter/config.xml
index 15b6e2ed3..8b72918bf 100755
--- a/modules/blocknewsletter/config.xml
+++ b/modules/blocknewsletter/config.xml
@@ -1,12 +1,12 @@
blocknewsletter
- Êtes-vous sûr de vouloir supprimer tous vos contacts ?
+ Are you sure that you want to delete all of your contacts?
1
0
blockrss
- 1
diff --git a/modules/blocksearch/blocksearch.php b/modules/blocksearch/blocksearch.php
index 48d1a70c1..0d8ffbb8a 100644
--- a/modules/blocksearch/blocksearch.php
+++ b/modules/blocksearch/blocksearch.php
@@ -80,23 +80,24 @@ public function hookDisplayMobileHeader($params)
public function hookRightColumn($params)
{
- if (!$this->isCached('blocksearch.tpl', $this->getCacheId()))
+
+ if (Tools::getValue('search_query') || !$this->isCached('blocksearch.tpl', $this->getCacheId()))
{
$this->calculHookCommon($params);
$this->smarty->assign('blocksearch_type', 'block');
}
- return $this->display(__FILE__, 'blocksearch.tpl', $this->getCacheId());
+ return $this->display(__FILE__, 'blocksearch.tpl', Tools::getValue('search_query') ? null : $this->getCacheId());
}
public function hookTop($params)
{
- if (!$this->isCached('blocksearch-top.tpl', $this->getCacheId('blocksearch-top')))
+ if (Tools::getValue('search_query') || !$this->isCached('blocksearch-top.tpl', $this->getCacheId('blocksearch-top')))
{
$this->calculHookCommon($params);
$this->smarty->assign('blocksearch_type', 'top');
}
- return $this->display(__FILE__, 'blocksearch-top.tpl', $this->getCacheId('blocksearch-top'));
+ return $this->display(__FILE__, 'blocksearch-top.tpl', Tools::getValue('search_query') ? null : $this->getCacheId('blocksearch-top'));
}
/**
diff --git a/modules/blocksearch/blocksearch.tpl b/modules/blocksearch/blocksearch.tpl
index 0f4d185f3..d4dac74b7 100644
--- a/modules/blocksearch/blocksearch.tpl
+++ b/modules/blocksearch/blocksearch.tpl
@@ -29,8 +29,8 @@
+
+
+ 
+ 
+
+ {/foreach}
+