From 7245686bc00357d7194ebc6ee1c114f7954a3afc Mon Sep 17 00:00:00 2001
From: Drischie <42138053+Drischie@users.noreply.github.com>
Date: Mon, 6 Aug 2018 12:21:56 +0200
Subject: [PATCH 1/6] Remove leading Countrycode from EU-VAT-Numbers

EU-VAT-Numbers has always leading Countrycodes. To validate VAT-Number we have to remove it before sending the request.
After we've checked if country is in eu we will remove the Countrycode and send the request.
---
 app/code/Magento/Customer/Model/Vat.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Vat.php b/app/code/Magento/Customer/Model/Vat.php
index 9822e2ad1b80e..53d0557832529 100644
--- a/app/code/Magento/Customer/Model/Vat.php
+++ b/app/code/Magento/Customer/Model/Vat.php
@@ -184,9 +184,9 @@ public function checkVatNumber($countryCode, $vatNumber, $requesterCountryCode =
 
             $requestParams = [];
             $requestParams['countryCode'] = $countryCode;
-            $requestParams['vatNumber'] = str_replace([' ', '-'], ['', ''], $vatNumber);
+            $this->isCountryInEU($countryCode) ? $requestParams['vatNumber'] = str_replace([' ', '-', $countryCode], ['', '', ''], $vatNumber) : $requestParams['vatNumber'] = str_replace([' ', '-'], ['', ''], $vatNumber);
             $requestParams['requesterCountryCode'] = $requesterCountryCode;
-            $requestParams['requesterVatNumber'] = str_replace([' ', '-'], ['', ''], $requesterVatNumber);
+            $this->isCountryInEU($requesterCountryCode) ? $requestParams['requesterVatNumber'] = str_replace([' ', '-', $requesterCountryCode], ['', '', ''], $requesterVatNumber) : $requestParams['requesterVatNumber'] = str_replace([' ', '-'], ['', ''], $requesterVatNumber);
 
             // Send request to service
             $result = $soapClient->checkVatApprox($requestParams);

From 2fad6ae885ced5a01d965c4a9af310b16772c4d1 Mon Sep 17 00:00:00 2001
From: Drischie <42138053+Drischie@users.noreply.github.com>
Date: Tue, 7 Aug 2018 10:31:22 +0200
Subject: [PATCH 2/6] Removed $requestParams[] from ternary Operator

Moved variable $requestParams[] out of ternary operator.
To do this, the new variables $vatNumberSanitized and $requesterVatNumberSanitized are introduced.
---
 app/code/Magento/Customer/Model/Vat.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Vat.php b/app/code/Magento/Customer/Model/Vat.php
index 53d0557832529..f0e82a3057305 100644
--- a/app/code/Magento/Customer/Model/Vat.php
+++ b/app/code/Magento/Customer/Model/Vat.php
@@ -184,10 +184,11 @@ public function checkVatNumber($countryCode, $vatNumber, $requesterCountryCode =
 
             $requestParams = [];
             $requestParams['countryCode'] = $countryCode;
-            $this->isCountryInEU($countryCode) ? $requestParams['vatNumber'] = str_replace([' ', '-', $countryCode], ['', '', ''], $vatNumber) : $requestParams['vatNumber'] = str_replace([' ', '-'], ['', ''], $vatNumber);
+            $this->isCountryInEU($countryCode) ? $vatNumberSanitized = str_replace([' ', '-', $countryCode], ['', '', ''], $vatNumber) : $vatNumberSanitized = str_replace([' ', '-'], ['', ''], $vatNumber);
+            $requestParams['vatNumber'] = $vatNumberSanitized;
             $requestParams['requesterCountryCode'] = $requesterCountryCode;
-            $this->isCountryInEU($requesterCountryCode) ? $requestParams['requesterVatNumber'] = str_replace([' ', '-', $requesterCountryCode], ['', '', ''], $requesterVatNumber) : $requestParams['requesterVatNumber'] = str_replace([' ', '-'], ['', ''], $requesterVatNumber);
-
+            $this->isCountryInEU($requesterCountryCode) ? $requesterVatNumberSanitized = str_replace([' ', '-', $requesterCountryCode], ['', '', ''], $requesterVatNumber) : $requesterVatNumberSanitized = str_replace([' ', '-'], ['', ''], $requesterVatNumber);
+            $requestParams['requesterVatNumber'] = $requesterVatNumberSanitized;
             // Send request to service
             $result = $soapClient->checkVatApprox($requestParams);
 

From ea9f240fb37b0f5c92e274d37f5e73a5407af495 Mon Sep 17 00:00:00 2001
From: Drischie <42138053+Drischie@users.noreply.github.com>
Date: Tue, 7 Aug 2018 13:39:28 +0200
Subject: [PATCH 3/6] Changed ternary to multiline

Changed one-line ternary to multiline ternary to not exceed line-size-limit of 120 Characters.
---
 app/code/Magento/Customer/Model/Vat.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Vat.php b/app/code/Magento/Customer/Model/Vat.php
index f0e82a3057305..f1d66da80bf02 100644
--- a/app/code/Magento/Customer/Model/Vat.php
+++ b/app/code/Magento/Customer/Model/Vat.php
@@ -184,10 +184,14 @@ public function checkVatNumber($countryCode, $vatNumber, $requesterCountryCode =
 
             $requestParams = [];
             $requestParams['countryCode'] = $countryCode;
-            $this->isCountryInEU($countryCode) ? $vatNumberSanitized = str_replace([' ', '-', $countryCode], ['', '', ''], $vatNumber) : $vatNumberSanitized = str_replace([' ', '-'], ['', ''], $vatNumber);
+            $this->isCountryInEU($countryCode) 
+                ? $vatNumberSanitized = str_replace([' ', '-', $countryCode], ['', '', ''], $vatNumber) 
+                : $vatNumberSanitized = str_replace([' ', '-'], ['', ''], $vatNumber);
             $requestParams['vatNumber'] = $vatNumberSanitized;
             $requestParams['requesterCountryCode'] = $requesterCountryCode;
-            $this->isCountryInEU($requesterCountryCode) ? $requesterVatNumberSanitized = str_replace([' ', '-', $requesterCountryCode], ['', '', ''], $requesterVatNumber) : $requesterVatNumberSanitized = str_replace([' ', '-'], ['', ''], $requesterVatNumber);
+            $this->isCountryInEU($requesterCountryCode) 
+                ? $requesterVatNumberSanitized = str_replace([' ', '-', $requesterCountryCode], ['', '', ''], $requesterVatNumber) 
+                : $requesterVatNumberSanitized = str_replace([' ', '-'], ['', ''], $requesterVatNumber);
             $requestParams['requesterVatNumber'] = $requesterVatNumberSanitized;
             // Send request to service
             $result = $soapClient->checkVatApprox($requestParams);

From e498f2869a71c1161b64ed9b7fc75387421db2d6 Mon Sep 17 00:00:00 2001
From: Drischie <42138053+Drischie@users.noreply.github.com>
Date: Fri, 10 Aug 2018 11:34:12 +0200
Subject: [PATCH 4/6] Shorten Variable Name requesterVatNumberSanitized

Changed newly introduced variable VatNumberSanitized to reqVatNumSanitized to meet coding standards.
---
 app/code/Magento/Customer/Model/Vat.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Vat.php b/app/code/Magento/Customer/Model/Vat.php
index f1d66da80bf02..a4440ea518fb8 100644
--- a/app/code/Magento/Customer/Model/Vat.php
+++ b/app/code/Magento/Customer/Model/Vat.php
@@ -190,9 +190,9 @@ public function checkVatNumber($countryCode, $vatNumber, $requesterCountryCode =
             $requestParams['vatNumber'] = $vatNumberSanitized;
             $requestParams['requesterCountryCode'] = $requesterCountryCode;
             $this->isCountryInEU($requesterCountryCode) 
-                ? $requesterVatNumberSanitized = str_replace([' ', '-', $requesterCountryCode], ['', '', ''], $requesterVatNumber) 
-                : $requesterVatNumberSanitized = str_replace([' ', '-'], ['', ''], $requesterVatNumber);
-            $requestParams['requesterVatNumber'] = $requesterVatNumberSanitized;
+                ? $reqVatNumSanitized = str_replace([' ', '-', $requesterCountryCode], ['', '', ''], $requesterVatNumber) 
+                : $reqVatNumSanitized = str_replace([' ', '-'], ['', ''], $requesterVatNumber);
+            $requestParams['requesterVatNumber'] = $reqVatNumSanitized;
             // Send request to service
             $result = $soapClient->checkVatApprox($requestParams);
 

From 27c1d74f5cd06eb6e0815ddfe66ff3b4d5af445c Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Thu, 16 Aug 2018 16:57:59 +0300
Subject: [PATCH 5/6] Minor fixes for better code readability

---
 app/code/Magento/Customer/Model/Vat.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Vat.php b/app/code/Magento/Customer/Model/Vat.php
index a4440ea518fb8..c45dd91599c6b 100644
--- a/app/code/Magento/Customer/Model/Vat.php
+++ b/app/code/Magento/Customer/Model/Vat.php
@@ -184,14 +184,14 @@ public function checkVatNumber($countryCode, $vatNumber, $requesterCountryCode =
 
             $requestParams = [];
             $requestParams['countryCode'] = $countryCode;
-            $this->isCountryInEU($countryCode) 
-                ? $vatNumberSanitized = str_replace([' ', '-', $countryCode], ['', '', ''], $vatNumber) 
-                : $vatNumberSanitized = str_replace([' ', '-'], ['', ''], $vatNumber);
+            $vatNumberSanitized = $this->isCountryInEU($countryCode) 
+                ? str_replace([' ', '-', $countryCode], ['', '', ''], $vatNumber) 
+                : str_replace([' ', '-'], ['', ''], $vatNumber);
             $requestParams['vatNumber'] = $vatNumberSanitized;
             $requestParams['requesterCountryCode'] = $requesterCountryCode;
-            $this->isCountryInEU($requesterCountryCode) 
-                ? $reqVatNumSanitized = str_replace([' ', '-', $requesterCountryCode], ['', '', ''], $requesterVatNumber) 
-                : $reqVatNumSanitized = str_replace([' ', '-'], ['', ''], $requesterVatNumber);
+            $reqVatNumSanitized = $this->isCountryInEU($requesterCountryCode) 
+                ? str_replace([' ', '-', $requesterCountryCode], ['', '', ''], $requesterVatNumber) 
+                : str_replace([' ', '-'], ['', ''], $requesterVatNumber);
             $requestParams['requesterVatNumber'] = $reqVatNumSanitized;
             // Send request to service
             $result = $soapClient->checkVatApprox($requestParams);

From 4d50006a34d9344ae2061ca69aaaf5f574dc5cbc Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Mon, 3 Sep 2018 09:57:08 +0300
Subject: [PATCH 6/6] Code style fixes

---
 app/code/Magento/Customer/Model/Vat.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Vat.php b/app/code/Magento/Customer/Model/Vat.php
index c45dd91599c6b..f608a6cf4c11c 100644
--- a/app/code/Magento/Customer/Model/Vat.php
+++ b/app/code/Magento/Customer/Model/Vat.php
@@ -184,13 +184,13 @@ public function checkVatNumber($countryCode, $vatNumber, $requesterCountryCode =
 
             $requestParams = [];
             $requestParams['countryCode'] = $countryCode;
-            $vatNumberSanitized = $this->isCountryInEU($countryCode) 
-                ? str_replace([' ', '-', $countryCode], ['', '', ''], $vatNumber) 
+            $vatNumberSanitized = $this->isCountryInEU($countryCode)
+                ? str_replace([' ', '-', $countryCode], ['', '', ''], $vatNumber)
                 : str_replace([' ', '-'], ['', ''], $vatNumber);
             $requestParams['vatNumber'] = $vatNumberSanitized;
             $requestParams['requesterCountryCode'] = $requesterCountryCode;
-            $reqVatNumSanitized = $this->isCountryInEU($requesterCountryCode) 
-                ? str_replace([' ', '-', $requesterCountryCode], ['', '', ''], $requesterVatNumber) 
+            $reqVatNumSanitized = $this->isCountryInEU($requesterCountryCode)
+                ? str_replace([' ', '-', $requesterCountryCode], ['', '', ''], $requesterVatNumber)
                 : str_replace([' ', '-'], ['', ''], $requesterVatNumber);
             $requestParams['requesterVatNumber'] = $reqVatNumSanitized;
             // Send request to service