diff --git a/app/code/community/Ess/M2ePro/CHANGELOG b/app/code/community/Ess/M2ePro/CHANGELOG index 100e9edb8..33ed457cd 100644 --- a/app/code/community/Ess/M2ePro/CHANGELOG +++ b/app/code/community/Ess/M2ePro/CHANGELOG @@ -1,3 +1,8 @@ +* 6.4.7.1 (r11020) (05/12/2016) + +* Fix: [Amazon] Ability to use Repricing Service without the need to contact support of M2E Pro +* Fix: [Amazon] "Warning: Illegal string offset 'product_price' in /app/code/community/Ess/M2ePro/Model/Amazon/Repricing/Synchronization/ActualPrice.php + * 6.4.7 (r10970) (28/11/2016) * Added: [Amazon] Ability to use Repricing Service without the need to contact support of M2E Pro diff --git a/app/code/community/Ess/M2ePro/Helper/Module.php b/app/code/community/Ess/M2ePro/Helper/Module.php index 8c90b27c0..3691be136 100644 --- a/app/code/community/Ess/M2ePro/Helper/Module.php +++ b/app/code/community/Ess/M2ePro/Helper/Module.php @@ -72,7 +72,7 @@ public function getVersion() public function getRevision() { - $revision = '10970'; + $revision = '11020'; if ($revision == str_replace('|','#','|REVISION|')) { $revision = (int)exec('svnversion'); diff --git a/app/code/community/Ess/M2ePro/Model/Amazon/Repricing/Synchronization/ActualPrice.php b/app/code/community/Ess/M2ePro/Model/Amazon/Repricing/Synchronization/ActualPrice.php index a616a1102..794f85631 100644 --- a/app/code/community/Ess/M2ePro/Model/Amazon/Repricing/Synchronization/ActualPrice.php +++ b/app/code/community/Ess/M2ePro/Model/Amazon/Repricing/Synchronization/ActualPrice.php @@ -158,7 +158,7 @@ private function updateListingsOthersPrices(array $offersProductPrices) $connWrite->update( $resource->getTableName('m2epro_amazon_listing_other'), array( - 'online_price' => $offerProductPrice['product_price'], + 'online_price' => $offerProductPrice, ), array('listing_other_id = ?' => $listingOtherId) ); diff --git a/app/code/community/Ess/M2ePro/etc/config.xml b/app/code/community/Ess/M2ePro/etc/config.xml index 91834c710..44b04706f 100644 --- a/app/code/community/Ess/M2ePro/etc/config.xml +++ b/app/code/community/Ess/M2ePro/etc/config.xml @@ -2,7 +2,7 @@ - 6.4.7 + 6.4.7.1 diff --git a/app/code/community/Ess/M2ePro/sql/M2ePro_setup/mysql4-install-6.4.7.php b/app/code/community/Ess/M2ePro/sql/M2ePro_setup/mysql4-install-6.4.7.1.php similarity index 99% rename from app/code/community/Ess/M2ePro/sql/M2ePro_setup/mysql4-install-6.4.7.php rename to app/code/community/Ess/M2ePro/sql/M2ePro_setup/mysql4-install-6.4.7.1.php index 8d549a956..7cd5aad49 100644 --- a/app/code/community/Ess/M2ePro/sql/M2ePro_setup/mysql4-install-6.4.7.php +++ b/app/code/community/Ess/M2ePro/sql/M2ePro_setup/mysql4-install-6.4.7.1.php @@ -2895,7 +2895,7 @@ ('/component/amazon/', 'allowed', '1', '0 - disable, \r\n1 - enable', '2013-05-08 00:00:00', '2013-05-08 00:00:00'), ('/amazon/order/settings/marketplace_25/', 'use_first_street_line_as_company', '1', '0 - disable, \r\n1 - enable', '2013-05-08 00:00:00', '2013-05-08 00:00:00'), - ('/amazon/repricing/', 'mode', '0', '0 - disable, \r\n1 - enable', '2013-05-08 00:00:00', '2013-05-08 00:00:00'), + ('/amazon/repricing/', 'mode', '1', '0 - disable, \r\n1 - enable', '2013-05-08 00:00:00', '2013-05-08 00:00:00'), ('/amazon/repricing/', 'base_url', 'https://repricer.m2epro.com/connector/m2epro/', 'Repricing Tool base url', '2013-05-08 00:00:00', '2013-05-08 00:00:00'); diff --git a/app/code/community/Ess/M2ePro/sql/M2ePro_setup/mysql4-upgrade-6.4.7-6.4.7.1.php b/app/code/community/Ess/M2ePro/sql/M2ePro_setup/mysql4-upgrade-6.4.7-6.4.7.1.php new file mode 100644 index 000000000..2cc49ad99 --- /dev/null +++ b/app/code/community/Ess/M2ePro/sql/M2ePro_setup/mysql4-upgrade-6.4.7-6.4.7.1.php @@ -0,0 +1,25 @@ +startSetup(); + +$connection = $installer->getConnection(); + +//######################################## + +/* + UPDATE `m2epro_config` + SET `value` = 1 + WHERE `group` = '/amazon/repricing/' AND `key` = 'mode' + */ + +$installer->getMainConfigModifier()->getEntity('/amazon/repricing/', 'mode')->updateValue(1); + +//######################################## + +$installer->endSetup(); + +//######################################## \ No newline at end of file diff --git a/composer.json b/composer.json index 97d3916c6..14029c66d 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "m2epro/magento1-extension", "description": "M2E Pro is a Magento trusted (TM), award-winning extension, which allows merchants of all sizes to fully integrate Magento based system(s) into eBay/Amazon/Rakuten.com platforms.", "type": "magento-module", - "version": "6.4.7", + "version": "6.4.7.1", "keywords": ["ebay", "amazon", "rakuten", "magento"], "homepage": "http://www.m2epro.com/", "require": {