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

// Merge -> revision 8507

Browse Source
This commit is contained in:
rMalie
2011-09-12 16:17:37 +00:00
parent b404900911
commit a1bdb7b35e
67 changed files with 1938 additions and 1509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ebay/ajax/loadCategoryMatch.php
+4 -1
View File
@@ -5,7 +5,10 @@ if (file_exists($configPath))
{
include('../../../config/config.inc.php');
if (!Tools::getValue('token') || Tools::getValue('token') != Configuration::get('EBAY_SECURITY_TOKEN'))
die('ERROR :X');
die('ERROR : INVALID TOKEN');
// Fix for limit db sql request in time
sleep(1);
$currentPath = Db::getInstance()->getRow('
SELECT ecc.`id_ebay_category`, ec.`id_category_ref`, ec.`id_category_ref_parent`, ec.`level`
modules/ebay/eBayRequest.php
+2 -1
View File
@@ -1086,7 +1086,8 @@ class eBayRequest
if (isset($this->response->OrderArray))
foreach ($this->response->OrderArray->Order as $order)
{
$name = explode(' ', (string)$order->ShippingAddress->Name);
$name = str_replace(array('_', ',', ' '), array('', '', ' '), (string)$order->ShippingAddress->Name);
$name = explode(' ', $name);
$itemList = array();
for ($i = 0; isset($order->TransactionArray->Transaction[$i]); $i++)
{
modules/ebay/ebay.php
+3 -2
View File
@@ -359,8 +359,8 @@ class Ebay extends Module
$id_customer = (int)Db::getInstance()->getValue('SELECT `id_customer` FROM `'._DB_PREFIX_.'customer` WHERE `active` = 1 AND `email` = \''.pSQL($order['email']).'\' AND `deleted` = 0'.(substr(_PS_VERSION_, 0, 3) == '1.3' ? '' : ' AND `is_guest` = 0'));
// Check for empty name
$order['firstname'] = str_replace('_', '', trim($order['firstname']));
$order['familyname'] = str_replace('_', '', trim($order['familyname']));
$order['firstname'] = trim($order['firstname']);
$order['familyname'] = trim($order['familyname']);
if (empty($order['familyname']))
$order['familyname'] = $order['firstname'];
if (empty($order['firstname']))
@@ -966,6 +966,7 @@ class Ebay extends Module
function loadCategoryMatch(id_category)
{
$.ajax({
async: false,
url: "'._MODULE_DIR_.'ebay/ajax/loadCategoryMatch.php?token='.Configuration::get('EBAY_SECURITY_TOKEN').'&id_category=" + id_category + "&time='.pSQL(date('Ymdhis')).'",
success: function(data) { $("#categoryPath" + id_category).html(data); }
});