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

// Add Core prefix for Stock and ProductCompare classes + fix main URL on shop URL + add some translation

Browse Source
This commit is contained in:
rMalie
2011-08-16 14:13:04 +00:00
parent aeed35022d
commit 1dbd4fce4e
6 changed files with 146 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/CompareProduct.php
+1 -1
View File
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA
*/
class CompareProduct extends ObjectModel
class CompareProductCore extends ObjectModel
{
public $id;
classes/Shop.php
+31 -32
View File
@@ -37,9 +37,11 @@ class ShopCore extends ObjectModel
public $id_category;
public $deleted;
protected $theme_name;
protected $physical_uri;
protected $virtual_uri;
public $theme_name;
public $physical_uri;
public $virtual_uri;
public $domain;
public $domain_ssl;
/**
* @var GroupShop
@@ -119,6 +121,31 @@ class ShopCore extends ObjectModel
$fields['deleted'] = (int)$this->deleted;
return $fields;
}
public function __construct($id = NULL, $id_lang = NULL, $id_shop = NULL)
{
parent::__construct($id, $id_lang, $id_shop);
if ($this->id)
{
$sql = 'SELECT su.physical_uri, su.virtual_uri, su.domain, su.domain_ssl, t.name
FROM '._DB_PREFIX_.'shop s
LEFT JOIN '._DB_PREFIX_.'shop_url su ON (s.id_shop = su.id_shop)
LEFT JOIN '._DB_PREFIX_.'theme t ON (t.id_theme = s.id_theme)
WHERE s.id_shop = '.$this->id.'
AND s.active = 1
AND s.deleted = 0
AND su.main = 1';
if (!$row = Db::getInstance()->getRow($sql))
return ;
$this->theme_name = $row['name'];
$this->physical_uri = $row['physical_uri'];
$this->virtual_uri = $row['virtual_uri'];
$this->domain = $row['domain'];
$this->domain_ssl = $row['domain_ssl'];
}
}
public function add($autodate = true, $nullValues = false)
{
@@ -182,7 +209,7 @@ class ShopCore extends ObjectModel
$excluded_uris[] = $directory;
// Find current shop from URL
if (!$id_shop = Tools::getValue('id_shop'))
if (!$id_shop = Tools::getValue('id_shop') && !defined('PS_ADMIN_DIR'))
{
$sql = 'SELECT s.id_shop, CONCAT(su.physical_uri, su.virtual_uri) AS uri
FROM '._DB_PREFIX_.'shop_url su
@@ -211,30 +238,6 @@ class ShopCore extends ObjectModel
return $shop;
}
/**
* Load some additional data of current shop (theme name, shop uri)
*
* @return bool
*/
protected function loadShopInfos()
{
$sql = 'SELECT su.physical_uri, su.virtual_uri, t.name
FROM '._DB_PREFIX_.'shop s
LEFT JOIN '._DB_PREFIX_.'shop_url su ON (s.id_shop = su.id_shop)
LEFT JOIN '._DB_PREFIX_.'theme t ON (t.id_theme = s.id_theme)
WHERE s.id_shop = '.$this->id.'
AND s.active = 1
AND s.deleted = 0
AND su.main = 1';
if (!$row = Db::getInstance()->getRow($sql))
return false;
$this->theme_name = $row['name'];
$this->physical_uri = $row['physical_uri'];
$this->virtual_uri = $row['virtual_uri'];
return true;
}
/**
* Get shop theme name
*
@@ -242,8 +245,6 @@ class ShopCore extends ObjectModel
*/
public function getTheme()
{
if (!$this->theme_name)
$this->loadShopInfos();
return $this->theme_name;
}
@@ -255,8 +256,6 @@ class ShopCore extends ObjectModel
*/
public function getBaseURI()
{
if (!$this->theme_name)
$this->loadShopInfos();
return $this->physical_uri.$this->virtual_uri;
}
classes/ShopUrl.php
+7 -5
View File
@@ -49,13 +49,13 @@ class ShopUrlCore extends ObjectModel
public function getFields()
{
$this->validateFields();
$this->physical_uri = trim($this->physical_uri, '/');
if ($this->physical_uri)
$this->physical_uri = preg_replace('#/+#', '/', '/'.$this->physical_uri.'/');
else
$this->physical_uri = '/';
$this->virtual_uri = trim($this->virtual_uri, '/');
if ($this->virtual_uri)
$this->virtual_uri = preg_replace('#/+#', '/', trim($this->virtual_uri, '/')).'/';
@@ -90,8 +90,10 @@ class ShopUrlCore extends ObjectModel
public function setMain()
{
$res = Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'shop_url SET main=0 WHERE id_shop = '.(int)$this->id_shop);
$res &= Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'shop_url SET main=1 WHERE id_shop_url = '.(int)$this->id);
$res = Db::getInstance()->autoExecute(_DB_PREFIX_.'shop_url', array('main' => 0), 'UPDATE', 'id_shop = '.(int)$this->id_shop);
$res &= Db::getInstance()->autoExecute(_DB_PREFIX_.'shop_url', array('main' => 1), 'UPDATE', 'id_shop_url = '.(int)$this->id);
$this->main = true;
return $res;
}
@@ -121,7 +123,7 @@ class ShopUrlCore extends ObjectModel
if (!self::$main_domain)
self::$main_domain = Db::getInstance()->getValue('SELECT domain
FROM '._DB_PREFIX_.'shop_url
WHERE main=1 AND id_shop = '.Context::getContext()->shop->getID());
WHERE main=1 AND id_shop = '.Context::getContext()->shop->getID(true));
return self::$main_domain;
}
classes/Stock.php
+1 -1
View File
@@ -28,7 +28,7 @@
/**
* @since 1.5.0
*/
class Stock extends ObjectModel
class StockCore extends ObjectModel
{
public $id_product;
public $id_product_attribute;