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

[-] WS: Fix retrieve of stock_availables when stock is shared on the shop group

Browse Source
This commit is contained in:
Rémi Gaillard
2013-08-20 17:18:07 +02:00
parent e80e2ac5e3
commit 3fcb65ca0f
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/webservice/WebserviceRequest.php
+9 -1
View File
@@ -1264,14 +1264,22 @@ class WebserviceRequestCore
$assoc = Shop::getAssoTable($this->resourceConfiguration['retrieveData']['table']); $assoc = Shop::getAssoTable($this->resourceConfiguration['retrieveData']['table']);
if ($assoc !== false) if ($assoc !== false)
{ {
$check_shop_group = false;
$sql = 'SELECT 1 $sql = 'SELECT 1
FROM `'.bqSQL(_DB_PREFIX_.$this->resourceConfiguration['retrieveData']['table']); FROM `'.bqSQL(_DB_PREFIX_.$this->resourceConfiguration['retrieveData']['table']);
if ($assoc['type'] != 'fk_shop') if ($assoc['type'] != 'fk_shop')
$sql .= '_'.$assoc['type']; $sql .= '_'.$assoc['type'];
else
{
$def = ObjectModel::getDefinition($this->resourceConfiguration['retrieveData']['className']);
if (isset($def['fields']) && isset($def['fields']['id_shop_group']))
$check_shop_group = true;
}
$sql .= '`'; $sql .= '`';
foreach (self::$shopIDs as $id_shop) foreach (self::$shopIDs as $id_shop)
$OR[] = ' id_shop = '.(int)$id_shop.' '; $OR[] = ' (id_shop = '.(int)$id_shop.($check_shop_group ? ' OR (id_shop = 0 AND id_shop_group='.(int)Shop::getGroupFromShop((int)$id_shop).')' : '').') ';
$check = ' WHERE ('.implode('OR', $OR).') AND `'.bqSQL($this->resourceConfiguration['fields']['id']['sqlId']).'` = '.(int)$this->urlSegment[1]; $check = ' WHERE ('.implode('OR', $OR).') AND `'.bqSQL($this->resourceConfiguration['fields']['id']['sqlId']).'` = '.(int)$this->urlSegment[1];
if (!Db::getInstance()->getValue($sql.$check)) if (!Db::getInstance()->getValue($sql.$check))