add matching for countrycode in VAT against selected country from add…

…ress
CopeX · Dec 11, 2016 · 6295beb · 6295beb
1 parent 48b914c
commit 6295beb
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/Plugin/UidPlugin.php b/Plugin/UidPlugin.php
@@ -16,16 +16,20 @@
  */
 namespace CopeX\VATFix\Plugin;
 
+use Magento\Framework\Exception\ValidatorException;
+use Magento\Customer\Model\Vat;
+
 class UidPlugin
 {
     protected $_helper;
 
     /**
      * @param \CopeX\VATFix\Helper\Data $helper
      */
-    public function __construct(\CopeX\VATFix\Helper\Data $helper)
+    public function __construct(\CopeX\VATFix\Helper\Data $helper, \Magento\Framework\Message\ManagerInterface $messageManager )
     {
         $this->_helper = $helper;
+        $this->_messageManager = $messageManager;
     }
 
     /**
@@ -36,16 +40,19 @@ public function __construct(\CopeX\VATFix\Helper\Data $helper)
      * @param string $requesterVatNumber
      * @return array
      */
-    public function beforeCheckVatNumber(\Magento\Customer\Model\Vat $subject, $countryCode, $vatNumber, $requesterCountryCode = '', $requesterVatNumber = '')
+    public function beforeCheckVatNumber(Vat $subject, $countryCode, $vatNumber, $requesterCountryCode = '', $requesterVatNumber = '')
     {
+        if($countryCode != $this->_helper->getCountryCodeFromVAT($vatNumber)){
+            $this->_messageManager->addError(__('Your selected country does not match the countrycode in VAT.'));
+            return array();
+        }
         $newVatNumber = $vatNumber;
         $newRequesterVatNumber = $requesterVatNumber;
 
         if ($requesterVatNumber !== '' && $this->_helper->isCountryCodeInVAT($requesterVatNumber)) {
             $newRequesterVatNumber = substr(str_replace(' ', '', trim($requesterVatNumber)), 2);
         }
 
-
         if ($this->_helper->isCountryCodeInVAT($newVatNumber)) {
             $newVatNumber = substr(str_replace(' ', '', trim($vatNumber)), 2);
         }