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

// Merge -> revision 8076

Browse Source
This commit is contained in:
rMalie
2011-08-17 08:15:38 +00:00
parent 710be54b89
commit cba5631db0
22 changed files with 100 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ebay/eBayRequest.php
+4
View File
@@ -389,6 +389,7 @@ class eBayRequest
$requestXml .= ' <CategoryID>'.$datas['categoryId'].'</CategoryID>'."\n";
$requestXml .= ' </PrimaryCategory>'."\n";
$requestXml .= ' <ConditionID>1000</ConditionID>'."\n";
if (!isset($datas['noPriceUpdate']))
$requestXml .= ' <StartPrice>'.$datas['price'].'</StartPrice>'."\n";
$requestXml .= ' <CategoryMappingAllowed>true</CategoryMappingAllowed>'."\n";
$requestXml .= ' <Country>FR</Country>'."\n";
@@ -505,6 +506,7 @@ class eBayRequest
$requestXml .= ' <ItemID>'.$datas['itemID'].'</ItemID>'."\n";
$requestXml .= ' <SKU>prestashop-'.$datas['id_product'].'</SKU>';
$requestXml .= ' <Quantity>'.$datas['quantity'].'</Quantity>'."\n";
if (!isset($datas['noPriceUpdate']))
$requestXml .= ' <StartPrice>'.$datas['price'].'</StartPrice>'."\n";
if (Configuration::get('EBAY_SYNC_OPTION_RESYNC') != 1)
{
@@ -734,6 +736,7 @@ class eBayRequest
{
$requestXml .= ' <Variation>'."\n";
$requestXml .= ' <SKU>prestashop-'.$key.'</SKU>'."\n";
if (!isset($datas['noPriceUpdate']))
$requestXml .= ' <StartPrice>'.$variation['price'].'</StartPrice>'."\n";
$requestXml .= ' <Quantity>'.$variation['quantity'].'</Quantity>'."\n";
$requestXml .= ' <VariationSpecifics>'."\n";
@@ -900,6 +903,7 @@ class eBayRequest
{
$requestXml .= ' <Variation>'."\n";
$requestXml .= ' <SKU>prestashop-'.$key.'</SKU>'."\n";
if (!isset($datas['noPriceUpdate']))
$requestXml .= ' <StartPrice>'.$variation['price'].'</StartPrice>'."\n";
$requestXml .= ' <Quantity>'.$variation['quantity'].'</Quantity>'."\n";
$requestXml .= ' <VariationSpecifics>'."\n";
modules/ebay/ebay.php
+10 -2
View File
@@ -269,6 +269,8 @@ class Ebay extends Module
{
// Retrieve product list for eBay (which have matched categories) AND Send each product on eBay
$productsList = Db::getInstance()->ExecuteS('SELECT `id_product` FROM `'._DB_PREFIX_.'product` WHERE '.$sql.' AND `active` = 1 AND `id_category_default` IN (SELECT `id_category` FROM `'._DB_PREFIX_.'ebay_category_configuration` WHERE `id_category` > 0 AND `id_ebay_category` > 0)');
foreach ($productList as $k => $v)
$productList[$k]['noPriceUpdate'] = 1;
if ($productsList)
$this->_syncProducts($productsList);
}
@@ -276,6 +278,8 @@ class Ebay extends Module
{
// Select the sync Categories and Retrieve product list for eBay (which have matched and sync categories) AND Send each product on eBay
$productsList = Db::getInstance()->ExecuteS('SELECT `id_product` FROM `'._DB_PREFIX_.'product` WHERE '.$sql.' AND `active` = 1 AND `id_category_default` IN (SELECT `id_category` FROM `'._DB_PREFIX_.'ebay_category_configuration` WHERE `id_category` > 0 AND `id_ebay_category` > 0 AND `sync` = 1)');
foreach ($productList as $k => $v)
$productList[$k]['noPriceUpdate'] = 1;
if ($productsList)
$this->_syncProducts($productsList);
}
@@ -1319,10 +1323,10 @@ class Ebay extends Module
@set_time_limit(3600);
// Run the products list
foreach ($productsList as $product)
foreach ($productsList as $p)
{
// Product instanciation
$product = new Product((int)$product['id_product'], true, $this->id_lang);
$product = new Product((int)$p['id_product'], true, $this->id_lang);
if (Validate::isLoadedObject($product) && $product->id_category_default > 0)
{
// Load default category matched in cache
@@ -1408,6 +1412,10 @@ class Ebay extends Module
'picturesLarge' => $picturesLarge,
);
// Price Update
if (isset($p['noPriceUpdate']))
$datas['noPriceUpdate'] = $p['noPriceUpdate'];
// Save percent and price discount
if ($categoryDefaultCache[$product->id_category_default]['percent'] < 0)
{