';
// SHOW TIPS OF THE DAY
$content = Tools::file_get_contents($protocol.'api.prestashop.com/partner/tipsoftheday/?iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser), false, $stream_context);
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index f76c9133b..dc2b3cdd9 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -630,9 +630,8 @@ class AdminModulesControllerCore extends AdminController
if (!$download_ok)
$this->errors[] = $this->l('Error on downloading the lastest version');
- else
- if(!$this->extractArchive(_PS_MODULE_DIR_.$modaddons->name.'.zip', false))
- $this->errors[] = $this->l(sprintf("Module %s can't be upgraded: ", $modaddons->name));
+ elseif (!$this->extractArchive(_PS_MODULE_DIR_.$modaddons->name.'.zip', false))
+ $this->errors[] = $this->l(sprintf("Module %s can't be upgraded: ", $modaddons->name));
}
}
}
@@ -674,18 +673,18 @@ class AdminModulesControllerCore extends AdminController
// Get the return value of current method
$echo = $module->{$method}();
-
+
// After a successful install of a single module that has a configuration method, to the configuration page
if ($key == 'install' && $echo === true && strpos(Tools::getValue('install'), '|') === false && method_exists($module, 'getContent'))
Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token.'&configure='.$module->name.'&conf=12');
}
-
+
// If the method called is "configure" (getContent method), we show the html code of configure page
if ($key == 'configure' && Module::isInstalled($module->name))
{
if (isset($module->multishop_context))
$this->multishop_context = $module->multishop_context;
-
+
$backlink = self::$currentIndex.'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name;
$hooklink = 'index.php?tab=AdminModulesPositions&token='.Tools::getAdminTokenLite('AdminModulesPositions').'&show_modules='.(int)$module->id;
$tradlink = 'index.php?tab=AdminTranslations&token='.Tools::getAdminTokenLite('AdminTranslations').'&type=modules&lang=';
@@ -768,10 +767,8 @@ class AdminModulesControllerCore extends AdminController
Tools::redirectAdmin(self::$currentIndex.'&conf='.$return.'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name).(isset($modules_list_save) ? '&modules_list='.$modules_list_save : '').$params);
}
- if(isset($_GET['update']))
- {
+ if (isset($_GET['update']))
Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token.'&updated=1tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name).(isset($modules_list_save) ? '&modules_list='.$modules_list_save : '').$params);
- }
}
public function postProcess()
@@ -779,7 +776,6 @@ class AdminModulesControllerCore extends AdminController
// Parent Post Process
parent::postProcess();
-
// Get the list of installed module ans prepare it for ajax call.
if (($list = Tools::getValue('installed_modules')))
Context::getContext()->smarty->assign('installed_modules', Tools::jsonEncode(explode('|', $list)));
diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php
index 828238c7c..c9d01abe6 100644
--- a/controllers/front/CartController.php
+++ b/controllers/front/CartController.php
@@ -33,6 +33,7 @@ class CartControllerCore extends FrontController
protected $id_address_delivery;
protected $customization_id;
protected $qty;
+ public $ssl = false;
protected $ajax_refresh = false;
diff --git a/js/admin_carrier_wizard.js b/js/admin_carrier_wizard.js
index c43431d6a..540de14ba 100644
--- a/js/admin_carrier_wizard.js
+++ b/js/admin_carrier_wizard.js
@@ -44,7 +44,8 @@ function initCarrierWizard()
'onLeaveStep' : onLeaveStepCallback,
'onFinish' : onFinishCallback,
'transitionEffect' : 'slideleft',
- 'enableAllSteps' : enableAllSteps
+ 'enableAllSteps' : enableAllSteps,
+ 'keyNavigation' : false
});
displayRangeType();
}
diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php
index b2a18e831..859337e26 100644
--- a/modules/blocklayered/blocklayered.php
+++ b/modules/blocklayered/blocklayered.php
@@ -445,14 +445,21 @@ class BlockLayered extends Module
static $_MODULES = array();
global $_MODULE;
- $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);
@@ -936,25 +943,25 @@ class BlockLayered extends Module
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)');
+ 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');
+ WHERE `active` = 1 AND `visibility` IN ("both", "catalog")');
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)
+ 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');
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');
+ WHERE `active` = 1 AND `visibility` IN ("both", "catalog") AND psi.id_product IS NULL');
$max_executiontime = @ini_get('max_execution_time');
if ($max_executiontime > 5 || $max_executiontime <= 0)
@@ -1015,14 +1022,14 @@ class BlockLayered extends Module
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"))
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
+ WHERE `active` = 1 AND `visibility` IN ("both", "catalog")
GROUP BY p.`id_product`
ORDER BY p.`id_product` LIMIT '.(int)$cursor.','.(int)$length;
else
@@ -1031,7 +1038,7 @@ class BlockLayered extends Module
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`
@@ -1041,7 +1048,7 @@ class BlockLayered extends Module
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
+ WHERE `active` = 1 AND `visibility` IN ("both", "catalog") AND psi.id_product IS NULL
GROUP BY p.`id_product`
ORDER BY p.`id_product` LIMIT 0,'.(int)$length;
@@ -2322,7 +2329,7 @@ class BlockLayered extends Module
$alias_where = 'p';
if (version_compare(_PS_VERSION_,'1.5','>'))
$alias_where = 'product_shop';
- $query_filters_where = ' AND '.$alias_where.'.`active` = 1';
+ $query_filters_where = ' AND '.$alias_where.'.`active` = 1 AND '.$alias_where.'.`visibility` IN ("both", "catalog")';
$query_filters_from = '';
$parent = new Category((int)$id_parent);
@@ -2518,7 +2525,7 @@ class BlockLayered extends Module
'.($alias_where == 'p' ? '' : 'product_shop.*,' ).'
'.$alias_where.'.id_category_default,
pl.*,
- i.id_image,
+ image_shop.`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
@@ -2527,12 +2534,12 @@ class BlockLayered extends Module
LEFT JOIN `'._DB_PREFIX_.'product` p ON p.`id_product` = cp.`id_product`
'.$join.'
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 AND i.cover = 1)
- LEFT JOIN '._DB_PREFIX_.'image_lang il ON (i.id_image = il.id_image AND il.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').'
+ LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (image_shop.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$cookie->id_lang.')
LEFT JOIN '._DB_PREFIX_.'manufacturer m ON (m.id_manufacturer = p.id_manufacturer)
- WHERE '.$alias_where.'.`active` = 1 AND
- '.(Configuration::get('PS_LAYERED_FULL_TREE') ? 'c.nleft >= '.(int)$parent->nleft.'
- AND c.nright <= '.(int)$parent->nright : 'c.id_category = '.(int)$id_parent).'
+ WHERE (i.id_image IS NULL OR image_shop.id_shop='.(int)Context::getContext()->shop->id.')
+ AND '.$alias_where.'.`active` = 1 AND '.$alias_where.'.`visibility` IN ("both", "catalog")
+ AND '.(Configuration::get('PS_LAYERED_FULL_TREE') ? 'c.nleft >= '.(int)$parent->nleft.' AND c.nright <= '.(int)$parent->nright : 'c.id_category = '.(int)$id_parent).'
AND c.active = 1
AND p.id_product IN ('.implode(',', $product_id_list).')
GROUP BY cp.id_product
@@ -2632,10 +2639,10 @@ class BlockLayered extends Module
{
$sql_query['join'] .= 'LEFT JOIN `'._DB_PREFIX_.'stock_available` sa
ON (sa.id_product = p.id_product AND sa.id_shop = '.(int)$this->context->shop->id.') ';
- $sql_query['where'] = 'WHERE product_shop.`active` = 1 ';
+ $sql_query['where'] = 'WHERE product_shop.`active` = 1 AND product_shop.`visibility` IN ("both", "catalog") ';
}
else
- $sql_query['where'] = 'WHERE p.`active` = 1 ';
+ $sql_query['where'] = 'WHERE p.`active` = 1 AND p.`visibility` IN ("both", "catalog") ';
$sql_query['group'] = ' GROUP BY p.id_product ';
break;
@@ -2650,8 +2657,8 @@ class BlockLayered extends Module
'.(Configuration::get('PS_LAYERED_FULL_TREE') ? 'c.nleft >= '.(int)$parent->nleft.'
AND c.nright <= '.(int)$parent->nright : 'c.id_category = '.(int)$id_parent).'
AND c.active = 1
- AND '.$alias.'.active = 1';
- $sql_query['group'] = ' GROUP BY p.id_manufacturer ';
+ AND '.$alias.'.active = 1 AND '.$alias.'.`visibility` IN ("both", "catalog")';
+ $sql_query['group'] = ' GROUP BY p.id_manufacturer ORDER BY m.name';
if (!Configuration::get('PS_LAYERED_HIDE_0_VALUES'))
{
@@ -2667,8 +2674,8 @@ class BlockLayered extends Module
WHERE '.(Configuration::get('PS_LAYERED_FULL_TREE') ? 'c.nleft >= '.(int)$parent->nleft.'
AND c.nright <= '.(int)$parent->nright : 'c.id_category = '.(int)$id_parent).'
AND c.active = 1
- AND '.$alias.'.active = 1
- GROUP BY p.id_manufacturer';
+ AND '.$alias.'.active = 1 AND '.$alias.'.`visibility` IN ("both", "catalog")
+ GROUP BY p.id_manufacturer ORDER BY m.name';
}
break;
@@ -2698,13 +2705,15 @@ class BlockLayered extends Module
$sql_query['where'] = 'WHERE a.id_attribute_group = '.(int)$filter['id_value'];
if (version_compare(_PS_VERSION_,'1.5','>'))
$sql_query['where'] .= ' AND lpa.`id_shop` = '.(int)Context::getContext()->shop->id;
- $sql_query['where'] .= ' AND '.$alias.'.active = 1 AND p.id_product IN (
- SELECT id_product
- FROM '._DB_PREFIX_.'category_product cp
- INNER JOIN '._DB_PREFIX_.'category c ON (c.id_category = cp.id_category AND
- '.(Configuration::get('PS_LAYERED_FULL_TREE') ? 'c.nleft >= '.(int)$parent->nleft.'
- AND c.nright <= '.(int)$parent->nright : 'c.id_category = '.(int)$id_parent).'
- AND c.active = 1)) ';
+ $sql_query['where'] .= ' AND '.$alias.'.active = 1 AND '.$alias.'.`visibility` IN ("both", "catalog")
+ AND p.id_product IN (
+ SELECT id_product
+ FROM '._DB_PREFIX_.'category_product cp
+ INNER JOIN '._DB_PREFIX_.'category c ON (c.id_category = cp.id_category AND
+ '.(Configuration::get('PS_LAYERED_FULL_TREE') ? 'c.nleft >= '.(int)$parent->nleft.'
+ AND c.nright <= '.(int)$parent->nright : 'c.id_category = '.(int)$id_parent).'
+ AND c.active = 1)
+ ) ';
$sql_query['group'] = '
GROUP BY lpa.id_attribute
ORDER BY ag.`position` ASC, a.`position` ASC';
@@ -2713,31 +2722,28 @@ class BlockLayered extends Module
{
$sql_query['second_query'] = '
SELECT 0 nbr, lpa.id_attribute_group,
- a.color, al.name attribute_name, agl.public_name attribute_group_name , lpa.id_attribute, ag.is_color_group,
- liagl.url_name name_url_name, liagl.meta_title name_meta_title, lial.url_name value_url_name, lial.meta_title value_meta_title
-
+ a.color, al.name attribute_name, agl.public_name attribute_group_name , lpa.id_attribute, ag.is_color_group,
+ liagl.url_name name_url_name, liagl.meta_title name_meta_title, lial.url_name value_url_name, lial.meta_title value_meta_title
FROM '._DB_PREFIX_.'layered_product_attribute lpa
'.(version_compare(_PS_VERSION_,'1.5','>') ? Shop::addSqlAssociation('product', 'lpa') : '').'
INNER JOIN '._DB_PREFIX_.'attribute a
- ON a.id_attribute = lpa.id_attribute
+ ON a.id_attribute = lpa.id_attribute
INNER JOIN '._DB_PREFIX_.'attribute_lang al
- ON al.id_attribute = a.id_attribute
- AND al.id_lang = '.$id_lang.'
+ ON al.id_attribute = a.id_attribute AND al.id_lang = '.$id_lang.'
INNER JOIN '._DB_PREFIX_.'product as p
- ON p.id_product = lpa.id_product
+ ON p.id_product = lpa.id_product
INNER JOIN '._DB_PREFIX_.'attribute_group ag
- ON ag.id_attribute_group = lpa.id_attribute_group
+ ON ag.id_attribute_group = lpa.id_attribute_group
INNER JOIN '._DB_PREFIX_.'attribute_group_lang agl
- ON agl.id_attribute_group = lpa.id_attribute_group
+ ON agl.id_attribute_group = lpa.id_attribute_group
AND agl.id_lang = '.$id_lang.'
LEFT JOIN '._DB_PREFIX_.'layered_indexable_attribute_group_lang_value liagl
- ON (liagl.id_attribute_group = lpa.id_attribute_group AND liagl.id_lang = '.$id_lang.')
+ ON (liagl.id_attribute_group = lpa.id_attribute_group AND liagl.id_lang = '.$id_lang.')
LEFT JOIN '._DB_PREFIX_.'layered_indexable_attribute_lang_value lial
- ON (lial.id_attribute = lpa.id_attribute AND lial.id_lang = '.$id_lang.')
-
- WHERE '.$alias.'.active = 1 AND a.id_attribute_group = '.(int)$filter['id_value'].'
+ ON (lial.id_attribute = lpa.id_attribute AND lial.id_lang = '.$id_lang.')
+ WHERE '.$alias.'.active = 1 AND '.$alias.'.`visibility` IN ("both", "catalog")
+ AND a.id_attribute_group = '.(int)$filter['id_value'].'
'.(version_compare(_PS_VERSION_,'1.5','>') ? 'AND lpa.`id_shop` = '.(int)Context::getContext()->shop->id : '').'
-
GROUP BY lpa.id_attribute
ORDER BY id_attribute_group, id_attribute';
}
@@ -2757,7 +2763,8 @@ class BlockLayered extends Module
ON (lifl.id_feature = fp.id_feature AND lifl.id_lang = '.$id_lang.')
LEFT JOIN '._DB_PREFIX_.'layered_indexable_feature_value_lang_value lifvl
ON (lifvl.id_feature_value = fp.id_feature_value AND lifvl.id_lang = '.$id_lang.') ';
- $sql_query['where'] = 'WHERE '.$alias.'.`active` = 1 AND fp.id_feature = '.(int)$filter['id_value'].'
+ $sql_query['where'] = 'WHERE '.$alias.'.`active` = 1 AND '.$alias.'.`visibility` IN ("both", "catalog")
+ AND fp.id_feature = '.(int)$filter['id_value'].'
AND p.id_product IN (
SELECT id_product
FROM '._DB_PREFIX_.'category_product cp
@@ -2781,10 +2788,11 @@ class BlockLayered extends Module
INNER JOIN '._DB_PREFIX_.'feature_value fv ON (fv.id_feature_value = fp.id_feature_value AND (fv.custom IS NULL OR fv.custom = 0))
LEFT JOIN '._DB_PREFIX_.'feature_value_lang fvl ON (fvl.id_feature_value = fp.id_feature_value AND fvl.id_lang = '.$id_lang.')
LEFT JOIN '._DB_PREFIX_.'layered_indexable_feature_lang_value lifl
- ON (lifl.id_feature = fp.id_feature AND lifl.id_lang = '.$id_lang.')
+ ON (lifl.id_feature = fp.id_feature AND lifl.id_lang = '.$id_lang.')
LEFT JOIN '._DB_PREFIX_.'layered_indexable_feature_value_lang_value lifvl
- ON (lifvl.id_feature_value = fp.id_feature_value AND lifvl.id_lang = '.$id_lang.')
- WHERE '.$alias.'.`active` = 1 AND fp.id_feature = '.(int)$filter['id_value'].'
+ ON (lifvl.id_feature_value = fp.id_feature_value AND lifvl.id_lang = '.$id_lang.')
+ WHERE '.$alias.'.`active` = 1 AND '.$alias.'.`visibility` IN ("both", "catalog")
+ AND fp.id_feature = '.(int)$filter['id_value'].'
GROUP BY fv.id_feature_value';
}
@@ -2801,7 +2809,8 @@ class BlockLayered extends Module
FROM '._DB_PREFIX_.'category_product cp
LEFT JOIN '._DB_PREFIX_.'product p ON (p.id_product = cp.id_product) ';
$sql_query['where'] = '
- WHERE cp.id_category = c.id_category AND '.$alias.'.active = 1 ';
+ WHERE cp.id_category = c.id_category
+ AND '.$alias.'.active = 1 AND '.$alias.'.`visibility` IN ("both", "catalog")';
$sql_query['group'] = ') count_products
FROM '._DB_PREFIX_.'category c
LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = c.id_category AND cl.id_lang = '.$id_lang.')
@@ -3855,10 +3864,9 @@ class BlockLayered extends Module
public function ajaxCall()
{
- global $smarty;
+ global $smarty, $cookie;
$selected_filters = $this->getSelectedFilters();
-
$this->getProducts($selected_filters, $products, $nb_products, $p, $n, $pages_nb, $start, $stop, $range);
// Add pagination variable
@@ -3871,8 +3879,8 @@ class BlockLayered extends Module
array(
'homeSize' => Image::getSize(ImageType::getFormatedName('home')),
'nb_products' => $nb_products,
- 'category' => (object)array('id' => Tools::getValue('id_category_layered', 1)),
- 'pages_nb' => (int)($pages_nb),
+ 'category' => new Category(Tools::getValue('id_category_layered', 1), (int)$cookie->id_lang),
+ 'pages_nb' => (int)$pages_nb,
'p' => (int)$p,
'n' => (int)$n,
'range' => (int)$range,
@@ -4013,8 +4021,8 @@ class BlockLayered extends Module
LEFT JOIN '._DB_PREFIX_.'category c ON (c.id_category = cp.id_category)
WHERE c.active = 1'.
(count($categories_ids) ? ' AND cp.id_category IN ('.implode(',', $categories_ids).')' : '').'
- AND '.$alias.'.active = 1'.
- (count($products_ids) ? ' AND p.id_product IN ('.implode(',', $products_ids).')' : ''));
+ AND '.$alias.'.active = 1 AND '.$alias.'.`visibility` IN ("both", "catalog")
+ '.(count($products_ids) ? 'AND p.id_product IN ('.implode(',', $products_ids).')' : ''));
$attribute_groups_by_id = array();
while ($row = $db->nextRow($attribute_groups))
@@ -4029,7 +4037,7 @@ class BlockLayered extends Module
LEFT JOIN '._DB_PREFIX_.'category_product cp ON (cp.id_product = p.id_product)
LEFT JOIN '._DB_PREFIX_.'category c ON (c.id_category = cp.id_category)
WHERE (fv.custom IS NULL OR fv.custom = 0) AND c.active = 1'.(count($categories_ids) ? ' AND cp.id_category IN ('.implode(',', $categories_ids).')' : '').'
- AND '.$alias.'.active = 1'.(count($products_ids) ? ' AND p.id_product IN ('.implode(',', $products_ids).')' : ''));
+ AND '.$alias.'.active = 1 AND '.$alias.'.`visibility` IN ("both", "catalog") '.(count($products_ids) ? 'AND p.id_product IN ('.implode(',', $products_ids).')' : ''));
$features_by_id = array();
while ($row = $db->nextRow($features))
@@ -4048,9 +4056,9 @@ class BlockLayered extends Module
LEFT JOIN '._DB_PREFIX_.'product_attribute pa ON (pa.id_product = p.id_product)
'.$join_product.$join_product_attribute.'
LEFT JOIN '._DB_PREFIX_.'product_attribute_combination pac ON (pac.id_product_attribute = pa.id_product_attribute)
- WHERE c.active = 1'.(count($categories_ids) ? ' AND cp.id_category IN ('.implode(',', $categories_ids).')' : '').
- ' AND '.$alias.'.active = 1'.
- (count($products_ids) ? ' AND p.id_product IN ('.implode(',', $products_ids).')' : '').
+ WHERE c.active = 1'.(count($categories_ids) ? ' AND cp.id_category IN ('.implode(',', $categories_ids).')' : '').'
+ AND '.$alias.'.active = 1 AND '.$alias.'.`visibility` IN ("both", "catalog")
+ '.(count($products_ids) ? 'AND p.id_product IN ('.implode(',', $products_ids).')' : '').
' AND (fv.custom IS NULL OR fv.custom = 0)
GROUP BY p.id_product');
diff --git a/modules/blocklayered/config.xml b/modules/blocklayered/config.xml
index da98eb84b..e6b78b59b 100644
--- a/modules/blocklayered/config.xml
+++ b/modules/blocklayered/config.xml
@@ -1,9 +1,9 @@
blocklayered
-
+
-
+
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/blocktopmenu/blocktopmenu.php b/modules/blocktopmenu/blocktopmenu.php
index eeecaf4d4..724ea4da3 100644
--- a/modules/blocktopmenu/blocktopmenu.php
+++ b/modules/blocktopmenu/blocktopmenu.php
@@ -52,7 +52,7 @@ class Blocktopmenu extends Module
{
$this->name = 'blocktopmenu';
$this->tab = 'front_office_features';
- $this->version = 1.5;
+ $this->version = 1.6;
$this->author = 'PrestaShop';
parent::__construct();
@@ -69,6 +69,7 @@ class Blocktopmenu extends Module
!Configuration::updateGlobalValue('MOD_BLOCKTOPMENU_SEARCH', '1') ||
!$this->registerHook('actionObjectCategoryUpdateAfter') ||
!$this->registerHook('actionObjectCategoryDeleteAfter') ||
+ !$this->registerHook('actionObjectCategoryAddAfter') ||
!$this->registerHook('actionObjectCmsUpdateAfter') ||
!$this->registerHook('actionObjectCmsDeleteAfter') ||
!$this->registerHook('actionObjectSupplierUpdateAfter') ||
@@ -797,7 +798,11 @@ class Blocktopmenu extends Module
return Db::getInstance()->executeS($sql);
}
-
+
+ public function hookActionObjectCategoryAddAfter($params)
+ {
+ $this->clearMenuCache();
+ }
public function hookActionObjectCategoryUpdateAfter($params)
{
diff --git a/modules/blocktopmenu/config.xml b/modules/blocktopmenu/config.xml
index f1508b13b..0b21e24e8 100644
--- a/modules/blocktopmenu/config.xml
+++ b/modules/blocktopmenu/config.xml
@@ -2,7 +2,7 @@
blocktopmenu
-
+
diff --git a/modules/blocktopmenu/upgrade/install-1.6.php b/modules/blocktopmenu/upgrade/install-1.6.php
new file mode 100644
index 000000000..90183557b
--- /dev/null
+++ b/modules/blocktopmenu/upgrade/install-1.6.php
@@ -0,0 +1,9 @@
+registerHook('actionObjectCategoryAddAfter'));
+}
diff --git a/modules/homeslider/upgrade/install-1.2.1.php b/modules/homeslider/upgrade/install-1.2.1.php
index 7817ecaf7..2d3d12abd 100644
--- a/modules/homeslider/upgrade/install-1.2.1.php
+++ b/modules/homeslider/upgrade/install-1.2.1.php
@@ -16,9 +16,9 @@ function upgrade_module_1_2_1($object)
function homeslider_stripslashes_field($field)
{
- $quotes = array('\'\\\\\'\'', '\'\\\'\'');
- $dquotes = array('\'\\"\'', '\'"\'');
- $backslashes = array('\'\\\\\'', '\'\\\'');
+ $quotes = array('"\\\'"', '"\'"');
+ $dquotes = array('\'\\\\"\'', '\'"\'');
+ $backslashes = array('"\\\\\\\\"', '"\\\\"');
return '`'.bqSQL($field).'` = replace(replace(replace(`'.bqSQL($field).'`, '.$quotes[0].', '.$quotes[1].'), '.$dquotes[0].', '.$dquotes[1].'), '.$backslashes[0].', '.$backslashes[1].')';
}
\ No newline at end of file
diff --git a/themes/live_edit.tpl b/themes/live_edit.tpl
index 52f28163b..fe6497ede 100644
--- a/themes/live_edit.tpl
+++ b/themes/live_edit.tpl
@@ -24,11 +24,11 @@
*}