Changeset 3132635

Timestamp:

08/08/2024 10:33:11 AM (18 months ago)

Author:

hsuvant

Message:

Version 1.1.4

Location:

visma-pay-embedded-card-payment-gateway/trunk

Files:

• includes/lib/Visma/VismaPay.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• visma-pay-embedded-card-payment-gateway.php (modified) (11 diffs)

visma-pay-embedded-card-payment-gateway/trunk/includes/lib/Visma/VismaPay.php

@@ -17 +17 @@
     const API_URL = 'https://www.vismapay.com/pbwapi';
 
-    public function __construct($api_key, $private_key, $version = 'w3.1', VismaPayConnector $connector = null)
+    public function __construct($api_key, $private_key, $version = 'w3.2', VismaPayConnector $connector = null)
     {
         $this->api_key = $api_key;
@@ -71 +71 @@
             $payment_data['plugin_info'] .= '0';
 
-        $payment_data['plugin_info'] .= '|1.1.3';
+        $payment_data['plugin_info'] .= '|1.1.4';
 
         return $this->makeRequest($url, $payment_data);

visma-pay-embedded-card-payment-gateway/trunk/readme.txt

@@ -4 +4 @@
 Tags: payment gateway, visma, pay, verkkomaksut, korttimaksut, vismapay
 Requires at least: 3.3
-Tested up to: 6.4.1
+Tested up to: 6.6.1
 Stable tag: trunk
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 WC requires at least: 3.0.0
-WC tested up to: 8.3.0
+WC tested up to: 9.1.4
 
 Visma Pay plugin for Woocommerce.
@@ -41 +41 @@
 
 == Changelog ==
+
+= 1.1.4 =
+* Changed Visma Pay API version to w3.2 which supports decimals in tax percent
+* Updated 'tested up to' versions.
 
 = 1.1.3 =

visma-pay-embedded-card-payment-gateway/trunk/visma-pay-embedded-card-payment-gateway.php

@@ -4 +4 @@
  * Plugin URI: https://www.vismapay.com/docs
  * Description: Visma Pay Payment Gateway Embedded Card Integration for Woocommerce
- * Version: 1.1.3
+ * Version: 1.1.4
  * Author: Visma
  * Author URI: https://www.visma.fi/vismapay/
@@ -10 +10 @@
  * Domain Path: /languages
  * WC requires at least: 3.0.0
- * WC tested up to: 8.3.0
+ * WC tested up to: 9.1.4
  */
 
@@ -343 +343 @@
             $lang = $this->get_lang();
 
-            $payment = new Visma\VismaPay($this->api_key, $this->private_key, 'w3.1', new Visma\VismaPayWPConnector());
+            $payment = new Visma\VismaPay($this->api_key, $this->private_key, 'w3.2', new Visma\VismaPayWPConnector());
 
             if($this->send_receipt == 'yes')
@@ -395 +395 @@
             {
                 $available = false;
-                $payment_methods = new Visma\VismaPay($this->api_key, $this->private_key, 'w3.1', new Visma\VismaPayWPConnector());
+                $payment_methods = new Visma\VismaPay($this->api_key, $this->private_key, 'w3.2', new Visma\VismaPayWPConnector());
                 try
                 {
@@ -565 +565 @@
                         $pbw_extra_info = '';
 
-                        $payment = new Visma\VismaPay($this->api_key, $this->private_key, 'w3.1', new Visma\VismaPayWPConnector());
+                        $payment = new Visma\VismaPay($this->api_key, $this->private_key, 'w3.2', new Visma\VismaPayWPConnector());
                         try
                         {
@@ -804 +804 @@
             $successful = false;
             require_once(plugin_dir_path( __FILE__ ).'includes/lib/visma_pay_loader.php');
-            $payment = new Visma\VismaPay($this->api_key, $this->private_key, 'w3.1', new Visma\VismaPayWPConnector());
+            $payment = new Visma\VismaPay($this->api_key, $this->private_key, 'w3.2', new Visma\VismaPayWPConnector());
             try
             {
@@ -851 +851 @@
             $card_token = $subscription->get_meta('visma_pay_embedded_card_token', true, 'edit');
 
-            $payment = new Visma\VismaPay($this->api_key, $this->private_key, 'w3.1', new Visma\VismaPayWPConnector());
+            $payment = new Visma\VismaPay($this->api_key, $this->private_key, 'w3.2', new Visma\VismaPayWPConnector());
 
             $order_number = (strlen($this->ordernumber_prefix)  > 0) ?  $this->ordernumber_prefix . '_' . $order->get_id() : $order->get_id();
@@ -969 +969 @@
             $card_token = $subscription->get_meta($key, true, 'edit');
 
-            $payment = new Visma\VismaPay($this->api_key, $this->private_key, 'w3.1', new Visma\VismaPayWPConnector());
+            $payment = new Visma\VismaPay($this->api_key, $this->private_key, 'w3.2', new Visma\VismaPayWPConnector());
 
             try
@@ -1004 +1004 @@
                 {
                     $tax_rate = reset($tax_rates);
-                    $line_tax = (int)round($tax_rate['rate']);
+                    $line_tax = number_format($tax_rate['rate'], 2, '.', '');
                 }
                 else
                 {
-                    $line_tax = ($order->get_item_total($item, false, false) > 0) ? round($order->get_item_tax($item, false)/$order->get_item_total($item, false, false)*100,0) : 0;
+                    $i_total = $order->get_item_total($item, false, false);
+                    $i_tax = $order->get_item_tax($item, false);
+                    $line_tax = ($i_total > 0) ? number_format($i_tax / $i_total * 100, 2, '.', '') : 0;
                 }
                 
@@ -1082 +1084 @@
             $wc_s_postcode = $order->get_shipping_postcode();
             $wc_s_country = $order->get_shipping_country();
+            $wc_b_phone = $order->get_billing_phone();
 
             $payment->addCustomer(
@@ -1097 +1100 @@
                     'shipping_address_city' => htmlspecialchars($wc_s_city),
                     'shipping_address_zip' => htmlspecialchars($wc_s_postcode),
-                    'shipping_address_country' => htmlspecialchars($wc_s_country)
+                    'shipping_address_country' => htmlspecialchars($wc_s_country),
+                    'phone' => preg_replace('/[^0-9+ ]/', '', $wc_b_phone)
                 )
             );