Merge remote-tracking branch 'origin/develop' into feature/AVS-421_67-revise-for-magento-2.2-compatibility

Richard Sisco · Richard Sisco · commit 90a2d56bff75 · 2017-11-27T16:10:39.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+### 1.2.3 (2017-11-27)
+
+* Refactor code for compatibility with Magento 2.2 [#85](https://github.com/classyllama/ClassyLlama_AvaTax/issues/85)
+
+### 1.2.2 (2017-11-27)
+
+* Refactor code to display verbose tax summary [#70](https://github.com/classyllama/ClassyLlama_AvaTax/issues/70)
+
 ### 1.2.1 (2017-10-15)
 
 * Refactor code to exclude configurable products from Avalara submission [#78](https://github.com/classyllama/ClassyLlama_AvaTax/issues/78)
diff --git a/Framework/AppInterface.php b/Framework/AppInterface.php
@@ -20,5 +20,5 @@ interface AppInterface
     /**
      * If this is updated it must also be updated in composer.json
      */
-    const APP_VERSION = '1.2.1';
+    const APP_VERSION = '1.2.3';
 }
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "classyllama/module-avatax",
     "type": "magento2-module",
-    "version": "1.2.1",
+    "version": "1.2.3",
     "license": "OSL-3.0",
     "require": {
         "magento/framework": "^100.1.0|101.0.*",

Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@ interface AppInterface`
`20`	`20`	`/**`
`21`	`21`	`* If this is updated it must also be updated in composer.json`
`22`	`22`	`*/`
`23`		`- const APP_VERSION = '1.2.1';`
	`23`	`+ const APP_VERSION = '1.2.3';`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "classyllama/module-avatax",`
`3`	`3`	`"type": "magento2-module",`
`4`		`- "version": "1.2.1",`
	`4`	`+ "version": "1.2.3",`
`5`	`5`	`"license": "OSL-3.0",`
`6`	`6`	`"require": {`
`7`	`7`	`"magento/framework": "^100.1.0\|101.0.*",`