diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css
index b62cd34b2..a40b7e237 100644
--- a/admin-dev/themes/default/css/admin.css
+++ b/admin-dev/themes/default/css/admin.css
@@ -30,6 +30,7 @@ select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disab
/*BUTTON*/
.button{
+ cursor: pointer;
background: #e3e3e3 url('../img/bg-button-degrade.png') repeat-x scroll left top;
background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
@@ -673,4 +674,4 @@ ul.listForm li {padding-bottom:3px;}
/************** SCENE *****************/
-#large_scene_image{clear:both;border:1px solid transparent;}
\ No newline at end of file
+#large_scene_image{clear:both;border:1px solid transparent;}
diff --git a/admin-dev/themes/default/template/controllers/localization/content.tpl b/admin-dev/themes/default/template/controllers/localization/content.tpl
index 3fefc850d..4515293f5 100644
--- a/admin-dev/themes/default/template/controllers/localization/content.tpl
+++ b/admin-dev/themes/default/template/controllers/localization/content.tpl
@@ -24,9 +24,9 @@
*}
- {$localization_form}
+ {if isset($localization_form)}{$localization_form}{/if}
- {$localization_options}
+ {if isset($localization_options)}{$localization_options}{/if}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl
index 5fc5f3b05..bac61db89 100644
--- a/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl
@@ -30,9 +30,9 @@
function ajaxStoreStates(id_state_selected)
{
$.ajax({
- url: "ajax.php",
+ url: "index.php",
cache: false,
- data: "ajaxStates=1&id_country="+$('#PS_SHOP_COUNTRY_ID').val() + "&id_state=" + $('#PS_SHOP_STATE_ID').val(),
+ data: "ajax=1&tab=AdminStates&token={getAdminToken tab='AdminStates'}&action=states&id_country="+$('#PS_SHOP_COUNTRY_ID').val() + "&id_state=" + $('#PS_SHOP_STATE_ID').val(),
success: function(html)
{
if (html == 'false')
diff --git a/admin-dev/themes/default/template/controllers/tax_rules/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/tax_rules/helpers/form/form.tpl
index 9d925f503..a200c2207 100644
--- a/admin-dev/themes/default/template/controllers/tax_rules/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/tax_rules/helpers/form/form.tpl
@@ -62,7 +62,7 @@
$.ajax({
url: "index.php",
cache: false,
- data: "ajax=1&tab=AdminTaxRulesGroup&token={getAdminToken tab='AdminStates'}&action=states&id_country="+id_country+"&id_state="+id_state+"&empty_value={l s='All'}",
+ data: "ajax=1&tab=AdminStates&token={getAdminToken tab='AdminStates'}&action=states&id_country="+id_country+"&id_state="+id_state+"&empty_value={l s='All'}",
success: function(html){
if (html == "false")
{
diff --git a/classes/Autoload.php b/classes/Autoload.php
index 11436fda4..585ad858e 100644
--- a/classes/Autoload.php
+++ b/classes/Autoload.php
@@ -139,7 +139,7 @@ class Autoload
$filename_tmp = tempnam(dirname($filename), basename($filename.'.'));
if($filename_tmp !== FALSE and file_put_contents($filename_tmp, $content, LOCK_EX) !== FALSE)
{
- rename($filename_tmp, $filename);
+ @rename($filename_tmp, $filename);
@chmod($filename, 0664);
}
else
diff --git a/classes/Image.php b/classes/Image.php
index f2b749bf1..a5de0fb24 100644
--- a/classes/Image.php
+++ b/classes/Image.php
@@ -120,16 +120,22 @@ class ImageCore extends ObjectModel
*
* @param integer $id_lang Language ID
* @param integer $id_product Product ID
+ * @param integer $id_product_attribute Product Attribute ID
* @return array Images
*/
- public static function getImages($id_lang, $id_product)
+ public static function getImages($id_lang, $id_product, $id_product_attribute = NULL)
{
- return Db::getInstance()->executeS('
- SELECT *
- FROM `'._DB_PREFIX_.'image` i
- LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image`)
- WHERE i.`id_product` = '.(int)$id_product.' AND il.`id_lang` = '.(int)$id_lang.'
- ORDER BY i.`position` ASC');
+ $attribute_filter = ($id_product_attribute ? ' AND ai.`id_product_attribute` = '.(int)$id_product_attribute : '');
+ $sql = 'SELECT *
+ FROM `'._DB_PREFIX_.'image` i
+ LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image`)';
+
+ if ($id_product_attribute)
+ $sql .= ' LEFT JOIN `'._DB_PREFIX_.'product_attribute_image` ai ON (i.`id_image` = ai.`id_image`)';
+
+ $sql .= ' WHERE i.`id_product` = '.(int)$id_product.' AND il.`id_lang` = '.(int)$id_lang . $attribute_filter.'
+ ORDER BY i.`position` ASC';
+ return Db::getInstance()->executeS($sql);
}
/**
diff --git a/classes/Language.php b/classes/Language.php
index 724cbbb9b..8aa65596d 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -111,18 +111,22 @@ class LanguageCore extends ObjectModel
$iso_code = $newIso ? $newIso : $this->iso_code;
if (!file_exists(_PS_TRANSLATIONS_DIR_.$iso_code))
- mkdir(_PS_TRANSLATIONS_DIR_.$iso_code);
+ {
+ if (@mkdir(_PS_TRANSLATIONS_DIR_.$iso_code))
+ @chmod(_PS_TRANSLATIONS_DIR_.$iso_code, 0777);
+ }
+
foreach ($this->translationsFilesAndVars as $file => $var)
{
$path_file = _PS_TRANSLATIONS_DIR_.$iso_code.'/'.$file.'.php';
if (!file_exists($path_file))
if ($file != 'tabs')
- file_put_contents($path_file, '');
else
- file_put_contents($path_file, '');
@@ -460,7 +464,8 @@ class LanguageCore extends ObjectModel
}
closedir($handle);
}
- rmdir($dir);
+ if (is_writable($dir))
+ rmdir($dir);
}
public function delete()
@@ -783,13 +788,22 @@ class LanguageCore extends ObjectModel
$lang_pack_ok = false;
$errors = array();
$file = _PS_TRANSLATIONS_DIR_.$iso.'.gzip';
+
if (!$lang_pack_link = Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/get_language_pack.php?version='.$version.'&iso_lang='.Tools::strtolower($iso)))
$errors[] = Tools::displayError('Archive cannot be downloaded from prestashop.com.');
elseif (!$lang_pack = Tools::jsonDecode($lang_pack_link))
$errors[] = Tools::displayError('Error occurred when language was checked according to your Prestashop version.');
elseif ($content = Tools::file_get_contents('http://translations.prestashop.com/download/lang_packs/gzip/'.$lang_pack->version.'/'.Tools::strtolower($lang_pack->iso_code.'.gzip')))
if (!@file_put_contents($file, $content))
- $errors[] = Tools::displayError('Server does not have permissions for writing.');
+ {
+ if (is_writable(dirname($file)))
+ {
+ @unlink($file);
+ @file_put_contents($file, $content);
+ }
+ elseif (!is_writable($file))
+ $errors[] = Tools::displayError('Server does not have permissions for writing.').' ('.$file.')';
+ }
if (file_exists($file))
{
$gz = new Archive_Tar($file, true);
diff --git a/classes/Logger.php b/classes/Logger.php
index 0bc46bf16..ff7fb994d 100644
--- a/classes/Logger.php
+++ b/classes/Logger.php
@@ -149,6 +149,11 @@ class LoggerCore extends ObjectModel
return $this->hash;
}
+
+ public static function eraseAllLogs()
+ {
+ return Db::getInstance()->execute('TRUNCATE TABLE '._DB_PREFIX_.'log');
+ }
/**
* check if this log message already exists in database.
diff --git a/classes/Manufacturer.php b/classes/Manufacturer.php
index 8cc573bad..c40fa01c8 100644
--- a/classes/Manufacturer.php
+++ b/classes/Manufacturer.php
@@ -79,7 +79,7 @@ class ManufacturerCore extends ObjectModel
// Lang fields
'description' => array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml'),
- 'short_description' => array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml', 'size' => 254),
+ 'short_description' => array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml'),
'meta_title' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 128),
'meta_description' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 255),
'meta_keywords' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName'),
diff --git a/classes/Product.php b/classes/Product.php
index 74e65ee20..188ce4a05 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -2914,7 +2914,7 @@ class ProductCore extends ObjectModel
* @param Shop $shop
* @return string
*/
- public static function sqlStock($product_alias, $product_attribute = 0, $inner_join = false, Shop $shop = null)
+ public static function sqlStock($product_alias, $product_attribute = null, $inner_join = false, Shop $shop = null)
{
$id_shop = ($shop !== null ? (int)$shop->id : null);
$sql = (($inner_join) ? ' INNER ' : ' LEFT ').'
diff --git a/classes/Supplier.php b/classes/Supplier.php
index 7749fb6de..3130913c1 100644
--- a/classes/Supplier.php
+++ b/classes/Supplier.php
@@ -72,7 +72,7 @@ class SupplierCore extends ObjectModel
'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
// Lang fields
- 'description' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName'),
+ 'description' => array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml'),
'meta_title' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 128),
'meta_description' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 255),
'meta_keywords' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 255),
diff --git a/classes/cache/CacheApc.php b/classes/cache/CacheApc.php
index e32c04ad6..275bc8f4b 100644
--- a/classes/cache/CacheApc.php
+++ b/classes/cache/CacheApc.php
@@ -34,9 +34,12 @@ class CacheApcCore extends Cache
public function __construct()
{
$this->keys = array();
- $cache_info = apc_cache_info('user');
+ $cache_info = apc_cache_info((extension_loaded('apcu') === true )? '' : 'user' );
foreach ($cache_info['cache_list'] as $entry)
- $this->keys[$entry['info']] = $entry['ttl'];
+ if ( extension_loaded('apcu') === true )
+ $this->keys[$entry['key']] = $entry['ttl'];
+ else
+ $this->keys[$entry['info']] = $entry['ttl'];
}
/**
diff --git a/classes/cache/CacheMemcache.php b/classes/cache/CacheMemcache.php
index 046d40529..8c4445a7f 100755
--- a/classes/cache/CacheMemcache.php
+++ b/classes/cache/CacheMemcache.php
@@ -49,7 +49,7 @@ class CacheMemcacheCore extends Cache
if(is_array($servers) && count($servers) > 0)
{
- $this->keys = $this->memcache->get(_COOKIE_IV_);
+ $this->keys = @$this->memcache->get(_COOKIE_IV_);
if (!is_array($this->keys))
$this->keys = array();
}
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 0508ecaab..0ba74a1c3 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -726,6 +726,8 @@ class AdminControllerCore extends Controller
*/
public function processAdd()
{
+ if (!isset($this->className) || empty($this->className))
+ return false;
/* Checking fields validity */
$this->validateRules();
if (count($this->errors) <= 0)
@@ -1142,6 +1144,8 @@ class AdminControllerCore extends Controller
*/
protected function loadObject($opt = false)
{
+ if (!isset($this->className) || empty($this->className))
+ return true;
$id = (int)Tools::getValue($this->identifier);
if ($id && Validate::isUnsignedId($id))
{
@@ -1540,10 +1544,13 @@ class AdminControllerCore extends Controller
file_put_contents(_PS_ROOT_DIR_.Module::CACHE_FILE_DEFAULT_COUNTRY_MODULES_LIST, Tools::addonsRequest('native'));
$country_module_list_xml = simplexml_load_file(_PS_ROOT_DIR_.Module::CACHE_FILE_DEFAULT_COUNTRY_MODULES_LIST);
+ if($country_module_list_xml === TRUE)
+ {
$country_module_list = array();
foreach ($country_module_list_xml->module as $k => $m)
$country_module_list[] = (string)$m->name;
- $this->tab_modules_list['slider_list'] = array_intersect($this->tab_modules_list['slider_list'], $country_module_list);
+ $this->tab_modules_list['slider_list'] = array_intersect($this->tab_modules_list['slider_list'], $country_module_list);
+ }
if (is_array($this->tab_modules_list['slider_list']) && count($this->tab_modules_list['slider_list']))
$this->toolbar_btn['modules-list'] = array(
@@ -2400,7 +2407,7 @@ class AdminControllerCore extends Controller
public function getFieldValue($obj, $key, $id_lang = null)
{
if ($id_lang)
- $default_value = ($obj->id && isset($obj->{$key}[$id_lang])) ? $obj->{$key}[$id_lang] : false;
+ $default_value = (isset($obj->id) && $obj->id && isset($obj->{$key}[$id_lang])) ? $obj->{$key}[$id_lang] : false;
else
$default_value = isset($obj->{$key}) ? $obj->{$key} : false;
diff --git a/classes/module/Module.php b/classes/module/Module.php
index f6b2fd8fd..2c95d60bf 100644
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -1726,7 +1726,15 @@ abstract class ModuleCore
'.(int)$this->need_instance.''.(isset($this->limited_countries) ? "\n\t".''.(count($this->limited_countries) == 1 ? $this->limited_countries[0] : '').'' : '').'
';
if (is_writable(_PS_MODULE_DIR_.$this->name.'/'))
- file_put_contents(_PS_MODULE_DIR_.$this->name.'/config.xml', $xml);
+ {
+ $file = _PS_MODULE_DIR_.$this->name.'/config.xml';
+ if (!@file_put_contents($file, $xml))
+ if (!is_writable($file))
+ {
+ @unlink($file);
+ @file_put_contents($file, $xml);
+ }
+ }
}
/**
diff --git a/classes/order/Order.php b/classes/order/Order.php
index a4d4db1b0..42e5b42b0 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -712,11 +712,10 @@ class OrderCore extends ObjectModel
}
public function getCartRules()
- {
+ {
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT *
FROM `'._DB_PREFIX_.'order_cart_rule` ocr
- LEFT JOIN `'._DB_PREFIX_.'cart_rule` cr ON cr.`id_cart_rule` = ocr.`id_cart_rule`
WHERE ocr.`id_order` = '.(int)$this->id);
}
diff --git a/classes/order/OrderCartRule.php b/classes/order/OrderCartRule.php
index 3eceb173d..dcc06203a 100644
--- a/classes/order/OrderCartRule.php
+++ b/classes/order/OrderCartRule.php
@@ -46,6 +46,9 @@ class OrderCartRuleCore extends ObjectModel
/** @var float value (tax excl.) of voucher */
public $value_tax_excl;
+
+ /** @var boolean value : voucher gives free shipping or not */
+ public $free_shipping;
/**
* @see ObjectModel::$definition
@@ -59,7 +62,8 @@ class OrderCartRuleCore extends ObjectModel
'id_order_invoice' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
'name' => array('type' => self::TYPE_STRING, 'validate' => 'isCleanHtml', 'required' => true),
'value' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat', 'required' => true),
- 'value_tax_excl' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat', 'required' => true)
+ 'value_tax_excl' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat', 'required' => true),
+ 'free_shipping' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool')
)
);
diff --git a/classes/order/OrderSlip.php b/classes/order/OrderSlip.php
index a9b38457d..527df4bb4 100644
--- a/classes/order/OrderSlip.php
+++ b/classes/order/OrderSlip.php
@@ -129,19 +129,6 @@ class OrderSlipCore extends ObjectModel
{
$products[$key] = $product;
$products[$key]['product_quantity'] = $slip_quantity[$product['id_order_detail']];
- if (count($cart_rules))
- {
- $order->setProductPrices($product);
- $realProductPrice = $products[$key]['product_price'];
- // Todo : must be updated to use the cart rules
- foreach ($cart_rules as $cart_rule)
- {
- if ($cart_rule['reduction_percent'])
- $products[$key]['product_price'] -= $realProductPrice * ($cart_rule['reduction_percent'] / 100);
- elseif ($cart_rule['reduction_amount'])
- $products[$key]['product_price'] -= (($cart_rule['reduction_amount'] * ($product['product_price_wt'] / $order->total_products_wt)) / (1.00 + ($product['tax_rate'] / 100)));
- }
- }
}
return $order->getProducts($products);
}
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index e00153fe8..b0bef57b6 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -2435,17 +2435,12 @@ class AdminImportControllerCore extends AdminController
$discount_rate = (float)$info['discount_rate'];
$tax_rate = (float)$info['tax_rate'];
- // checks if one product is there only once
- if (isset($product['id_product']))
- {
- if ($product['id_product'] == $id_product_attribute)
- $this->errors[] = sprintf($this->l('Product (%d/%D) cannot be added twice (at line %d).'), $id_product,
- $id_product_attribute, $current_line + 1);
- else
- $product['id_product'] = $id_product_attribute;
- }
+ // checks if one product/attribute is there only once
+ if (isset($products[$id_product][$id_product_attribute]))
+ $this->errors[] = sprintf($this->l('Product/Attribute (%d/%d) cannot be added twice (at line %d).'), $id_product,
+ $id_product_attribute, $current_line + 1);
else
- $product['id_product'] = 0;
+ $products[$id_product][$id_product_attribute] = $quantity_expected;
// checks parameters
if (false === ($supplier_reference = ProductSupplier::getProductSupplierReference($id_product, $id_product_attribute, $supply_order->id_supplier)))
diff --git a/controllers/admin/AdminLocalizationController.php b/controllers/admin/AdminLocalizationController.php
index c5158f9fa..882ad4e5e 100644
--- a/controllers/admin/AdminLocalizationController.php
+++ b/controllers/admin/AdminLocalizationController.php
@@ -28,9 +28,6 @@ class AdminLocalizationControllerCore extends AdminController
{
public function __construct()
{
- $this->className = 'Configuration';
- $this->table = 'configuration';
-
parent::__construct();
$this->fields_options = array(
diff --git a/controllers/admin/AdminLogsController.php b/controllers/admin/AdminLogsController.php
index b1b33bdb7..5a4dc1255 100644
--- a/controllers/admin/AdminLogsController.php
+++ b/controllers/admin/AdminLogsController.php
@@ -64,10 +64,20 @@ class AdminLogsControllerCore extends AdminController
$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'employee e ON (a.id_employee = e.id_employee)';
parent::__construct();
}
+
+ public function processDelete()
+ {
+ return Logger::eraseAllLogs();
+ }
public function initToolbar()
{
parent::initToolbar();
+ $this->toolbar_btn['delete'] = array(
+ 'short' => 'Erase',
+ 'desc' => $this->l('Erase all'),
+ 'js' => 'if (confirm(\''.$this->l('Are you sure?').'\')) document.location = \''.$this->context->link->getAdminLink('AdminLogs').'&token='.$this->token.'&deletelog=1\';'
+ );
unset($this->toolbar_btn['new']);
}
diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php
index 2931ecd96..ebdb2ad1d 100644
--- a/controllers/admin/AdminManufacturersController.php
+++ b/controllers/admin/AdminManufacturersController.php
@@ -256,7 +256,7 @@ class AdminManufacturersControllerCore extends AdminController
'lang' => true,
'cols' => 60,
'rows' => 10,
- 'class' => 'rte',
+ 'autoload_rte' => 'rte', //Enable TinyMCE editor for short description
'hint' => $this->l('Invalid characters:').' <>;=#{}'
),
array(
@@ -266,7 +266,7 @@ class AdminManufacturersControllerCore extends AdminController
'lang' => true,
'cols' => 60,
'rows' => 10,
- 'class' => 'rte',
+ 'autoload_rte' => 'rte', //Enable TinyMCE editor for description
'hint' => $this->l('Invalid characters:').' <>;=#{}'
),
array(
@@ -730,4 +730,4 @@ class AdminManufacturersControllerCore extends AdminController
{
return true;
}
-}
\ No newline at end of file
+}
diff --git a/controllers/admin/AdminStatsTabController.php b/controllers/admin/AdminStatsTabController.php
index 8f6895ba7..a143841a4 100644
--- a/controllers/admin/AdminStatsTabController.php
+++ b/controllers/admin/AdminStatsTabController.php
@@ -131,8 +131,13 @@ abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCor
$modules = $this->getModules();
$module_instance = array();
- foreach ($modules as $module)
+ foreach ($modules as $m => $module)
+ {
$module_instance[$module['name']] = Module::getInstanceByName($module['name']);
+ $modules[$m]['displayName'] = $module_instance[$module['name']]->displayName;
+ }
+
+ uasort($modules, array($this, 'checkModulesNames'));
$tpl->assign(array(
'current' => self::$currentIndex,
@@ -143,6 +148,11 @@ abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCor
return $tpl->fetch();
}
+
+ public function checkModulesNames($a, $b)
+ {
+ return (bool)($a['displayName'] > $b['displayName']);
+ }
protected function getModules()
{
diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php
index 22e30efb4..bfe5618a3 100644
--- a/controllers/admin/AdminSuppliersController.php
+++ b/controllers/admin/AdminSuppliersController.php
@@ -94,7 +94,8 @@ class AdminSuppliersControllerCore extends AdminController
'rows' => 10,
'lang' => true,
'hint' => $this->l('Invalid characters:').' <>;=#{}',
- 'desc' => $this->l('Will appear in the supplier list')
+ 'desc' => $this->l('Will appear in the supplier list'),
+ 'autoload_rte' => 'rte' //Enable TinyMCE editor for short description
),
array(
'type' => 'text',
diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php
index 17da45533..5d581be0f 100644
--- a/controllers/admin/AdminSupplyOrdersController.php
+++ b/controllers/admin/AdminSupplyOrdersController.php
@@ -754,7 +754,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
'orderby' => false,
'filter' => false,
'search' => false,
- 'hint' => 'Note that you can see details on the receptions - per products',
+ 'hint' => $this->l('Note that you can see details on the receptions - per products'),
),
'quantity_expected' => array(
'title' => $this->l('Quantity expected'),
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index 3bbb11dc0..52b178edc 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -460,7 +460,9 @@ class AdminTranslationsControllerCore extends AdminController
if (!$default_language || !Validate::isLanguageIsoCode($default_language))
return false;
// 1 - Scan mails files
- $mails = scandir(_PS_MAIL_DIR_.$default_language.'/');
+ $mails = array();
+ if (Tools::file_exists_cache(_PS_MAIL_DIR_.$default_language.'/'))
+ $mails = scandir(_PS_MAIL_DIR_.$default_language.'/');
$mails_new_lang = array();
@@ -579,7 +581,9 @@ class AdminTranslationsControllerCore extends AdminController
if (preg_match('#^translations\/'.$iso_code.'\/tabs.php#Ui', $file['filename'], $matches) && Validate::isLanguageIsoCode($iso_code))
{
// Include array width new translations tabs
- $tabs = include _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.$file['filename'];
+ $tabs = array();
+ if (Tools::file_exists_cache(_PS_ROOT_DIR_.DIRECTORY_SEPARATOR.$file['filename']))
+ $tabs = include_once(_PS_ROOT_DIR_.DIRECTORY_SEPARATOR.$file['filename']);
foreach ($tabs as $class_name => $translations)
{
diff --git a/controllers/front/ManufacturerController.php b/controllers/front/ManufacturerController.php
index dbc2f3b2a..4cc8d6b62 100644
--- a/controllers/front/ManufacturerController.php
+++ b/controllers/front/ManufacturerController.php
@@ -134,4 +134,12 @@ class ManufacturerControllerCore extends FrontController
else
$this->context->smarty->assign('nbManufacturers', 0);
}
-}
\ No newline at end of file
+
+ /**
+ * Get instance of current manufacturer
+ */
+ public function getManufacturer()
+ {
+ return $this->manufacturer;
+ }
+}
diff --git a/install-dev/data/db_structure.sql b/install-dev/data/db_structure.sql
index d067ea6f0..4ad6974fc 100644
--- a/install-dev/data/db_structure.sql
+++ b/install-dev/data/db_structure.sql
@@ -936,7 +936,7 @@ CREATE TABLE `PREFIX_manufacturer_lang` (
`id_manufacturer` int(10) unsigned NOT NULL,
`id_lang` int(10) unsigned NOT NULL,
`description` text,
- `short_description` varchar(254) default NULL,
+ `short_description` text,
`meta_title` varchar(128) default NULL,
`meta_keywords` varchar(255) default NULL,
`meta_description` varchar(255) default NULL,
diff --git a/install-dev/upgrade/php/block_category_1521.php b/install-dev/upgrade/php/block_category_1521.php
index c6b1846f7..4ff4d086b 100644
--- a/install-dev/upgrade/php/block_category_1521.php
+++ b/install-dev/upgrade/php/block_category_1521.php
@@ -26,11 +26,11 @@
function block_category_1521()
{
- if (!Db::getInstance()->getValue('SELECT FROM `'._DB_PREFIX_.'configuration` WHERE `name` LIKE \'BLOCK_CATEG_MAX_DEPTH\' '))
+ if (!Db::getInstance()->getValue('SELECT value FROM `'._DB_PREFIX_.'configuration` WHERE `name` LIKE \'BLOCK_CATEG_MAX_DEPTH\' '))
Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'configuration`
(`id_configuration` ,`id_shop_group` ,`id_shop` ,`name` ,`value` ,`date_add` ,`date_upd`)
VALUES (NULL, NULL, NULL, \'BLOCK_CATEG_MAX_DEPTH\', 4, NOW(), NOW())');
- else if ($maxdepth = (int)Db::getInstance()->getValue('SELECT FROM `'._DB_PREFIX_.'configuration` WHERE `value` IS NOT NULL AND `value` <> 0'))
- Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'configuration` SET `value` = '.($maxdepth + 1).' WHERE `name` LIKE\'BLOCK_CATEG_MAX_DEPTH\'');
+ else if ($maxdepth = (int)Db::getInstance()->getValue('SELECT value FROM `'._DB_PREFIX_.'configuration` WHERE `value` IS NOT NULL AND `value` <> 0 AND `name` LIKE \'BLOCK_CATEG_MAX_DEPTH\''))
+ Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'configuration` SET `value` = '.($maxdepth + 1).' WHERE `name` LIKE \'BLOCK_CATEG_MAX_DEPTH\'');
}
\ No newline at end of file
diff --git a/install-dev/upgrade/php/fix_download_product_feature_active.php b/install-dev/upgrade/php/fix_download_product_feature_active.php
index 354b3e5f5..c8ffc103f 100644
--- a/install-dev/upgrade/php/fix_download_product_feature_active.php
+++ b/install-dev/upgrade/php/fix_download_product_feature_active.php
@@ -27,5 +27,5 @@
function fix_download_product_feature_active()
{
if (Db::getInstance()->getValue('SELECT COUNT(id_product_download) FROM `'._DB_PREFIX_.'product_download` WHERE `active` = 1 ;') > 0)
- Configuration::updateGlobaleValue('PS_VIRTUAL_PROD_FEATURE_ACTIVE');
+ Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'configuration` SET `value` = 1 WHERE `name` LIKE \'PS_VIRTUAL_PROD_FEATURE_ACTIVE\'');
}
\ No newline at end of file
diff --git a/install-dev/upgrade/php/migrate_orders.php b/install-dev/upgrade/php/migrate_orders.php
index 6929bd07d..96160fa4b 100644
--- a/install-dev/upgrade/php/migrate_orders.php
+++ b/install-dev/upgrade/php/migrate_orders.php
@@ -95,7 +95,8 @@ function migrate_orders()
$reduction_amount_tax_incl = (float)$products['reduction_amount'];
// cart::getTaxesAverageUsed equivalent
- $sum_total_products += $products['total_wt'];
+ $sum_total_products += $products['total_price'];
+
$sum_tax_amount += $products['total_wt'] - $products['total_price'];
$order_details['reduction_amount_tax_incl'] = $reduction_amount_tax_incl;
@@ -119,12 +120,11 @@ function migrate_orders()
$average_tax_used = 1;
if ($sum_total_products > 0)
- $average_tax_used += ($sum_tax_amount / $sum_total_products) * 0.01;
-
+ $average_tax_used += $sum_tax_amount / $sum_total_products;
+ $average_tax_used = round($average_tax_used, 4);
$carrier_tax_rate = 1 + ((float)$order['carrier_tax_rate'] / 100);
$total_discount_tax_excl = $order['total_discounts'] / $average_tax_used;
-
$order['total_discounts_tax_incl'] = (float)$order['total_discounts'];
$order['total_discounts_tax_excl'] = (float)$total_discount_tax_excl;
@@ -321,5 +321,4 @@ function mo_setProductPrices($row, $tax_calculation_method)
$row['total_price'] = $row['product_quantity'] * $row['product_price'];
return $row;
-}
-
+}
\ No newline at end of file
diff --git a/install-dev/upgrade/php/update_order_messages.php b/install-dev/upgrade/php/update_order_messages.php
index 369b753d5..29d4cc07e 100644
--- a/install-dev/upgrade/php/update_order_messages.php
+++ b/install-dev/upgrade/php/update_order_messages.php
@@ -29,17 +29,18 @@ function update_order_messages()
$step = 3000;
$count_messages = Db::getInstance()->getValue('SELECT count(id_message) FROM '._DB_PREFIX_.'message');
$nb_loop = $start = 0;
+ $pattern = ' 0)
$nb_loop = ceil($count_messages / $step);
for($i = 0; $i < $nb_loop; $i++)
{
- $sql = 'SELECT id_message, message FROM `'._DB_PREFIX_.'message` WHERE message REGEXP \'query($sql))
while ($message = Db::getInstance()->nextRow($messages))
{
if(is_array($message))
{
- $sql = 'UPDATE `'._DB_PREFIX_.'message` SET message = \''.pSQL(Tools::htmlentitiesDecodeUTF8(br2nl($message['message']))).'\'
+ $sql = 'UPDATE `'._DB_PREFIX_.'message` SET message = \''.pSQL(preg_replace('/'.$pattern.'/', '', Tools::htmlentitiesDecodeUTF8(br2nl($message['message'])))).'\'
WHERE id_message = '.(int)$message['id_message'];
$result = Db::getInstance()->execute($sql);
}
@@ -50,13 +51,13 @@ function update_order_messages()
$nb_loop = ceil($count_messages / $step);
for($i = 0; $i < $nb_loop; $i++)
{
- $sql = 'SELECT id_customer_message, message FROM `'._DB_PREFIX_.'customer_message` WHERE message REGEXP \'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.5.0.sql b/install-dev/upgrade/sql/1.5.5.0.sql
index 04d4af493..c93e293ac 100644
--- a/install-dev/upgrade/sql/1.5.5.0.sql
+++ b/install-dev/upgrade/sql/1.5.5.0.sql
@@ -34,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/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/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php
index 76c0aacaa..91ebe0cd2 100644
--- a/modules/blocklayered/blocklayered.php
+++ b/modules/blocklayered/blocklayered.php
@@ -445,10 +445,7 @@ 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))
{
@@ -2393,11 +2390,13 @@ class BlockLayered extends Module
MAX(image_shop.`id_image`) id_image,
il.legend,
m.name manufacturer_name,
- DATEDIFF('.$alias_where.'.`date_add`, DATE_SUB(NOW(), INTERVAL '.(int)$nb_day_new_product.' DAY)) > 0 AS new
+ DATEDIFF('.$alias_where.'.`date_add`, DATE_SUB(NOW(), INTERVAL '.(int)$nb_day_new_product.' DAY)) > 0 AS new,
+ stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity
FROM `'._DB_PREFIX_.'category_product` cp
LEFT JOIN '._DB_PREFIX_.'category c ON (c.id_category = cp.id_category)
LEFT JOIN `'._DB_PREFIX_.'product` p ON p.`id_product` = cp.`id_product`
'.Shop::addSqlAssociation('product', 'p').'
+ '.Product::sqlStock('p', null, false, Context::getContext()->shop).'
LEFT JOIN '._DB_PREFIX_.'product_lang pl ON (pl.id_product = p.id_product'.Shop::addSqlRestrictionOnLang('pl').' AND pl.id_lang = '.(int)$cookie->id_lang.')
LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product`)'.
Shop::addSqlAssociation('image', 'i', false, 'image_shop.cover=1').'
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/blocktopmenu/blocktopmenu.php b/modules/blocktopmenu/blocktopmenu.php
index 724ea4da3..a5eb3b3c5 100644
--- a/modules/blocktopmenu/blocktopmenu.php
+++ b/modules/blocktopmenu/blocktopmenu.php
@@ -221,6 +221,8 @@ class Blocktopmenu extends Module
// BEGIN SUPPLIER
$this->_html .= '