dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// improve config.inc.php code, id_shop is inserted in the cookie name. Debug in Carrier class, max_deep is now max_depth

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11194 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mBertholino
2011-12-14 08:59:55 +00:00
parent d1baa08bf8
commit 0a1e6cf127
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Carrier.php
View File

@@ -132,7 +132,7 @@ class CarrierCore extends ObjectModel
'shipping_method' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
'max_width' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
'max_height' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
'max_deep' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
'max_depth' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
'max_weight' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
'grade' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'size' => 1),
'external_module_name' => array('type' => self::TYPE_STRING, 'size' => 64),

14
config/config.inc.php
View File

@@ -121,7 +121,7 @@ $cookieLifetime = (time() + (((int)Configuration::get('PS_COOKIE_LIFETIME_BO') >
if (defined('_PS_ADMIN_DIR_'))
$cookie = new Cookie('psAdmin', '', $cookieLifetime);
else
$cookie = new Cookie('ps', '', $cookieLifetime);
$cookie = new Cookie('ps'.Context::getContext()->shop->getID(), '', $cookieLifetime);
Context::getContext()->cookie = $cookie;
/* Create employee if in BO, customer else */
@@ -138,6 +138,18 @@ else
{
$customer = new Customer($cookie->id_customer);
$customer->logged = $cookie->logged;
if (!isset($cookie->id_cart))
{
$groupShop = new GroupShop(Context::getContext()->shop->id_group_shop);
foreach (Shop::getSharedShops(Context::getContext()->shop->getID(), Shop::SHARE_ORDER) as $k => $v)
{
$cart = new Cart();
$id_cart = Db::getInstance()->getValue('SELECT `id_cart` FROM `'._DB_PREFIX_.'cart` WHERE `id_customer` = "'.(int)$customer->id.'" ORDER BY `id_cart` DESC');
if (Db::getInstance()->getValue('SELECT `quantity` FROM `'._DB_PREFIX_.'cart_product` WHERE `id_cart` = "'.(int)$id_cart.'"') > 0)
$cookie->id_cart = $id_cart;
}
}
}
else
$customer = new Customer();