Removed EU Online Validation. VIES not available.

Updated Interface between main module and country modules.

Author: gwharton

Api/Data/TaxSchemeInterface.php

@@ -8,27 +8,27 @@ interface TaxSchemeInterface
 {
     /**
      * @param string $countryCode
-     * @param string|null $taxId
+     * @param string $taxId
      * @return TaxIdCheckResponseInterface
      */
     public function checkTaxId(
         string $countryCode,
-        ?string $taxId
+        string $taxId
     ): TaxIdCheckResponseInterface;
 
     /**
      * @param string $customerCountryCode
-     * @param string|null $customerPostCode
      * @param bool $taxIdValidated
      * @param float $orderValue
+     * @param string|null $customerPostCode
      * @param int|null $storeId
      * @return int|null
      */
     public function getCustomerGroup(
         string $customerCountryCode,
-        ?string $customerPostCode,
         bool $taxIdValidated,
         float $orderValue,
+        ?string $customerPostCode,
         ?int $storeId
     ): ?int;
 

Controller/Adminhtml/Createorder/Validate.php

@@ -112,9 +112,9 @@ public function execute()
 
                 $groupId = $this->autoCustomerGroup->getCustomerGroup(
                     $countryCode,
-                    $postcode,
                     $taxIdCheckResponse->getIsValid(),
                     $quote,
+                    $postcode,
                     $storeId
                 );
                 $responseData = [

Model/AutoCustomerGroup.php

@@ -61,28 +61,28 @@ public function checkTaxId(
 
     /**
      * @param string $customerCountryCode
-     * @param string $customerPostCode
      * @param TaxIdCheckResponseInterface $validationResults
      * @param Quote $quote
-     * @param int $storeId
+     * @param string|null $customerPostCode
+     * @param int|null $storeId
      * @return int|null
      */
     public function getCustomerGroup(
         string $customerCountryCode,
-        string $customerPostCode,
         bool $taxIdValidated,
         Quote $quote,
-        int $storeId
+        ?string $customerPostCode,
+        ?int $storeId
     ): ?int {
         if ($this->isModuleEnabled($storeId)) {
             foreach ($this->taxSchemes->getEnabledTaxSchemes($storeId) as $taxScheme) {
                 if (in_array($customerCountryCode, $taxScheme->getSchemeCountries())) {
                     $schemeOrderValue = $taxScheme->getOrderValue($quote);
                     return $taxScheme->getCustomerGroup(
                         $customerCountryCode,
-                        $customerPostCode,
                         $taxIdValidated,
                         $schemeOrderValue,
+                        $customerPostCode,
                         $storeId
                     );
                 }

Model/Collector/AutoCustomerGroup.php

@@ -179,9 +179,9 @@ public function collect(
         //Get the auto assigned group for customer, returns null if group shouldn't be changed.
         $newGroup = $this->autoCustomerGroup->getCustomerGroup(
             $quoteAddress->getCountryId(),
-            $quoteAddress->getPostcode() ?: "",
             $validationResult ? $validationResult->getIsValid() : false,
             $quote,
+            $quoteAddress->getPostcode(),
             $storeId
         );
 

Plugin/Customer/BeforeAddressSaveObserverPlugin.php

@@ -64,7 +64,6 @@ public function aroundExecute(
             //Customer group at this stage, as the this depends on order value, which we
             //Don't have at this stage.
             if (!empty($customerAddress->getVatId()) &&
-                !empty($customerAddress->getVatId()) &&
                 $customer->getStore()->getId()) {
                 $taxIdCheckResponse = $this->autoCustomerGroup->checkTaxId(
                     $customerAddress->getCountryId(),