V1.4.0 released: Upsell feature, New Product Page, New Stats Module, Security fixes

This commit is contained in:
Rohit Jain
2019-06-28 18:41:13 +05:30
parent 102343d2c0
commit b5d5bd7129
3884 changed files with 124528 additions and 70020 deletions

View File

@@ -1,6 +1,6 @@
<?php
/**
* 2007-2015 PrestaShop
* 2007-2017 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2015 PrestaShop SA
* @copyright 2007-2017 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
@@ -675,10 +675,18 @@ abstract class ObjectModelCore implements Core_Foundation_Database_EntityInterfa
// A little explanation of what we do here : we want to create multishop entry when update is called, but
// only if we are in a shop context (if we are in all context, we just want to update entries that alread exists)
$shop_exists = Db::getInstance()->getValue('SELECT '.$this->def['primary'].' FROM '._DB_PREFIX_.$this->def['table'].'_shop WHERE '.$where);
if ($shop_exists) {
$result &= Db::getInstance()->update($this->def['table'].'_shop', $fields, $where, 0, $null_values);
if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP) {
foreach ($fields as $key => $val) {
if (!array_key_exists($key, (array)$this->update_fields)) {
unset($fields[$key]);
}
}
}
$result &= Db::getInstance()->update($this->def['table'] . '_shop', $fields, $where, 0, $null_values);
} elseif (Shop::getContext() == Shop::CONTEXT_SHOP) {
$result &= Db::getInstance()->insert($this->def['table'].'_shop', $all_fields, $null_values);
$result &= Db::getInstance()->insert($this->def['table'] . '_shop', $all_fields, $null_values);
}
}
}
@@ -751,7 +759,7 @@ abstract class ObjectModelCore implements Core_Foundation_Database_EntityInterfa
// Remove association to multishop table
if (Shop::isTableAssociated($this->def['table'])) {
$id_shop_list = Shop::getContextListShopID();
if (count($this->id_shop_list) > 0) {
if (count($this->id_shop_list)) {
$id_shop_list = $this->id_shop_list;
}
@@ -899,7 +907,7 @@ abstract class ObjectModelCore implements Core_Foundation_Database_EntityInterfa
continue;
}
if (is_array($this->update_fields) && empty($this->update_fields[$field])) {
if (is_array($this->update_fields) && empty($this->update_fields[$field]) && isset($this->def['fields'][$field]['shop']) && $this->def['fields'][$field]['shop']) {
continue;
}
@@ -1146,7 +1154,6 @@ abstract class ObjectModelCore implements Core_Foundation_Database_EntityInterfa
// Checking for fields validity
// Hack for postcode required for country which does not have postcodes
if (!empty($value) || $value === '0' || ($field == 'postcode' && $value == '0')) {
$validation_error = false;
if (isset($data['validate'])) {
$data_validate = $data['validate'];