Vat rate for payment fee is the highest vat rate in the order

paynl · Jan 8, 2019 · 27f3224 · 27f3224
1 parent 7ffa213
commit 27f3224
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 12 deletions.
diff --git a/paynl_paymentmethods/controllers/front/payment.php b/paynl_paymentmethods/controllers/front/payment.php
@@ -163,7 +163,7 @@ public function initContent()
 
             $apiStart->setEnduser($arrEnduser);
 
-            // producten toevoegen
+
             /**
              * @var $cart CartCore
              */
@@ -198,7 +198,9 @@ public function initContent()
             }
 
             if ($extraFee != 0) {
-                $apiStart->addProduct('PAYMENTFEE', 'Betaalkosten', round($extraFee * 100), 1, 'H');
+                $vatRate = $this->module->getHighestVatRate($cart);
+                $vatClass = Pay_Helper::nearestTaxClass($vatRate);
+                $apiStart->addProduct('PAYMENTFEE', 'Betaalkosten', round($extraFee * 100), 1, $vatClass);
             }
 
 

diff --git a/paynl_paymentmethods/includes/classes/Pay/Helper.php b/paynl_paymentmethods/includes/classes/Pay/Helper.php
@@ -125,19 +125,24 @@ public static function splitAddress($strAddress) {
      */
     public static function calculateTaxClass($amountInclTax, $taxAmount)
     {
-        $taxClasses = array(
-            0 => 'N',
-            9 => 'L',
-            21 => 'H'
-        );
         // return 0 if amount or tax is 0
         if ($taxAmount == 0 || $amountInclTax == 0) {
-            return $taxClasses[0];
+            return self::nearestTaxClass(0);
         }
         $amountExclTax = $amountInclTax - $taxAmount;
         $taxRate = ($taxAmount / $amountExclTax) * 100;
-        $nearestTaxRate = self::nearest($taxRate, array_keys($taxClasses));
-        return ($taxClasses[$nearestTaxRate]);
+        return self::nearestTaxClass($taxRate);
+    }
+
+    public static function nearestTaxClass($taxRate){
+        $taxClasses = array(
+            0 => 'N',
+            9 => 'L',
+            21 => 'H'
+        );
+
+        $nearest = self::nearest($taxRate, array_keys($taxClasses));
+        return $taxClasses[$nearest];
     }
     /**
      * Get the nearest number

diff --git a/paynl_paymentmethods/paynl_paymentmethods.php b/paynl_paymentmethods/paynl_paymentmethods.php
@@ -13,7 +13,7 @@ public function __construct()
     {
         $this->name        = 'paynl_paymentmethods';
         $this->tab         = 'payments_gateways';
-        $this->version     = '3.5.2';
+        $this->version     = '3.5.3';
         $this->_postErrors = array();
         $this->module_key  = '6c2f48f238008e8f68271f5e4763d308';
 
@@ -34,6 +34,27 @@ public function __construct()
         }
     }
 
+    public function getHighestVatRate(Cart $cart){
+        $highestVatRate = 0;
+        $products = $cart->getProducts();
+        foreach ($products as $product) {
+            $vatAmount = $product['price_wt'] - $product['price'];
+            $vatRate = ($vatAmount/$product['price'])*100;
+            if($vatRate > $highestVatRate) $highestVatRate = $vatRate;
+        }
+
+        //verzendkosten toevoegen
+        $shippingCost = $cart->getTotalShippingCost(null,true);
+        $shippingCost_no_tax = $cart->getTotalShippingCost(null,false);
+        if($shippingCost != 0){
+            $shippingVat = $shippingCost - $shippingCost_no_tax;
+            $vatRate = ($shippingVat/$shippingCost_no_tax)*100;
+            if($vatRate > $highestVatRate) $highestVatRate = $vatRate;
+        }
+
+        return $highestVatRate;
+    }
+
     public function validateOrderPay(
         $id_cart,
         $id_order_state,
@@ -50,6 +71,8 @@ public function validateOrderPay(
         $statusPending = Configuration::get('PAYNL_WAIT');
         $statusPaid    = Configuration::get('PAYNL_SUCCESS');
 
+        $cart = new Cart($id_cart);
+
         // Als er nog geen order van dit cartid is, de order valideren.
         $orderId = Order::getOrderByCartId($id_cart);
         if ($orderId == false) {
@@ -77,13 +100,17 @@ public function validateOrderPay(
             $shippingCost = $order->total_shipping;
 
             $newShippingCosts = $shippingCost + $extraCosts;
-            $extraCostsExcl   = round($extraCosts / (1 + (21 / 100)), 2);
+            $highestVatRate = $this->getHighestVatRate($cart);
+
+            $extraCostsExcl   = round($extraCosts / (1 + ($highestVatRate / 100)), 2);
 
             if ($extraCosts != 0) {
                 //als de order extra kosten heeft, moeten deze worden toegevoegd.
                 $order->total_shipping          = $newShippingCosts;
                 $order->total_shipping_tax_excl = $order->total_shipping_tax_excl + $extraCostsExcl;
                 $order->total_shipping_tax_incl = $newShippingCosts;
+                $order->carrier_tax_rate = $highestVatRate;
+
 
                 $order->total_paid_tax_excl = $order->total_paid_tax_excl + $extraCostsExcl;