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

// Merge -> revision 8851

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8854 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-28 16:03:30 +00:00
parent ccd0383e88
commit be8d2136be
8 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ebay/config.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<module>
<name>ebay</name>
<displayName><![CDATA[eBay]]></displayName>
<version><![CDATA[1.2.5]]></version>
<version><![CDATA[1.2.6]]></version>
<description><![CDATA[Open your shop on the eBay market place !]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[market_place]]></tab>
modules/ebay/eBayRequest.php
+1 -1
View File
@@ -57,7 +57,7 @@ class eBayRequest
private $compatibilityLevel;
private $debug = true;
private $debug = false;
/******************************************************************/
/** Constructor And Request Methods *******************************/
modules/ebay/ebay.php
+8 -5
View File
@@ -59,7 +59,7 @@ class Ebay extends Module
{
$this->name = 'ebay';
$this->tab = 'market_place';
$this->version = '1.2.5';
$this->version = '1.2.6';
$this->author = 'PrestaShop';
parent::__construct ();
$this->displayName = $this->l('eBay');
@@ -476,8 +476,11 @@ class Ebay extends Module
Db::getInstance()->autoExecute(_DB_PREFIX_.'ebay_order', array('id_order_ref' => pSQL($order['id_order_ref']), 'id_order' => (int)$id_order), 'INSERT');
}
else
{
$cartAdd->delete();
$orderList[$korder]['errors'][] = $this->l('Could not add product to cart (maybe your stock quantity is 0)');
}
}
else
$orderList[$korder]['errors'][] = $this->l('Could not found products in database');
}
@@ -1535,9 +1538,9 @@ class Ebay extends Module
$images = $product->getImages($this->id_lang);
foreach ($images as $image)
{
$pictures[] = $prefix.$this->context->link->getImageLink('', $product->id.'-'.$image['id_image'], NULL);
$picturesMedium[] = $prefix.$this->context->link->getImageLink('', $product->id.'-'.$image['id_image'], 'medium');
$picturesLarge[] = $prefix.$this->context->link->getImageLink('', $product->id.'-'.$image['id_image'], 'large');
$pictures[] = str_replace('https://', 'http://', $prefix.$this->context->link->getImageLink('', $product->id.'-'.$image['id_image'], null));
$picturesMedium[] = str_replace('https://', 'http://', $prefix.$this->context->link->getImageLink('', $product->id.'-'.$image['id_image'], 'medium'));
$picturesLarge[] = str_replace('https://', 'http://', $prefix.$this->context->link->getImageLink('', $product->id.'-'.$image['id_image'], 'large'));
}
// Load Variations
@@ -1860,7 +1863,7 @@ class Ebay extends Module
if (!Configuration::get('EBAY_PAYPAL_EMAIL'))
return '<p><b>'.$this->l('You have to configure "General Settings" tab before using this tab.').'</b></p><br />';
$dateLastImport = '-';
if (file_exists(dirname(__FILE__).'/log/orders.php'))
include(dirname(__FILE__).'/log/orders.php');
modules/mondialrelay/classes/MRCreateTickets.php
+5 -5
View File
@@ -94,11 +94,11 @@ class MRCreateTickets implements IMondialRelayWSMethod
'Expe_Tel1' => array(
'required' => true,
'value' => '',
'regexValidation' => '#^((00|\+)33|0)[0-9][0-9]{8}$#'),
'regexValidation' => '#^((00|\+)[1-9]{2}|0)[0-9][0-9]{7,8}$#'),
'Expe_Tel2' => array(
'required' => false,
'value' => '',
'regexValidation' => '#^((00|\+)33|0)[0-9][0-9]{8}$#'),
'regexValidation' => '#^((00|\+)[1-9]{2}|0)[0-9][0-9]{7,8}$#'),
'Expe_Mail' => array(
'required' => false,
'value' => '',
@@ -139,11 +139,11 @@ class MRCreateTickets implements IMondialRelayWSMethod
'Dest_Tel1' => array(
'required' => false,
'value' => '',
'regexValidation' => '#^((00|\+)33|0)[0-9][0-9]{8}$#'),
'regexValidation' => '#^((00|\+)[1-9]{2}|0)[0-9][0-9]{7,8}$#'),
'Dest_Tel2' => array(
'required' => false,
'value' => '',
'regexValidation' => '#^((00|\+)33|0)[0-9][0-9]{8}$#'),
'regexValidation' => '#^((00|\+)[1-9]{2}|0)[0-9][0-9]{7,8}$#'),
'Dest_Mail' => array(
'required' => false,
'value' => '',
@@ -331,7 +331,7 @@ class MRCreateTickets implements IMondialRelayWSMethod
$tmp['ModeLiv']['value'] = $orderDetail['mr_ModeLiv'];
$tmp['NDossier']['value'] = $orderDetail['id_order'];
$tmp['NClient']['value'] = $orderDetail['id_customer'];
$tmp['Dest_Langage']['value'] = $destIsoCode;
$tmp['Dest_Langage']['value'] = 'FR'; //Language::getIsoById($orderDetail['id_lang']);
$tmp['Dest_Ad1']['value'] = $deliveriesAddress->lastname;
$tmp['Dest_Ad2']['value'] = $deliveriesAddress->address2;
$tmp['Dest_Ad3']['value'] = $deliveriesAddress->address1;
modules/mondialrelay/mondialrelay.php
+2 -1
View File
@@ -59,7 +59,7 @@ class MondialRelay extends Module
{
$this->name = 'mondialrelay';
$this->tab = 'shipping_logistics';
$this->version = '1.7.3';
$this->version = '1.7.4';
parent::__construct();
@@ -1140,6 +1140,7 @@ class MondialRelay extends Module
o.`id_order` as id_order,
o.`id_customer` as id_customer,
o.`id_cart` as id_cart,
o.`id_lang` as id_lang,
mrs.`id_mr_selected` as id_mr_selected,
CONCAT(c.`firstname`, \' \', c.`lastname`) AS `customer`,
o.`total_paid_real` as total, o.`total_shipping` as shipping,