// Merge -> revision 8342

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8344 b9a71923-0436-4b27-9f14-aed3839534dd

modules/ebay/ajax/eBaySyncProduct.php

@@ -4,6 +4,7 @@ $configPath = '../../../config/config.inc.php';
 if (file_exists($configPath))
 {
 	include('../../../config/config.inc.php');
+	include('../../../init.php');
 	include('../../../modules/ebay/ebay.php');
 	if (!Tools::getValue('token') || Tools::getValue('token') != Configuration::get('EBAY_SECURITY_TOKEN'))
 		die('ERROR : Invalid Token');

modules/ebay/config.xml

@@ -2,7 +2,11 @@
 <module>
 	<name>ebay</name>
 	<displayName><![CDATA[eBay]]></displayName>
+<<<<<<< .working
 	<version><![CDATA[1.2.1]]></version>
+=======
+	<version><![CDATA[1.2.3]]></version>
+>>>>>>> .merge-right.r8342
 	<description><![CDATA[Open your shop on the eBay market place !]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[market_place]]></tab>

modules/ebay/ebay.php

@@ -59,7 +59,7 @@ class Ebay extends Module
 	{
 		$this->name = 'ebay';
 		$this->tab = 'market_place';
-		$this->version = '1.2.2';
+		$this->version = '1.2.3';
 		$this->author = 'PrestaShop';
 		parent::__construct ();
 		$this->displayName = $this->l('eBay');
@@ -1292,6 +1292,8 @@ class Ebay extends Module
 				}
 			}
 			$html .= '</tbody></table>';
+			if (Tools::getValue('section') == 'sync')
+				$html .= '<script>$(document).ready(function() { eBaySync(); });</script>';
 
 			if (Configuration::get('EBAY_SYNC_MODE') == 'B')
 			{
@@ -1299,10 +1301,7 @@ class Ebay extends Module
 					$(document).ready(function() {
 						$("#catSync").show("slow");
 						$("#ebay_sync_mode2").attr("checked", true);
-						';
-				if (Tools::getValue('section') == 'sync')
-					$html .= 'eBaySync();';
-				$html .= '});
+					});
 				</script>';
 			}