{/if}
diff --git a/classes/Address.php b/classes/Address.php
index 01a227232..cb1fef134 100644
--- a/classes/Address.php
+++ b/classes/Address.php
@@ -222,7 +222,7 @@ class AddressCore extends ObjectModel
public function validateController($htmlentities = true)
{
$errors = parent::validateController($htmlentities);
- if (!Configuration::get('VATNUMBER_CHECKING'))
+ if (!Configuration::get('VATNUMBER_MANAGEMENT') || !Configuration::get('VATNUMBER_CHECKING'))
return $errors;
include_once(_PS_MODULE_DIR_.'vatnumber/vatnumber.php');
if (class_exists('VatNumber', false))
diff --git a/classes/CartRule.php b/classes/CartRule.php
index e32bd3451..ab5cef179 100644
--- a/classes/CartRule.php
+++ b/classes/CartRule.php
@@ -637,7 +637,8 @@ class CartRuleCore extends ObjectModel
FROM `'._DB_PREFIX_.'cart_product` cp
LEFT JOIN `'._DB_PREFIX_.'category_product` catp ON cp.id_product = catp.id_product
WHERE cp.`id_cart` = '.(int)$context->cart->id.'
- AND cp.`id_product` IN ('.implode(array_map('intval', $eligibleProductsList), ',').')');
+ AND cp.`id_product` IN ('.implode(array_map('intval', $eligibleProductsList), ',').')
+ AND cp.`id_product` <> '.(int)$this->gift_product);
$countMatchingProducts = 0;
$matchingProductsList = array();
foreach ($cartCategories as $cartCategory)
diff --git a/classes/Product.php b/classes/Product.php
index 1354df139..28189ded4 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -4565,6 +4565,7 @@ class ProductCore extends ObjectModel
*/
public function setWsAccessories($accessories)
{
+ $this->deleteAccessories();
foreach ($accessories as $accessory)
Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'accessory` (`id_product_1`, `id_product_2`) VALUES ('.(int)$this->id.', '.(int)$accessory['id'].')');
diff --git a/classes/Tools.php b/classes/Tools.php
index 8e6c617b4..39027ed14 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -1855,8 +1855,8 @@ exit;
{
$backtrace = debug_backtrace();
$callee = next($backtrace);
- $error = 'Parameter '.$parameter.' in function '.(isset($callee['function']) ? $callee['function'] : '').'() is deprecated in '.$callee['file'].' on line '.(isset($callee['Line']) ? $callee['Line'] : '').' ';
- $message = 'The parameter '.$parameter.' in function '.$callee['function'].' (Line '.$callee['Line'].') is deprecated and will be removed in the next major version.';
+ $error = 'Parameter '.$parameter.' in function '.(isset($callee['function']) ? $callee['function'] : '').'() is deprecated in '.$callee['file'].' on line '.(isset($callee['line']) ? $callee['line'] : '(undefined)').' ';
+ $message = 'The parameter '.$parameter.' in function '.$callee['function'].' (Line '.(isset($callee['line']) ? $callee['line'] : 'undefined').') is deprecated and will be removed in the next major version.';
$class = isset($callee['class']) ? $callee['class'] : null;
Tools::throwDeprecated($error, $message, $class);
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 31197e90d..6b6bb7bde 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1336,11 +1336,13 @@ class AdminControllerCore extends Controller
foreach ($sub_tabs as $index2 => $sub_tab)
{
// class_name is the name of the class controller
- if (Tab::checkTabRights($sub_tab['id_tab']) === true
- && (bool)$sub_tab['active'])
+ if (Tab::checkTabRights($sub_tab['id_tab']) === true && (bool)$sub_tab['active'])
+ {
$sub_tabs[$index2]['href'] = $this->context->link->getAdminLink($sub_tab['class_name']);
+ $sub_tabs[$index2]['current'] = ($sub_tab['class_name'].'Controller' == get_class($this));
+ }
else
- unset($sub_tabs[$index2]);
+ unset($sub_tabs[$index2]);
}
$tabs[$index]['sub_tabs'] = $sub_tabs;
diff --git a/controllers/admin/AdminAccessController.php b/controllers/admin/AdminAccessController.php
index a3f79ab4b..543a3b5d2 100644
--- a/controllers/admin/AdminAccessController.php
+++ b/controllers/admin/AdminAccessController.php
@@ -153,35 +153,32 @@ class AdminAccessControllerCore extends AdminController
$join = 'LEFT JOIN `'._DB_PREFIX_.'tab` t ON (t.`id_tab` = a.`id_tab`)';
}
- if ($id_tab == -1 && $perm == 'all' && $enabled == 0)
- $sql = '
- UPDATE `'._DB_PREFIX_.'access` a
- SET `view` = '.(int)$enabled.', `add` = '.(int)$enabled.', `edit` = '.(int)$enabled.', `delete` = '.(int)$enabled.'
- WHERE `id_profile` = '.(int)$id_profile.' AND `id_tab` != '.(int)$this->id_tab_access;
- else if ($id_tab == -1 && $perm == 'all')
- $sql = '
+ if ($id_tab == -1)
+ {
+ if ($perm == 'all')
+ $sql = '
UPDATE `'._DB_PREFIX_.'access` a
SET `view` = '.(int)$enabled.', `add` = '.(int)$enabled.', `edit` = '.(int)$enabled.', `delete` = '.(int)$enabled.'
WHERE `id_profile` = '.(int)$id_profile;
- else if ($id_tab == -1)
- $sql = '
+ else
+ $sql = '
UPDATE `'._DB_PREFIX_.'access` a
SET `'.bqSQL($perm).'` = '.(int)$enabled.'
WHERE `id_profile` = '.(int)$id_profile;
- else if ($perm == 'all')
- $sql = '
- UPDATE `'._DB_PREFIX_.'access` a
- '.$join.'
- SET `view` = '.(int)$enabled.', `add` = '.(int)$enabled.', `edit` = '.(int)$enabled.', `delete` = '.(int)$enabled.'
- WHERE '.$where.' = '.(int)$id_tab.'
- AND `id_profile` = '.(int)$id_profile;
+ }
else
- $sql = '
- UPDATE `'._DB_PREFIX_.'access` a
- '.$join.'
+ {
+ if ($perm == 'all')
+ $sql = '
+ UPDATE `'._DB_PREFIX_.'access` a '.$join.'
+ SET `view` = '.(int)$enabled.', `add` = '.(int)$enabled.', `edit` = '.(int)$enabled.', `delete` = '.(int)$enabled.'
+ WHERE '.$where.' = '.(int)$id_tab.' AND `id_profile` = '.(int)$id_profile;
+ else
+ $sql = '
+ UPDATE `'._DB_PREFIX_.'access` a '.$join.'
SET `'.bqSQL($perm).'` = '.(int)$enabled.'
- WHERE '.$where.' = '.(int)$id_tab.'
- AND `id_profile` = '.(int)$id_profile;
+ WHERE '.$where.' = '.(int)$id_tab.' AND `id_profile` = '.(int)$id_profile;
+ }
$res = Db::getInstance()->execute($sql) ? 'ok' : 'error';
diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index e8ee17cef..b4c5bf35c 100755
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -273,15 +273,15 @@ class AdminCartsControllerCore extends AdminController
$field_id = 'customization_'.$id_product.'_'.$customization_field['id_customization_field'];
if ($customization_field['type'] == Product::CUSTOMIZE_TEXTFIELD)
{
- if (!isset($_POST[$field_id]) || empty($_POST[$field_id]))
+ if (!Tools::getValue($field_id))
{
if ($customization_field['required'])
$errors[] = Tools::displayError('Please fill in all the required fields.');
continue;
}
- if (!Validate::isMessage($_POST[$field_id]) || empty($_POST[$field_id]))
+ if (!Validate::isMessage(Tools::getValue($field_id)))
$errors[] = Tools::displayError('Invalid message');
- $this->context->cart->addTextFieldToProduct((int)$product->id, (int)$customization_field['id_customization_field'], Product::CUSTOMIZE_TEXTFIELD, $_POST[$field_id]);
+ $this->context->cart->addTextFieldToProduct((int)$product->id, (int)$customization_field['id_customization_field'], Product::CUSTOMIZE_TEXTFIELD, Tools::getValue($field_id));
}
elseif ($customization_field['type'] == Product::CUSTOMIZE_FILE)
{
diff --git a/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php
index cc6ed3882..697d5dedb 100644
--- a/controllers/admin/AdminCustomerThreadsController.php
+++ b/controllers/admin/AdminCustomerThreadsController.php
@@ -549,7 +549,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
$orders_ok[] = $order;
$total_ok += $order['total_paid_real'];
}
- $orders[$key]['date_add'] = Tools::displayDate($order['date_add'], $this->context->language->id);
+ $orders[$key]['date_add'] = Tools::displayDate($order['date_add']);
$orders[$key]['total_paid_real'] = Tools::displayPrice($order['total_paid_real'], new Currency((int)$order['id_currency']));
}
}
@@ -557,7 +557,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
$products = $customer->getBoughtProducts();
if ($products && count($products))
foreach ($products as $key => $product)
- $products[$key]['date_add'] = Tools::displayDate($product['date_add'],null , true);
+ $products[$key]['date_add'] = Tools::displayDate($product['date_add'], null, true);
}
foreach ($messages as $key => $message)
@@ -595,7 +595,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
if (!empty($message['id_product']) && empty($message['employee_name']))
$id_order_product = Order::getIdOrderProduct((int)$message['id_customer'], (int)$message['id_product']);
}
- $message['date_add'] = Tools::displayDate($message['date_add'],null , true);
+ $message['date_add'] = Tools::displayDate($message['date_add'], null, true);
$message['user_agent'] = strip_tags($message['user_agent']);
$message['message'] = preg_replace(
'/(https?:\/\/[a-z0-9#%&_=\(\)\.\? \+\-@\/]{6,1000})([\s\n<])/Uui',
diff --git a/controllers/admin/AdminEmailsController.php b/controllers/admin/AdminEmailsController.php
index a0c26e124..1e1394b9f 100644
--- a/controllers/admin/AdminEmailsController.php
+++ b/controllers/admin/AdminEmailsController.php
@@ -165,6 +165,15 @@ class AdminEmailsControllerCore extends AdminController
);
}
+ public function updateOptionPsMailPasswd($value)
+ {
+ if (Tools::getValue('PS_MAIL_PASSWD') == '' && Configuration::get('PS_MAIL_PASSWD'))
+ return true;
+ else
+ Configuration::updateValue('PS_MAIL_PASSWD', Tools::getValue('PS_MAIL_PASSWD'));
+ }
+
+
/**
* AdminController::initContent() override
* @see AdminController::initContent()
diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php
index ebdef6a4a..3c09f4cf1 100644
--- a/controllers/admin/AdminEmployeesController.php
+++ b/controllers/admin/AdminEmployeesController.php
@@ -297,7 +297,7 @@ class AdminEmployeesControllerCore extends AdminController
}
$this->fields_form['input'][] = array(
'type' => 'select',
- 'label' => $this->l('Profile:'),
+ 'label' => $this->l('Profile Permission:'),
'name' => 'id_profile',
'required' => true,
'options' => array(
diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php
index 38ecea2e4..22694773d 100644
--- a/controllers/admin/AdminImagesController.php
+++ b/controllers/admin/AdminImagesController.php
@@ -53,7 +53,7 @@ class AdminImagesControllerCore extends AdminController
);
// No need to display the old image system if the install has been made later than 2013-03-26
- $this->display_move = (defined('_PS_CREATION_DATE_') && strtotime(_PS_CREATION_DATE_) > strtotime('2013-03-26')) ? false : true;
+ $this->display_move = (!Configuration::get('PS_LEGACY_IMAGES') && defined('_PS_CREATION_DATE_') && strtotime(_PS_CREATION_DATE_) > strtotime('2013-03-26')) ? false : true;
$this->fields_options = array(
'images' => array(
@@ -62,7 +62,7 @@ class AdminImagesControllerCore extends AdminController
'top' => '',
'bottom' => '',
'description' => $this->l('JPEG images have a small file size and standard quality. PNG images have a larger file size, a higher quality and support transparency. Note that in all cases the image files will have the .jpg extension.').'
-
'.$this->l('WARNING: This feature may not be compatible with your theme, or with some of your modules. In particular, PNG mode is not compatible with the Watermark module. If you encounter any issues, turn it off by selecting "Use JPEG".'),
+
'.$this->l('WARNING: This feature may not be compatible with your theme, or with some of your modules. In particular, PNG mode is not compatible with the Watermark module. If you encounter any issues, turn it off by selecting "Use JPEG".'),
'fields' => array(
'PS_IMAGE_QUALITY' => array(
'title' => $this->l('Image quality'),
diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php
index 80d6fc516..550179b1d 100644
--- a/controllers/admin/AdminManufacturersController.php
+++ b/controllers/admin/AdminManufacturersController.php
@@ -440,6 +440,7 @@ class AdminManufacturersControllerCore extends AdminController
'type' => 'text',
'label' => $this->l('Zip Code/Postal Code'),
'name' => 'postcode',
+ 'required' => true,
'size' => 33,
'required' => false,
);
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index d9704a34d..8f980e828 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -1048,16 +1048,17 @@ class AdminOrdersControllerCore extends AdminController
}
$cart_rules = array();
+ $discount_value = (float)str_replace(',', '.', Tools::getValue('discount_value'));
switch (Tools::getValue('discount_type'))
{
// Percent type
case 1:
- if (Tools::getValue('discount_value') < 100)
+ if ($discount_value < 100)
{
if (isset($order_invoice))
{
- $cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round($order_invoice->total_paid_tax_incl * Tools::getValue('discount_value') / 100, 2);
- $cart_rules[$order_invoice->id]['value_tax_excl'] = Tools::ps_round($order_invoice->total_paid_tax_excl * Tools::getValue('discount_value') / 100, 2);
+ $cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round($order_invoice->total_paid_tax_incl * $discount_value / 100, 2);
+ $cart_rules[$order_invoice->id]['value_tax_excl'] = Tools::ps_round($order_invoice->total_paid_tax_excl * $discount_value / 100, 2);
// Update OrderInvoice
$this->applyDiscountOnInvoice($order_invoice, $cart_rules[$order_invoice->id]['value_tax_incl'], $cart_rules[$order_invoice->id]['value_tax_excl']);
@@ -1067,8 +1068,8 @@ class AdminOrdersControllerCore extends AdminController
$order_invoices_collection = $order->getInvoicesCollection();
foreach ($order_invoices_collection as $order_invoice)
{
- $cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round($order_invoice->total_paid_tax_incl * Tools::getValue('discount_value') / 100, 2);
- $cart_rules[$order_invoice->id]['value_tax_excl'] = Tools::ps_round($order_invoice->total_paid_tax_excl * Tools::getValue('discount_value') / 100, 2);
+ $cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round($order_invoice->total_paid_tax_incl * $discount_value / 100, 2);
+ $cart_rules[$order_invoice->id]['value_tax_excl'] = Tools::ps_round($order_invoice->total_paid_tax_excl * $discount_value / 100, 2);
// Update OrderInvoice
$this->applyDiscountOnInvoice($order_invoice, $cart_rules[$order_invoice->id]['value_tax_incl'], $cart_rules[$order_invoice->id]['value_tax_excl']);
@@ -1076,8 +1077,8 @@ class AdminOrdersControllerCore extends AdminController
}
else
{
- $cart_rules[0]['value_tax_incl'] = Tools::ps_round($order->total_paid_tax_incl * Tools::getValue('discount_value') / 100, 2);
- $cart_rules[0]['value_tax_excl'] = Tools::ps_round($order->total_paid_tax_excl * Tools::getValue('discount_value') / 100, 2);
+ $cart_rules[0]['value_tax_incl'] = Tools::ps_round($order->total_paid_tax_incl * $discount_value / 100, 2);
+ $cart_rules[0]['value_tax_excl'] = Tools::ps_round($order->total_paid_tax_excl * $discount_value / 100, 2);
}
}
else
@@ -1087,12 +1088,12 @@ class AdminOrdersControllerCore extends AdminController
case 2:
if (isset($order_invoice))
{
- if (Tools::getValue('discount_value') > $order_invoice->total_paid_tax_incl)
+ if ($discount_value > $order_invoice->total_paid_tax_incl)
$this->errors[] = Tools::displayError('The discount value is greater than the order invoice total.');
else
{
- $cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round(Tools::getValue('discount_value'), 2);
- $cart_rules[$order_invoice->id]['value_tax_excl'] = Tools::ps_round(Tools::getValue('discount_value') / (1 + ($order->getTaxesAverageUsed() / 100)), 2);
+ $cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round($discount_value, 2);
+ $cart_rules[$order_invoice->id]['value_tax_excl'] = Tools::ps_round($discount_value / (1 + ($order->getTaxesAverageUsed() / 100)), 2);
// Update OrderInvoice
$this->applyDiscountOnInvoice($order_invoice, $cart_rules[$order_invoice->id]['value_tax_incl'], $cart_rules[$order_invoice->id]['value_tax_excl']);
@@ -1103,12 +1104,12 @@ class AdminOrdersControllerCore extends AdminController
$order_invoices_collection = $order->getInvoicesCollection();
foreach ($order_invoices_collection as $order_invoice)
{
- if (Tools::getValue('discount_value') > $order_invoice->total_paid_tax_incl)
+ if ($discount_value > $order_invoice->total_paid_tax_incl)
$this->errors[] = Tools::displayError('The discount value is greater than the order invoice total.').$order_invoice->getInvoiceNumberFormatted(Context::getContext()->language->id, (int)$order->id_shop).')';
else
{
- $cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round(Tools::getValue('discount_value'), 2);
- $cart_rules[$order_invoice->id]['value_tax_excl'] = Tools::ps_round(Tools::getValue('discount_value') / (1 + ($order->getTaxesAverageUsed() / 100)), 2);
+ $cart_rules[$order_invoice->id]['value_tax_incl'] = Tools::ps_round($discount_value, 2);
+ $cart_rules[$order_invoice->id]['value_tax_excl'] = Tools::ps_round($discount_value / (1 + ($order->getTaxesAverageUsed() / 100)), 2);
// Update OrderInvoice
$this->applyDiscountOnInvoice($order_invoice, $cart_rules[$order_invoice->id]['value_tax_incl'], $cart_rules[$order_invoice->id]['value_tax_excl']);
@@ -1117,12 +1118,12 @@ class AdminOrdersControllerCore extends AdminController
}
else
{
- if (Tools::getValue('discount_value') > $order->total_paid_tax_incl)
+ if ($discount_value > $order->total_paid_tax_incl)
$this->errors[] = Tools::displayError('The discount value is greater than the order total.');
else
{
- $cart_rules[0]['value_tax_incl'] = Tools::ps_round(Tools::getValue('discount_value'), 2);
- $cart_rules[0]['value_tax_excl'] = Tools::ps_round(Tools::getValue('discount_value') / (1 + ($order->getTaxesAverageUsed() / 100)), 2);
+ $cart_rules[0]['value_tax_incl'] = Tools::ps_round($discount_value, 2);
+ $cart_rules[0]['value_tax_excl'] = Tools::ps_round($discount_value / (1 + ($order->getTaxesAverageUsed() / 100)), 2);
}
}
break;
@@ -1173,7 +1174,7 @@ class AdminOrdersControllerCore extends AdminController
$cartRuleObj->quantity = 0;
$cartRuleObj->quantity_per_user = 1;
if (Tools::getValue('discount_type') == 1)
- $cartRuleObj->reduction_percent = Tools::getValue('discount_value');
+ $cartRuleObj->reduction_percent = $discount_value;
elseif (Tools::getValue('discount_type') == 2)
$cartRuleObj->reduction_amount = $cart_rule['value_tax_excl'];
elseif (Tools::getValue('discount_type') == 3)
diff --git a/controllers/admin/AdminTrackingController.php b/controllers/admin/AdminTrackingController.php
index 2ccb0c6ab..4510d998c 100644
--- a/controllers/admin/AdminTrackingController.php
+++ b/controllers/admin/AdminTrackingController.php
@@ -52,6 +52,9 @@ class AdminTrackingControllerCore extends AdminController
public function initContent()
{
+ if ($id_category = Tools::getValue('id_category') && Tools::getIsset('viewcategory'))
+ Tools::redirectAdmin($this->context->link->getAdminLink('AdminProducts').'&id_category='.(int)$id_category.'&viewcategory');
+
$this->_helper_list = new HelperList();
if (!Configuration::get('PS_STOCK_MANAGEMENT'))
@@ -151,8 +154,6 @@ class AdminTrackingControllerCore extends AdminController
$this->tpl_list_vars = array('sub_title' => $this->l('List of products with attributes but without available quantities for sale:'));
-
-
return $this->renderList();
}
diff --git a/controllers/front/NewProductsController.php b/controllers/front/NewProductsController.php
index 7cf283eba..a438c4826 100644
--- a/controllers/front/NewProductsController.php
+++ b/controllers/front/NewProductsController.php
@@ -47,6 +47,13 @@ class NewProductsControllerCore extends FrontController
$this->productSort();
+ // Override default configuration values: cause the new products page must display latest products first.
+ if (!Tools::getIsset('orderway') || !Tools::getIsset('orderby'))
+ {
+ $this->orderBy = 'date_add';
+ $this->orderWay = 'DESC';
+ }
+
$nbProducts = (int)Product::getNewProducts(
$this->context->language->id,
(isset($this->p) ? (int)($this->p) - 1 : null),
diff --git a/install-dev/theme/views/footer.phtml b/install-dev/theme/views/footer.phtml
index 8e765ad3a..95b11994d 100644
--- a/install-dev/theme/views/footer.phtml
+++ b/install-dev/theme/views/footer.phtml
@@ -30,7 +30,13 @@
