2.0.11

vippsas · May 21, 2024 · f009b8b · f009b8b
1 parent a2faf4f
commit f009b8b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ END_METADATA -->
 ![MobilePay](./docs/images/mp.png) *Available for MobilePay in Finland and Denmark.*
 
 :::note
-You must capture within 7 days (MobilePay) or 180 days (Vipps) or the payment will be cancelled.
+You must capture within 14 days (MobilePay) or 180 days (Vipps) or the payment will be cancelled.
 :::
 
 *This plugin is built and maintained by [WP Hosting](https://www.wp-hosting.no/) and can be downloaded from the [Wordpress plugin site](https://wordpress.org/plugins/woo-vipps/) .*
@@ -124,7 +124,7 @@ You can only get paid by users who have MobilePay. At the moment plugin is only
 
 ### For how long is an order reserved?
 
-When a payment is completed with Vipps MobilePay, the money will be reserved, but only transferred to the merchant when the order is set to “Complete” or the money is captured manually. For MobilePay, this reservation period is 7 days, so you will need to ship and fulfill orders before this; or to make an agreement with the customer to capture the money before this period is over. For Vipps, the period is 180 days. For payments made by credit card in Vipps/MobilePay Checkout, the period can again be as short as 7 days.
+When a payment is completed with Vipps MobilePay, the money will be reserved, but only transferred to the merchant when the order is set to “Complete” or the money is captured manually. For MobilePay, this reservation period is 14 days, so you will need to ship and fulfill orders before this; or to make an agreement with the customer to capture the money before this period is over. For Vipps, the period is 180 days. For payments made by credit card in Vipps/MobilePay Checkout, the period can again be as short as 7 days.
 
 If the order only contains virtual and downloadable products, the plugin will capture the order automatically and set the order to “Completed” as is the standard WooCommerce rule.
 

diff --git a/Vipps.class.php b/Vipps.class.php
@@ -1151,7 +1151,7 @@ public function admin_head() {
     public function admin_enqueue_scripts($hook) {
         wp_register_script('vipps-admin',plugins_url('js/admin.js',__FILE__),array('jquery'),filemtime(dirname(__FILE__) . "/js/admin.js"), 'true');
         $this->vippsJSConfig['vippssecnonce'] = wp_create_nonce('vippssecnonce');
-        $this->vippsJSConfig['reservationWarning'] = __("Note: Reservations will be cancelled after 7 days. Remember to ship and fulfill your orders.", 'woo-vipps');
+        $this->vippsJSConfig['reservationWarning'] = __("Note: Reservations will be cancelled after 14 days. Remember to ship and fulfill your orders.", 'woo-vipps');
 
         wp_localize_script('vipps-admin', 'VippsConfig', $this->vippsJSConfig);
         wp_enqueue_script('vipps-admin');
@@ -1209,7 +1209,7 @@ public function add_meta_boxes () {
                 if (in_array($order->get_status(), ['on-hold', 'processing'])) {
                     if (! $order->get_meta('_vipps_captured')) {
                         // IOK 2024-02-16 temporarily add notice about 7 day limit of reservations for Mobile Pay
-                        $this->add_vipps_admin_notice("<div class='woo-vipps-warning'>" . __("Note: Reservations will be cancelled after 7 days. Remember to ship and fulfill your orders.", 'woo-vipps') . "</div>",'warning', '', 'reserve-warning');
+                        $this->add_vipps_admin_notice("<div class='woo-vipps-warning'>" . __("Note: Reservations will be cancelled after 14 days. Remember to ship and fulfill your orders.", 'woo-vipps') . "</div>",'warning', '', 'reserve-warning');
                     }
                 }
             }

diff --git a/languages/woo-vipps-da_DK.po b/languages/woo-vipps-da_DK.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: Plugins - Pay with Vipps and MobilePay for WooCommerce - Stable (latest release)\n"
 
 #: Vipps.class.php:1152 Vipps.class.php:1210
-msgid "Note: Reservations will be cancelled after 7 days. Remember to ship and fulfill your orders."
-msgstr "Bemærk: Reservationer vil blive annulleret efter 7 dage. Husk at sende og opfylde dine ordrer."
+msgid "Note: Reservations will be cancelled after 14 days. Remember to ship and fulfill your orders."
+msgstr "Bemærk: Reservationer vil blive annulleret efter 14 dage. Husk at sende og opfylde dine ordrer."
 
 #: WC_Gateway_Vipps.class.php:3661
 msgid "Could not initialize webhooks for this site: %1$s"
@@ -2789,4 +2789,4 @@ msgstr "Tilbyd Vipps som betalingsmetode for WooCommerce"
 
 #. Plugin URI of the plugin
 msgid "https://wordpress.org/plugins/woo-vipps/"
-msgstr "https://wordpress.org/plugins/woo-vipps/"
+msgstr "https://wordpress.org/plugins/woo-vipps/"
diff --git a/readme.txt b/readme.txt
@@ -2,13 +2,13 @@
 Contributors: wphostingdev, iverok, perwilhelmsen, nikolaidev
 Tags: woocommerce, vipps, mobilepay
 Tags: woocommerce, vipps
-Version: 2.0.10
-Stable tag: 2.0.10
+Version: 2.0.11
+Stable tag: 2.0.11
 Requires at least: 4.7
-Tested up to: 6.5.0
+Tested up to: 6.5.3
 Requires PHP: 5.6
 WC requires at least: 3.3.4
-WC tested up to: 8.8.2
+WC tested up to: 8.9.1
 License: MIT
 License URI: https://choosealicense.com/licenses/mit/
 Official Vipps MobilePay payment plugin for WooCommerce.
@@ -93,6 +93,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 ==
+Fixed some untranslatable strings and updated information about reservation times
 Fixed some places where NOK were hard-coded in as currency.
 Fixed an issue that could impact sites where the callback from Vipps was blocked delaying order confirmations
 Added failsafe for certain situations where the session could be lost while computing shipping
@@ -236,6 +237,9 @@ From version 1.1.13 you can also modify the javascript using the new WP hooks li
 
 == Changelog ==
 
+= 2024-05-21 version 2.0.11 =
+Fixed some utranslatable strings and changed MobilePay reservation time notices to 14 days
+
 = 2024-04-22 version 2.0.10 =
 Added nocache-headers for nginx
 Fixed an issue that could delay order confirmations in rare situations
@@ -253,7 +257,7 @@ Minor updates and language
 
 = 2024-02-19 version 2.0.6 =
 Made sure the filters for the_title on the checkout page works even with too few arguments
-Added notice and warning for MobilePay that capture must be done within 7 days
+Added notice and warning for MobilePay that capture must be done within 14 days
 
 = 2024-01-25 version 2.0.5 =
 Add workaround for Orderline issue with Checkout

diff --git a/woo-vipps.php b/woo-vipps.php
@@ -7,13 +7,13 @@
    Author URI: https://www.wp-hosting.no/
    Text-domain: woo-vipps
    Domain Path: /languages
-   Version: 2.0.10
-   Stable tag: 2.0.10
+   Version: 2.0.11
+   Stable tag: 2.0.11
    Requires at least: 4.7
-   Tested up to: 6.5.0
+   Tested up to: 6.5.3
    Requires PHP: 5.6
    WC requires at least: 3.3.4
-   WC tested up to: 8.8.2
+   WC tested up to: 8.9.1
 
    License: MIT
    License URI: https://choosealicense.com/licenses/mit/
@@ -48,7 +48,7 @@
 
 
 // Report version externally
-define('WOO_VIPPS_VERSION', '2.0.10');
+define('WOO_VIPPS_VERSION', '2.0.11');
 
 if ( ! defined( 'ABSPATH' ) ) {
     exit; // Exit if accessed directly