diff --git a/admin-dev/header.inc.php b/admin-dev/header.inc.php
index 9c41ecfd1..27d46babb 100644
--- a/admin-dev/header.inc.php
+++ b/admin-dev/header.inc.php
@@ -47,7 +47,7 @@ echo '
var helpboxes = '.Configuration::get('PS_HELPBOX').';
var roundMode = '.Configuration::get('PS_PRICE_ROUND_MODE').';
-
+
@@ -95,7 +95,7 @@ echo '
{
$("#orders_notif_number_wrapper").hide();
}
-
+
// Add customers notifications to the list
html = "";
nb_notifs = 0;
@@ -345,3 +345,4 @@ if (Shop::isFeatureActive())
Helper::renderShopList();
echo '';
}
+
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.js b/admin-dev/themes/default/template/controllers/cart_rules/form.js
index cb72e3ef0..76ed0084d 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/form.js
+++ b/admin-dev/themes/default/template/controllers/cart_rules/form.js
@@ -65,7 +65,7 @@ function removeProductRule(product_rule_group_id, product_rule_id)
function toggleCartRuleFilter(id)
{
- if ($(id).attr('checked'))
+ if ($(id).prop('checked'))
$('#' + $(id).attr('id') + '_div').show(400);
else
$('#' + $(id).attr('id') + '_div').hide(200);
@@ -110,7 +110,7 @@ function toggleApplyDiscount(percent, amount, apply_to)
if (percent)
{
$('#apply_discount_percent_div').show(400);
- if ($('#apply_discount_to_product').attr('checked'))
+ if ($('#apply_discount_to_product').prop('checked'))
toggleApplyDiscountTo();
$('#apply_discount_to_cheapest').show();
$('*[for=apply_discount_to_cheapest]').show();
@@ -126,7 +126,7 @@ function toggleApplyDiscount(percent, amount, apply_to)
if (amount)
{
$('#apply_discount_amount_div').show(400);
- if ($('#apply_discount_to_product').attr('checked'))
+ if ($('#apply_discount_to_product').prop('checked'))
toggleApplyDiscountTo();
$('#apply_discount_to_cheapest').hide();
$('*[for=apply_discount_to_cheapest]').hide();
@@ -152,24 +152,24 @@ function toggleApplyDiscount(percent, amount, apply_to)
function toggleApplyDiscountTo()
{
- if ($('#apply_discount_to_product').attr('checked'))
+ if ($('#apply_discount_to_product').prop('checked'))
$('#apply_discount_to_product_div').show(400);
else
{
$('#apply_discount_to_product_div').hide(200);
$('#reductionProductFilter').val('');
- if ($('#apply_discount_to_order').attr('checked'))
+ if ($('#apply_discount_to_order').prop('checked'))
$('#reduction_product').val('0');
- if ($('#apply_discount_to_cheapest').attr('checked'))
+ if ($('#apply_discount_to_cheapest').prop('checked'))
$('#reduction_product').val('-1');
- if ($('#apply_discount_to_selection').attr('checked'))
+ if ($('#apply_discount_to_selection').prop('checked'))
$('#reduction_product').val('-2');
}
}
function toggleGiftProduct()
{
- if ($('#free_gift_on').attr('checked'))
+ if ($('#free_gift_on').prop('checked'))
$('#free_gift_div').show(400);
else
{
@@ -180,31 +180,31 @@ function toggleGiftProduct()
}
$('#apply_discount_percent').click(function() {toggleApplyDiscount(true, false, true);});
-if ($('#apply_discount_percent').attr('checked'))
+if ($('#apply_discount_percent').prop('checked'))
toggleApplyDiscount(true, false, true);
$('#apply_discount_amount').click(function() {toggleApplyDiscount(false, true, true);});
-if ($('#apply_discount_amount').attr('checked'))
+if ($('#apply_discount_amount').prop('checked'))
toggleApplyDiscount(false, true, true);
$('#apply_discount_off').click(function() {toggleApplyDiscount(false, false, false);});
-if ($('#apply_discount_off').attr('checked'))
+if ($('#apply_discount_off').prop('checked'))
toggleApplyDiscount(false, false, false);
$('#apply_discount_to_order').click(function() {toggleApplyDiscountTo();});
-if ($('#apply_discount_to_order').attr('checked'))
+if ($('#apply_discount_to_order').prop('checked'))
toggleApplyDiscountTo();
$('#apply_discount_to_product').click(function() {toggleApplyDiscountTo();});
-if ($('#apply_discount_to_product').attr('checked'))
+if ($('#apply_discount_to_product').prop('checked'))
toggleApplyDiscountTo();
$('#apply_discount_to_cheapest').click(function() {toggleApplyDiscountTo();});
-if ($('#apply_discount_to_cheapest').attr('checked'))
+if ($('#apply_discount_to_cheapest').prop('checked'))
toggleApplyDiscountTo();
$('#apply_discount_to_selection').click(function() {toggleApplyDiscountTo();});
-if ($('#apply_discount_to_selection').attr('checked'))
+if ($('#apply_discount_to_selection').prop('checked'))
toggleApplyDiscountTo();
$('#free_gift_on').click(function() {toggleGiftProduct();});
diff --git a/admin-dev/themes/default/template/controllers/shop_group/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/shop_group/helpers/form/form.tpl
index 23b8716e4..0b315f33c 100644
--- a/admin-dev/themes/default/template/controllers/shop_group/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/shop_group/helpers/form/form.tpl
@@ -29,8 +29,8 @@
function toggleShareOrders() {
- var disabled_customer = ($('#share_customer_on').attr('checked')) ? false : true;
- var disabled_stock = ($('#share_stock_on').attr('checked')) ? false : true;
+ var disabled_customer = ($('#share_customer_on').prop('checked')) ? false : true;
+ var disabled_stock = ($('#share_stock_on').prop('checked')) ? false : true;
if (disabled_customer || disabled_stock)
{
diff --git a/admin-dev/themes/default/template/helpers/form/assoshop.tpl b/admin-dev/themes/default/template/helpers/form/assoshop.tpl
index 9b43ff3cd..9c33ce5ba 100644
--- a/admin-dev/themes/default/template/helpers/form/assoshop.tpl
+++ b/admin-dev/themes/default/template/helpers/form/assoshop.tpl
@@ -28,14 +28,14 @@
$().ready(function() {
// Click on "all shop"
$('.input_all_shop').live('click', function() {
- var checked = $(this).attr('checked');
+ var checked = $(this).prop('checked');
$('.input_shop_group:not(:disabled)').attr('checked', checked);
$('.input_shop:not(:disabled)').attr('checked', checked);
});
// Click on a group shop
$('.input_shop_group').live('click', function() {
- $('.input_shop[value='+$(this).val()+']').attr('checked', $(this).attr('checked'));
+ $('.input_shop[value='+$(this).val()+']').attr('checked', $(this).prop('checked'));
check_all_shop();
});
@@ -57,7 +57,7 @@ function check_shop_group_status(id_group) {
var total = 0;
$('.input_shop[value='+id_group+']').each(function(k, v) {
total++;
- if (!$(v).attr('checked'))
+ if (!$(v).prop('checked'))
groupChecked = false;
});
@@ -68,7 +68,7 @@ function check_shop_group_status(id_group) {
function check_all_shop() {
var allChecked = true;
$('.input_shop_group:not(:disabled)').each(function(k, v) {
- if (!$(v).attr('checked'))
+ if (!$(v).prop('checked'))
allChecked = false;
});
$('.input_all_shop').attr('checked', allChecked);
diff --git a/classes/AdminTab.php b/classes/AdminTab.php
index 89bdd8d6f..542bcf6b9 100644
--- a/classes/AdminTab.php
+++ b/classes/AdminTab.php
@@ -2333,7 +2333,7 @@ abstract class AdminTabCore
// Click on "all shop"
$('.input_all_shop').click(function()
{
- var checked = $(this).attr('checked');
+ var checked = $(this).prop('checked');
$('.input_shop_group').attr('checked', checked);
$('.input_shop').attr('checked', checked);
});
@@ -2341,7 +2341,7 @@ abstract class AdminTabCore
// Click on a group shop
$('.input_shop_group').click(function()
{
- $('.input_shop[value='+$(this).val()+']').attr('checked', $(this).attr('checked'));
+ $('.input_shop[value='+$(this).val()+']').attr('checked', $(this).prop('checked'));
check_all_shop();
});
@@ -2365,7 +2365,7 @@ abstract class AdminTabCore
var groupChecked = true;
$('.input_shop[value='+id_group+']').each(function(k, v)
{
- if (!$(v).attr('checked'))
+ if (!$(v).prop('checked'))
groupChecked = false;
});
$('.input_shop_group[value='+id_group+']').attr('checked', groupChecked);
@@ -2376,7 +2376,7 @@ abstract class AdminTabCore
var allChecked = true;
$('.input_shop_group').each(function(k, v)
{
- if (!$(v).attr('checked'))
+ if (!$(v).prop('checked'))
allChecked = false;
});
$('.input_all_shop').attr('checked', allChecked);
diff --git a/config/defines.inc.php b/config/defines.inc.php
index e61acc65c..62b6be2c5 100755
--- a/config/defines.inc.php
+++ b/config/defines.inc.php
@@ -38,12 +38,12 @@ if (!defined('PHP_VERSION_ID'))
}
/* Directories */
-define('_PS_ROOT_DIR_', realpath($currentDir.'/..'));
+define('_PS_ROOT_DIR_', realpath($currentDir.'/..'));
define('_PS_CLASS_DIR_', _PS_ROOT_DIR_.'/classes/');
define('_PS_CONTROLLER_DIR_', _PS_ROOT_DIR_.'/controllers/');
define('_PS_FRONT_CONTROLLER_DIR_', _PS_ROOT_DIR_.'/controllers/front/');
define('_PS_ADMIN_CONTROLLER_DIR_', _PS_ROOT_DIR_.'/controllers/admin/');
-define('_PS_TRANSLATIONS_DIR_', _PS_ROOT_DIR_.'/translations/');
+define('_PS_TRANSLATIONS_DIR_', _PS_ROOT_DIR_.'/translations/');
define('_PS_DOWNLOAD_DIR_', _PS_ROOT_DIR_.'/download/');
define('_PS_MAIL_DIR_', _PS_ROOT_DIR_.'/mails/');
define('_PS_PDF_DIR_', _PS_ROOT_DIR_.'/pdf/');
@@ -62,9 +62,9 @@ define('_PS_SUPP_IMG_DIR_', _PS_IMG_DIR_.'su/');
define('_PS_COL_IMG_DIR_', _PS_IMG_DIR_.'co/');
define('_PS_TMP_IMG_DIR_', _PS_IMG_DIR_.'tmp/');
define('_PS_UPLOAD_DIR_', _PS_ROOT_DIR_.'/upload/');
-define('_PS_TOOL_DIR_', _PS_ROOT_DIR_.'/tools/');
+define('_PS_TOOL_DIR_', _PS_ROOT_DIR_.'/tools/');
define('_PS_GEOIP_DIR_', _PS_TOOL_DIR_.'geoip/');
-define('_PS_SWIFT_DIR_', _PS_TOOL_DIR_.'swift/');
+define('_PS_SWIFT_DIR_', _PS_TOOL_DIR_.'swift/');
define('_PS_GENDERS_DIR_', _PS_IMG_DIR_.'genders/');
define('_PS_FPDF_PATH_', _PS_TOOL_DIR_.'fpdf/'); // @deprecated will be removed in 1.6
define('_PS_TCPDF_PATH_', _PS_TOOL_DIR_.'tcpdf/');
@@ -83,8 +83,8 @@ if (!defined('_PS_MAGIC_QUOTES_GPC_'))
define('_CAN_LOAD_FILES_', 1);
-/* Order states */
-// Order states has been moved in config.inc.php file for backward compatibility reasons
+/* Order states
+Order states has been moved in config.inc.php file for backward compatibility reasons */
/* Tax behavior */
define('PS_PRODUCT_TAX', 0);
@@ -146,5 +146,5 @@ define('_PS_SMARTY_CONSOLE_CLOSE_', 0);
define('_PS_SMARTY_CONSOLE_OPEN_BY_URL_', 1);
define('_PS_SMARTY_CONSOLE_OPEN_', 2);
-define('_PS_JQUERY_VERSION_', '1.4.4');
+define('_PS_JQUERY_VERSION_', '1.7.2');
diff --git a/install-dev/dev/index.phtml b/install-dev/dev/index.phtml
index 5731b7058..f7291ed00 100644
--- a/install-dev/dev/index.phtml
+++ b/install-dev/dev/index.phtml
@@ -24,15 +24,15 @@
$('.select_box input[type=checkbox]').click(function(e)
{
- select_entity($(this).attr('checked'), $(this).parent().parent());
+ select_entity($(this).prop('checked'), $(this).parent().parent());
e.stopImmediatePropagation();
});
$('.select_box').click(function()
{
var checkbox = $(this).find('input[type=checkbox]');
- checkbox.attr('checked', !checkbox.attr('checked'));
- select_entity(checkbox.attr('checked'), $(this).parent());
+ checkbox.attr('checked', !checkbox.prop('checked'));
+ select_entity(checkbox.prop('checked'), $(this).parent());
});
});
@@ -237,4 +237,5 @@