RELEASE FINALE 1.1.2

m2epro · Sep 21, 2016 · 504bfe9 · 504bfe9
1 parent b81ae0c
commit 504bfe9
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+* 1.1.2 (21/09/2016)
+
+* Added: Ability to Migrate from Magento1 module v6.5.0.6 version
+
 * 1.1.1 (12/09/2016)
 
 * Improvement: Different versions values will be used for Marketing and Setup purposes

diff --git a/Controller/Adminhtml/MigrationFromMagento1/Complete.php b/Controller/Adminhtml/MigrationFromMagento1/Complete.php
@@ -7,7 +7,7 @@
 
 class Complete extends \Ess\M2ePro\Controller\Adminhtml\Base
 {
-    const SUPPORTED_SOURCE_VERSION = '6.5.0.5';
+    const SUPPORTED_SOURCE_VERSION = '6.5.0.6';
 
     protected $dbModifier;
 

diff --git a/Helper/Module.php b/Helper/Module.php
@@ -83,7 +83,7 @@ public function getName()
 
     public function getPublicVersion()
     {
-        return '1.1.1';
+        return '1.1.2';
     }
 
     public function getSetupVersion()
@@ -118,7 +118,7 @@ public function getComposerVersion()
 
     public function getRevision()
     {
-        return '1199';
+        return '1200';
     }
 
     //########################################

diff --git a/Setup/MigrationFromMagento1.php b/Setup/MigrationFromMagento1.php
@@ -286,6 +286,10 @@ private function migrateEbaySynchronizationTemplate()
 
     private function migrateAmazonMarketplaces()
     {
+		$this->getTableModifier('amazon_marketplace')->renameColumn(
+            'is_new_asin_available', 'is_asin_available', true, true
+        );
+
         $this->getConnection()->delete($this->getFullTableName('marketplace'), [
             'id IN (?)' => [27, 32]
         ]);

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "m2epro/ebay-amazon-rakuten-sears-magento-integration-order-import-and-stock-level-synchronization",
     "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": "magento2-module",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "keywords": ["ebay", "amazon", "rakuten", "magento"],
     "homepage": "http://www.m2epro.com/",
     "require": {

diff --git a/versions_history.json b/versions_history.json
@@ -1,4 +1,13 @@
 {
+	"1.1.2": {
+        "versions": {
+            "setup": "1.1.0",
+            "files": "1.1.2"
+        },
+        "revisions": {
+            "svn": "1200"
+        }
+    },
     "1.1.1": {
         "versions": {
             "setup": "1.1.0",