v2.1.8

vippsas · Aug 23, 2024 · d558bfe · d558bfe
1 parent f9a0d9f
commit d558bfe
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 16 deletions.
diff --git a/VippsApi.class.php b/VippsApi.class.php
@@ -263,20 +263,22 @@ public function get_receipt_data($order) {
                 if ($product) {
                     $url = get_permalink($prodid);
                 }
+                $taxpercentageraw = 0;
                 if ($subtotalNoTax == 0) {
-                    $taxpercentage = 0;
+                    $taxpercentageraw = 0;
                 } else {
-                    $taxpercentage = (($subtotal - $subtotalNoTax) / $subtotalNoTax)*100;
+                    $taxpercentageraw = (($subtotal - $subtotalNoTax) / $subtotalNoTax)*100;
                 }
-                $taxpercentage = abs(round($taxpercentage));
+                $taxrate = abs(round(100*$taxpercentageraw));
+                $taxpercentage = abs(round($taxpercentageraw));
                 $unitInfo = [];
                 $orderline['name'] = $order_item->get_name();
                 $orderline['id'] = strval($prodid);
                 $orderline['totalAmount'] = round($total*100);
                 $orderline['totalAmountExcludingTax'] = round($totalNoTax*100);
                 $orderline['totalTaxAmount'] = round($tax*100);
 
-                $orderline['taxPercentage'] = $taxpercentage;
+                $orderline['taxRate'] = $taxrate;
                 $unitinfo['unitPrice'] = round($unitprice*100);
                 $unitinfo['quantity'] = strval($quantity);
                 $unitinfo['quantityUnit'] = 'PCS';
@@ -293,8 +295,9 @@ public function get_receipt_data($order) {
                 $tax = $order_item->get_total_tax();
                 $total = $tax+$totalNoTax;
                 $quantity = 1;
-                $taxpercentage = (($total - $totalNoTax) / $totalNoTax)*100;
-                $taxpercentage = abs(round($taxpercentage));
+                $taxpercentageraw = (($total - $totalNoTax) / $totalNoTax)*100;
+                $taxrate = abs(round(100*$taxpercentageraw));
+                $taxpercentage = abs(round($taxpercentageraw));
                 $unitInfo = [];
                 $orderline['name'] = $order_item->get_name();
                 $orderline['id'] = substr(sanitize_title($orderline['name']), 0, 254);
@@ -303,7 +306,7 @@ public function get_receipt_data($order) {
                 $orderline['totalTaxAmount'] = round($tax*100);
                 $orderline['discount'] = 0;
 
-                $orderline['taxPercentage'] = $taxpercentage;
+                $orderline['taxRate'] = $taxrate;
                 $orderlines[] = $orderline;
             }
 
@@ -324,17 +327,19 @@ public function get_receipt_data($order) {
                 $subtotalTax = $tax;
                 $subtotal = $subtotalNoTax + $subtotalTax;
 
+                $taxpercentageraw = 0;
                 if ($subtotalNoTax == 0) {
-                    $taxpercentage = 0;
+                    $taxpercentageraw = 0;
                 }  else {
-                    $taxpercentage = (($subtotal - $subtotalNoTax) / $subtotalNoTax)*100;
+                    $taxpercentageraw = (($subtotal - $subtotalNoTax) / $subtotalNoTax)*100;
                 }
-                $taxpercentage = abs(round($taxpercentage));
+                $taxpercentage = abs(round($taxpercentageraw));
+                $taxrate= abs(round($taxpercentageraw * 100));
 
                 $orderline['totalAmount'] = round($total*100);
                 $orderline['totalAmountExcludingTax'] = round($totalNoTax*100);
                 $orderline['totalTaxAmount'] = round($tax*100);
-                $orderline['taxPercentage'] = $taxpercentage;
+                $orderline['taxRate'] = $taxrate;
 
                 $unitinfo  = [];
 

diff --git a/readme.txt b/readme.txt
@@ -2,8 +2,8 @@
 Contributors: wphostingdev, iverok, perwilhelmsen, nikolaidev
 Tags: woocommerce, vipps, mobilepay
 Tags: woocommerce, vipps
-Version: 2.1.7
-Stable tag: 2.1.7
+Version: 2.1.8
+Stable tag: 2.1.8
 Requires at least: 4.7
 Tested up to: 6.6.1
 Requires PHP: 7.0
@@ -94,6 +94,7 @@ Shareable links and QR codes can be generated from the Vipps tab on the product
 This project is hosted on Github at: https://github.com/vippsas/vipps-woocommerce
 
 == Upgrade Notice ==
+Version 2.1.8 supports the upcoming Finnish VAT change
 Cancelling _completed_ orders will normally also refund these orders if the refund has been captured; but we now implement a cutoff for this so that this does not happen for orders older than 30 days (tunable by the 'woo_vipps_cancel_refund_days_threshold' filter). This is a safety measure to avoid accidental refunds of archived orders. You can still use the 'refund' status or refund the orders manually.
 Allow Klarna as an external payment method for norway
 Fix issue with webhook callbacks to unknown Vipps orders
@@ -238,6 +239,9 @@ From version 1.1.13 you can also modify the javascript using the new WP hooks li
 
 == Changelog ==
 
+= 2024-08-26 version 2.1.7 =
+Change API to use taxRate instead of taxPercent to allow for VAT change in Finland 1. sep 2024.
+
 = 2024-08-16 version 2.1.7 =
 Allow Klarna as external payment method in Checkout
 Fix issue with session handling that would break shipping in Checkout in Woo 9.2

diff --git a/woo-vipps.php b/woo-vipps.php
@@ -7,8 +7,8 @@
    Author URI: https://www.wp-hosting.no/
    Text-domain: woo-vipps
    Domain Path: /languages
-   Version: 2.1.7
-   Stable tag: 2.1.7
+   Version: 2.1.8
+   Stable tag: 2.1.8
    Requires at least: 4.7
    Tested up to: 6.6.1
    Requires PHP: 7.0
@@ -49,7 +49,7 @@
 
 
 // Report version externally
-define('WOO_VIPPS_VERSION', '2.1.7');
+define('WOO_VIPPS_VERSION', '2.1.8');
 
 if ( ! defined( 'ABSPATH' ) ) {
     exit; // Exit if accessed directly