diff --git a/classes/Pack.php b/classes/Pack.php index 9abe73d22..8576ccd41 100644 --- a/classes/Pack.php +++ b/classes/Pack.php @@ -126,7 +126,7 @@ class PackCore extends Product if (!Pack::isFeatureActive()) return array(); - $sql = 'SELECT p.*, product_shop.*, pl.*, i.`id_image`, il.`legend`, t.`rate`, cl.`name` AS category_default, a.quantity AS pack_quantity, product_shop.`id_category_default` + $sql = 'SELECT p.*, product_shop.*, pl.*, i.`id_image`, il.`legend`, t.`rate`, cl.`name` AS category_default, a.quantity AS pack_quantity, product_shop.`id_category_default`, a.id_product_pack FROM `'._DB_PREFIX_.'pack` a LEFT JOIN `'._DB_PREFIX_.'product` p ON p.id_product = a.id_product_item LEFT JOIN `'._DB_PREFIX_.'product_lang` pl diff --git a/classes/Product.php b/classes/Product.php index d29960ac9..cc83e0061 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -3461,6 +3461,8 @@ class ProductCore extends ObjectModel $usetax = Tax::excludeTaxeOption(); $cache_key = $row['id_product'].'-'.$row['id_product_attribute'].'-'.$id_lang.'-'.(int)$usetax; + if (isset($row['id_product_pack'])) + $cache_key .= '-pack'.$row['id_product_pack']; if (isset(self::$producPropertiesCache[$cache_key])) return self::$producPropertiesCache[$cache_key]; diff --git a/install-dev/classes/controllerHttp.php b/install-dev/classes/controllerHttp.php index 99aa236f6..7fccc49a4 100644 --- a/install-dev/classes/controllerHttp.php +++ b/install-dev/classes/controllerHttp.php @@ -370,6 +370,7 @@ abstract class InstallControllerHttp die(Tools::jsonEncode(array( 'success' => (bool)$success, 'message' => $message, + // 'memory' => round(memory_get_peak_usage()/1024/1024, 2).' Mo', ))); }