Merge branch 'release/1.2.5'

Author: Richard Sisco

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.2.5 (2017-11-29)
+
+* Fix error when processing queue for some invoices [#94](https://github.com/classyllama/ClassyLlama_AvaTax/issues/94)
+
 ### 1.2.4 (2017-11-27)
 
 * Fix bug that prevents DI compilation [#85](https://github.com/classyllama/ClassyLlama_AvaTax/issues/85)

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.4';
+    const APP_VERSION = '1.2.5';
 }

Helper/TaxClass.php

@@ -238,7 +238,7 @@ public function populateCorrectTaxClasses($items, $storeId)
             if ($item->getParentItem()) {
                 continue;
             }
-            $productIds[] = $item->getOrderItem()->getProduct()->getId();
+            $productIds[] = $item->getOrderItem()->getProductId();
         }
 
         // Loading products via a collection rather than a repository as it's not possible to load a repository with

Model/Quote/GrandTotalDetailsPluginAbstract.php

@@ -29,7 +29,6 @@ class GrandTotalDetailsPluginAbstract extends \Magento\Tax\Model\Quote\GrandTota
          * @param \Magento\Quote\Api\Data\TotalSegmentExtensionFactory $totalSegmentExtensionFactory
          * @param \Magento\Tax\Model\Config $taxConfig
          * @param \ClassyLlama\AvaTax\Api\Data\GrandTotalRatesExtensionFactory $grandTotalRatesExtensionFactory
-         * @param \Magento\Framework\App\ProductMetadataInterface $productMetadata
          * @param \Magento\Framework\Serialize\Serializer\Json $serializer
          */
         public function __construct(
@@ -38,7 +37,6 @@ public function __construct(
             \Magento\Quote\Api\Data\TotalSegmentExtensionFactory $totalSegmentExtensionFactory,
             \Magento\Tax\Model\Config $taxConfig,
             \ClassyLlama\AvaTax\Api\Data\GrandTotalRatesExtensionFactory $grandTotalRatesExtensionFactory,
-            \Magento\Framework\App\ProductMetadataInterface $productMetadata,
             \Magento\Framework\Serialize\Serializer\Json $serializer
         )
         {
@@ -74,15 +72,13 @@ class GrandTotalDetailsPluginAbstract extends \Magento\Tax\Model\Quote\GrandTota
          * @param \Magento\Quote\Api\Data\TotalSegmentExtensionFactory $totalSegmentExtensionFactory
          * @param \Magento\Tax\Model\Config $taxConfig
          * @param \ClassyLlama\AvaTax\Api\Data\GrandTotalRatesExtensionFactory $grandTotalRatesExtensionFactory
-         * @param \Magento\Framework\App\ProductMetadataInterface $productMetadata
          */
         public function __construct(
             \Magento\Tax\Api\Data\GrandTotalDetailsInterfaceFactory $detailsFactory,
             \Magento\Tax\Api\Data\GrandTotalRatesInterfaceFactory $ratesFactory,
             \Magento\Quote\Api\Data\TotalSegmentExtensionFactory $totalSegmentExtensionFactory,
             \Magento\Tax\Model\Config $taxConfig,
-            \ClassyLlama\AvaTax\Api\Data\GrandTotalRatesExtensionFactory $grandTotalRatesExtensionFactory,
-            \Magento\Framework\App\ProductMetadataInterface $productMetadata
+            \ClassyLlama\AvaTax\Api\Data\GrandTotalRatesExtensionFactory $grandTotalRatesExtensionFactory
         )
         {
             $this->grandTotalRatesExtensionFactory = $grandTotalRatesExtensionFactory;

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "classyllama/module-avatax",
     "type": "magento2-module",
-    "version": "1.2.4",
+    "version": "1.2.5",
     "license": "OSL-3.0",
     "require": {
         "magento/framework": "^100.1.0|101.0.*",