Merge pull request #5 from aligent/4.1

Fixed support for Oro 4.1
aligent · Dec 17, 2020 · 486e879 · 486e879
2 parents 5603b63 + 7fcef8f
commit 486e879
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -4,6 +4,7 @@
     "homepage": "https://github.com/aligent/orocommerce-australia-bundle",
     "keywords": ["Oro", "OroCommerce", "Australia", "Tax", "GST"],
     "license": "OSL-3.0",
+    "version": "4.1",
     "authors": [
         {
             "name": "Jim O'Halloran",
@@ -13,7 +14,7 @@
     ],
     "require": {
         "php": ">=7.1",
-        "oro/commerce": ">=1"
+        "oro/commerce": ">=4.1"
     },
     "autoload": {
         "psr-4": { "Aligent\\AustraliaBundle\\": "./src/" },

diff --git a/src/Migrations/Data/ORM/LoadAuTaxTableRatesData.php b/src/Migrations/Data/ORM/LoadAuTaxTableRatesData.php
@@ -91,8 +91,9 @@ private function loadCustomerTaxCodes(ObjectManager $manager, $customerTaxCodes)
      */
     private function loadProductTaxCodes(ObjectManager $manager, $productTaxCodes)
     {
+        $org = $this->getAdminUser($manager)->getOrganization();
         foreach ($productTaxCodes as $code => $data) {
-            $taxCode = $this->entitiesFactory->createProductTaxCode($code, $data['description'], $manager, $this);
+            $taxCode = $this->entitiesFactory->createProductTaxCode($code, $data['description'], $org, $manager, $this);
         }
 
         return $this;