Merge pull request #140 from Adyen/develop-rik

#139 Afterpay use vatCategory "High"

Block/Redirect/Redirect.php

@@ -453,9 +453,8 @@ class Redirect extends \Magento\Payment\Block\Form
             $formFields['openinvoicedata.' . $linename . '.itemVatPercentage'] = $percentageMinorUnits;
             $formFields['openinvoicedata.' . $linename . '.numberOfItems'] = (int) $item->getQtyOrdered();
 
-            if ($this->_order->getPayment()->getAdditionalInformation(
-                    \Adyen\Payment\Observer\AdyenHppDataAssignObserver::BRAND_CODE) == "klarna"
-            ) {
+            if ($this->_adyenHelper->isVatCategoryHigh($this->_order->getPayment()->getAdditionalInformation(
+                \Adyen\Payment\Observer\AdyenHppDataAssignObserver::BRAND_CODE))) {
                 $formFields['openinvoicedata.' . $linename . '.vatCategory'] = "High";
             } else {
                 $formFields['openinvoicedata.' . $linename . '.vatCategory'] = "None";

Helper/Data.php

@@ -770,6 +770,22 @@ class Data extends AbstractHelper
         }
     }
 
+    /**
+     * For Klarna And AfterPay use VatCategory High others use none
+     *
+     * @param $paymentMethod
+     * @return bool
+     */
+    public function isVatCategoryHigh($paymentMethod)
+    {
+        if ($paymentMethod == "klarna" ||
+            strlen($paymentMethod) >= 9 && substr($paymentMethod, 0, 9) == 'afterpay_'
+        ) {
+            return true;
+        }
+        return false;
+    }
+    
     /**
      * @return bool
      */