Merge pull request #131 from buckaroo-it/develop

version 3.5.0

README.md

@@ -23,9 +23,9 @@ The Buckaroo WooCommerce Payments Plugin ([Dutch](https://support.buckaroo.nl/ca
 
 To use the Buckaroo plugin, please be aware of the following minimum requirements:
 - A Buckaroo account ([Dutch](https://www.buckaroo.nl/start) or [English](https://www.buckaroo.eu/solutions/request-form))
-- WordPress 4.4.10 or higher
-- WooCommerce 5.0 or higher
-- PHP 7.4 or higher
+- WordPress 4.4.10 up to 6.0.2
+- WooCommerce 5.0 up to 6.8.2
+- PHP 7.4 , 8.0 , 8.1
 
 ### Quick installation
 
@@ -66,3 +66,5 @@ If you want to contribute as well, then please follow our [Contribution Guidelin
 - **Support:** https://support.buckaroo.eu/contact
 - **Contact:** [[email protected]](mailto:[email protected]) or [+31 (0)30 711 50 50](tel:+310307115050)
 
+<b>Please note:</b><br>
+This file has been prepared with the greatest possible care and is subject to language and/or spelling errors.

composer.json

@@ -27,7 +27,7 @@
         "issues": "https://support.buckaroo.nl/contact"
     },
     "homepage": "https://www.buckaroo.nl",
-    "version" : "3.4.0",
+    "version" : "3.5.0",
     "minimum-stability": "stable",
     "config": {
         "allow-plugins": {

controllers/PaypalExpressController.php

@@ -127,7 +127,7 @@ protected function get_settings()
         );
         $settings = get_option('woocommerce_buckaroo_paypal_settings', []);
 
-        if (!is_array($settings["express"])) {
+        if (!isset($settings["express"]) || !is_array($settings["express"])) {
             $settings["express"] = ["none"];
         }
 

gateway-buckaroo-afterpay.php

@@ -18,10 +18,10 @@ class WC_Gateway_Buckaroo_Afterpay extends WC_Gateway_Buckaroo
     public function __construct()
     {
         $this->id                     = 'buckaroo_afterpay';
-        $this->title                  = 'AfterPay';
+        $this->title                  = 'Riverty | AfterPay';
         $this->has_fields             = false;
-        $this->method_title           = 'Buckaroo AfterPay';
-        $this->setIcon('24x24/afterpay.jpg', 'svg/AfterPay.svg');
+        $this->method_title           = 'Buckaroo Riverty | AfterPay';
+        $this->setIcon('afterpay.png', 'svg/AfterPay.svg');
         $this->setCountry();
 
         parent::__construct();
@@ -429,7 +429,7 @@ public function init_form_fields()
             'default'     => 'afterpaydigiaccept'];
 
         $this->form_fields['enable_bb'] = [
-            'title'       => __('Enable B2B option for AfterPay', 'wc-buckaroo-bpe-gateway'),
+            'title'       => __('Enable B2B option for Riverty | AfterPay', 'wc-buckaroo-bpe-gateway'),
             'type'        => 'select',
             'description' => __('Enables or disables possibility to pay using company credentials', 'wc-buckaroo-bpe-gateway'),
             'options'     => ['enable' => 'Enable', 'disable' => 'Disable'],

gateway-buckaroo-afterpaynew.php

@@ -22,10 +22,10 @@ class WC_Gateway_Buckaroo_Afterpaynew extends WC_Gateway_Buckaroo
     public function __construct()
     {
         $this->id                     = 'buckaroo_afterpaynew';
-        $this->title                  = 'Afterpay (by Buckaroo)';
+        $this->title                  = 'Riverty | AfterPay (by Buckaroo)';
         $this->has_fields             = false;
-        $this->method_title           = 'Buckaroo AfterPay New';
-        $this->setIcon('24x24/afterpaynew.png', 'svg/AfterPay.svg');
+        $this->method_title           = 'Buckaroo Riverty | AfterPay New';
+        $this->setIcon('afterpay.png', 'svg/AfterPay.svg');
         $this->setCountry();
 
         parent::__construct();
@@ -193,7 +193,7 @@ public function process_partial_refunds($order_id, $amount = null, $reason = '',
         }
 
         if (!(count($products) > 0)) {
-            return new WP_Error('error_refund_afterpay_no_products', __("To refund an AfterPay transaction you need to refund at least one product."));
+            return new WP_Error('error_refund_afterpay_no_products', __("To refund an Riverty | AfterPay transaction you need to refund at least one product."));
         }
 
         try {
@@ -473,7 +473,7 @@ public function init_form_fields()
         parent::init_form_fields();
 
         $this->form_fields['afterpaynewpayauthorize'] = array(
-            'title'       => __('AfterPay Pay or Capture', 'wc-buckaroo-bpe-gateway'),
+            'title'       => __('Riverty | AfterPay Pay or Capture', 'wc-buckaroo-bpe-gateway'),
             'type'        => 'select',
             'description' => __('Choose to execute Pay or Capture call', 'wc-buckaroo-bpe-gateway'),
             'options'     => array('pay' => 'Pay', 'authorize' => 'Authorize'),
@@ -489,9 +489,9 @@ public function init_form_fields()
             'desc_tip'    => 'Product images are only shown when they are available in JPG or PNG format'
         );
         $this->form_fields['customer_type'] = array(
-            'title'       => __('AfterPay customer type', 'wc-buckaroo-bpe-gateway'),
+            'title'       => __('Riverty | AfterPay customer type', 'wc-buckaroo-bpe-gateway'),
             'type'        => 'select',
-            'description' => __('This setting determines whether you accept AfterPay payments for B2C, B2B or both customer types. When B2B is selected, this method is only shown when a company name is entered in the checkout process.', 'wc-buckaroo-bpe-gateway'),
+            'description' => __('This setting determines whether you accept Riverty | AfterPay payments for B2C, B2B or both customer types. When B2B is selected, this method is only shown when a company name is entered in the checkout process.', 'wc-buckaroo-bpe-gateway'),
             'options'     => array(
                 self::CUSTOMER_TYPE_BOTH => __('Both'),
                 self::CUSTOMER_TYPE_B2C => __('B2C (Business-to-consumer)'),

index.php

@@ -5,7 +5,7 @@
 Author: Buckaroo
 Author URI: http://www.buckaroo.nl
 Description: Buckaroo payment system plugin for WooCommerce.
-Version: 3.4.0
+Version: 3.5.0
 Text Domain: wc-buckaroo-bpe-gateway
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

languages/wc-buckaroo-bpe-gateway-de_DE.po

@@ -42,7 +42,7 @@ msgstr ""
 #: gateway-buckaroo-afterpaynew.php:1092 gateway-buckaroo-afterpaynew.php:1099
 #: gateway-buckaroo-afterpaynew.php:1114 gateway-buckaroo-afterpaynew.php:1118
 #: gateway-buckaroo-afterpaynew.php:1122 gateway-buckaroo-afterpaynew.php:1126
-msgid "Accept Afterpay conditions:"
+msgid "Accept Riverty | AfterPay conditions:"
 msgstr ""
 
 #: gateway-buckaroo-billink.php:320 gateway-buckaroo-billink.php:343
@@ -54,15 +54,15 @@ msgid "According to iDIN you are under 18 years old"
 msgstr "Laut iDIN sind sie unter 18 jahre alt"
 
 #: gateway-buckaroo-afterpay.php:1047 gateway-buckaroo-afterpaynew.php:1103
-msgid "Afterpay conditions (Dutch)"
+msgid "Riverty | AfterPay conditions (Dutch)"
 msgstr ""
 
 #: gateway-buckaroo-afterpay.php:1051 gateway-buckaroo-afterpaynew.php:1107
-msgid "Afterpay conditions (French)"
+msgid "Riverty | AfterPay conditions (French)"
 msgstr ""
 
 #: gateway-buckaroo-afterpay.php:1206 gateway-buckaroo-afterpaynew.php:1238
-msgid "AfterPay Pay or Capture"
+msgid "Riverty | AfterPay Pay or Capture"
 msgstr ""
 
 #: templates/idin/checkout.php:7 templates/idin/checkout.php:26
@@ -264,7 +264,7 @@ msgid "Email:"
 msgstr ""
 
 #: gateway-buckaroo-afterpay.php:1174
-msgid "Enable B2B option for AfterPay"
+msgid "Enable B2B option for Riverty | AfterPay"
 msgstr ""
 
 #: gateway-buckaroo.php:346
@@ -960,10 +960,10 @@ msgstr ""
 
 #: library/common.php:402 library/common.php:425 library/common.php:621
 msgid ""
-"We are sorry to inform you that the request to pay afterwards with AfterPay "
+"We are sorry to inform you that the request to pay afterwards with Riverty | AfterPay "
 "is not possible at this time. This can be due to various (temporary) reasons."
 " For questions about your rejection you can contact the customer service of "
-"AfterPay. Or you can visit the website of AfterPay and check the 'Frequently "
+"Riverty | AfterPay. Or you can visit the website of Riverty | AfterPay and check the 'Frequently "
 "asked questions' through this <a href=\"https://www.afterpay."
 "nl/nl/consumenten/vraag-en-antwoord\" target=\"_blank\">link</a>. We advise "
 "you to choose another payment method to complete your order."

languages/wc-buckaroo-bpe-gateway-fr_FR.po

@@ -42,7 +42,7 @@ msgstr ""
 #: gateway-buckaroo-afterpaynew.php:1092 gateway-buckaroo-afterpaynew.php:1099
 #: gateway-buckaroo-afterpaynew.php:1114 gateway-buckaroo-afterpaynew.php:1118
 #: gateway-buckaroo-afterpaynew.php:1122 gateway-buckaroo-afterpaynew.php:1126
-msgid "Accept Afterpay conditions:"
+msgid "Accept Riverty | AfterPay conditions:"
 msgstr ""
 
 #: gateway-buckaroo-billink.php:320 gateway-buckaroo-billink.php:343
@@ -54,15 +54,15 @@ msgid "According to iDIN you are under 18 years old"
 msgstr "Selon iDIN, vous avez moins de 18 ans"
 
 #: gateway-buckaroo-afterpay.php:1047 gateway-buckaroo-afterpaynew.php:1103
-msgid "Afterpay conditions (Dutch)"
+msgid "Riverty | AfterPay conditions (Dutch)"
 msgstr ""
 
 #: gateway-buckaroo-afterpay.php:1051 gateway-buckaroo-afterpaynew.php:1107
-msgid "Afterpay conditions (French)"
+msgid "Riverty | AfterPay conditions (French)"
 msgstr ""
 
 #: gateway-buckaroo-afterpay.php:1206 gateway-buckaroo-afterpaynew.php:1238
-msgid "AfterPay Pay or Capture"
+msgid "Riverty | AfterPay Pay or Capture"
 msgstr ""
 
 #: templates/idin/checkout.php:7 templates/idin/checkout.php:26
@@ -263,7 +263,7 @@ msgid "Email:"
 msgstr ""
 
 #: gateway-buckaroo-afterpay.php:1174
-msgid "Enable B2B option for AfterPay"
+msgid "Enable B2B option for Riverty | AfterPay"
 msgstr ""
 
 #: gateway-buckaroo.php:346
@@ -960,10 +960,10 @@ msgstr ""
 
 #: library/common.php:402 library/common.php:425 library/common.php:621
 msgid ""
-"We are sorry to inform you that the request to pay afterwards with AfterPay "
+"We are sorry to inform you that the request to pay afterwards with Riverty | AfterPay "
 "is not possible at this time. This can be due to various (temporary) reasons."
 " For questions about your rejection you can contact the customer service of "
-"AfterPay. Or you can visit the website of AfterPay and check the 'Frequently "
+"Riverty | AfterPay. Or you can visit the website of Riverty | AfterPay and check the 'Frequently "
 "asked questions' through this <a href=\"https://www.afterpay."
 "nl/nl/consumenten/vraag-en-antwoord\" target=\"_blank\">link</a>. We advise "
 "you to choose another payment method to complete your order."

languages/wc-buckaroo-bpe-gateway-nl_NL.po

@@ -39,8 +39,8 @@ msgstr "Een geldige iDEAL-bank is verplicht."
 
 #: templates/gateways/partial_afterpay_tos.php:53
 #: templates/gateways/partial_afterpay_tos.php:57
-msgid "Accept Afterpay conditions:"
-msgstr "AfterPay voorwaarden accepteren:"
+msgid "Accept Riverty | AfterPay conditions:"
+msgstr "Riverty | AfterPay voorwaarden accepteren:"
 
 #: templates/gateways/billink.php:57 templates/gateways/billink.php:81
 msgid "Accept terms of use"
@@ -51,12 +51,12 @@ msgid "According to iDIN you are under 18 years old"
 msgstr "Volgens iDIN ben je jonger dan 18 jaar"
 
 #: gateway-buckaroo-afterpaynew.php:489
-msgid "AfterPay customer type"
+msgid "Riverty | AfterPay customer type"
 msgstr ""
 
 #: gateway-buckaroo-afterpaynew.php:476 gateway-buckaroo-afterpay.php:451
-msgid "AfterPay Pay or Capture"
-msgstr "AfterPay Pay of Capture"
+msgid "Riverty | AfterPay Pay or Capture"
+msgstr "Riverty | AfterPay Pay of Capture"
 
 #: templates/idin/checkout.php:8 templates/idin/checkout.php:26
 msgid "Age verification"
@@ -355,8 +355,8 @@ msgid "Enable %s Payment Method"
 msgstr "Betaalmethode %s inschakelen"
 
 #: gateway-buckaroo-afterpay.php:432
-msgid "Enable B2B option for AfterPay"
-msgstr "Zet B2B aan voor AfterPay"
+msgid "Enable B2B option for Riverty | AfterPay"
+msgstr "Zet B2B aan voor Riverty | AfterPay"
 
 #: gateway-buckaroo-paypal.php:117
 msgid "Enable paypal express for the following pages."
@@ -716,7 +716,7 @@ msgstr "Selecteer a.u.b. een geslacht"
 
 #: gateway-buckaroo-afterpay.php:427
 msgid "Please select the service"
-msgstr "Kies de gewenste AfterPay service"
+msgstr "Kies de gewenste Riverty | AfterPay service"
 
 #: templates/payconiq/qrcode.php:318
 msgid "Point your camera at this QR code. "
@@ -768,7 +768,7 @@ msgstr "Selecteer een CreditCard."
 
 #: gateway-buckaroo-afterpay.php:425
 msgid "Select afterpay service"
-msgstr "Kies AfterPay service"
+msgstr "Kies Riverty | AfterPay service"
 
 #: gateway-buckaroo.php:411
 msgid "Select Certificate"
@@ -1035,7 +1035,7 @@ msgstr "Deze betaalmethode wordt niet ondersteund voor de geselecteerde valuta"
 
 #: gateway-buckaroo-afterpaynew.php:491
 msgid ""
-"This setting determines whether you accept AfterPay payments for B2C, B2B or "
+"This setting determines whether you accept Riverty | AfterPay payments for B2C, B2B or "
 "both customer types. When B2B is selected, this method is only shown when a "
 "company name is entered in the checkout process."
 msgstr ""
@@ -1100,19 +1100,19 @@ msgstr "WC Buckaroo BPE Gateway"
 
 #: library/common.php:239 library/common.php:262 library/common.php:403
 msgid ""
-"We are sorry to inform you that the request to pay afterwards with AfterPay "
+"We are sorry to inform you that the request to pay afterwards with Riverty | AfterPay "
 "is not possible at this time. This can be due to various (temporary) reasons."
 " For questions about your rejection you can contact the customer service of "
-"AfterPay. Or you can visit the website of AfterPay and check the 'Frequently "
+"Riverty | AfterPay. Or you can visit the website of Riverty | AfterPay and check the 'Frequently "
 "asked questions' through this <a href=\"https://www.afterpay."
 "nl/nl/consumenten/vraag-en-antwoord\" target=\"_blank\">link</a>. We advise "
 "you to choose another payment method to complete your order."
 msgstr ""
 "Het spijt ons u te moeten mededelen dat het verzoek om achteraf te betalen "
-"met AfterPay op dit moment niet mogelijk is. Dit kan verschillende "
+"met Riverty | AfterPay op dit moment niet mogelijk is. Dit kan verschillende "
 "(tijdelijke) redenen hebben. Voor vragen over uw afwijzing kunt u contact "
-"opnemen met de klantenservice van AfterPay. Of bezoek de website van "
-"AfterPay en bekijk de 'Veelgestelde vragen' via deze <a href=\"https://www."
+"opnemen met de klantenservice van Riverty | AfterPay. Of bezoek de website van "
+"Riverty | AfterPay en bekijk de 'Veelgestelde vragen' via deze <a href=\"https://www."
 "afterpay.nl/nl/consumenten/vragen-en- Antwoord\" target=\"_blank\">link </a>."
 " Wij adviseren u om een ​​andere betaalmethode te kiezen om uw bestelling af "
 "te ronden."

languages/wc-buckaroo-bpe-gateway.pot

@@ -38,7 +38,7 @@ msgstr ""
 
 #: templates/gateways/partial_afterpay_tos.php:53
 #: templates/gateways/partial_afterpay_tos.php:57
-msgid "Accept Afterpay conditions:"
+msgid "Accept Riverty | AfterPay conditions:"
 msgstr ""
 
 #: templates/gateways/billink.php:57 templates/gateways/billink.php:81
@@ -50,11 +50,11 @@ msgid "According to iDIN you are under 18 years old"
 msgstr ""
 
 #: gateway-buckaroo-afterpaynew.php:489
-msgid "AfterPay customer type"
+msgid "Riverty | AfterPay customer type"
 msgstr ""
 
 #: gateway-buckaroo-afterpaynew.php:476 gateway-buckaroo-afterpay.php:451
-msgid "AfterPay Pay or Capture"
+msgid "Riverty | AfterPay Pay or Capture"
 msgstr ""
 
 #: templates/idin/checkout.php:8 templates/idin/checkout.php:26
@@ -338,7 +338,7 @@ msgid "Enable %s Payment Method"
 msgstr ""
 
 #: gateway-buckaroo-afterpay.php:432
-msgid "Enable B2B option for AfterPay"
+msgid "Enable B2B option for Riverty | AfterPay"
 msgstr ""
 
 #: gateway-buckaroo-paypal.php:117
@@ -994,7 +994,7 @@ msgstr ""
 
 #: gateway-buckaroo-afterpaynew.php:491
 msgid ""
-"This setting determines whether you accept AfterPay payments for B2C, B2B or "
+"This setting determines whether you accept Riverty | AfterPay payments for B2C, B2B or "
 "both customer types. When B2B is selected, this method is only shown when a "
 "company name is entered in the checkout process."
 msgstr ""
@@ -1059,10 +1059,10 @@ msgstr ""
 
 #: library/common.php:239 library/common.php:262 library/common.php:403
 msgid ""
-"We are sorry to inform you that the request to pay afterwards with AfterPay "
+"We are sorry to inform you that the request to pay afterwards with Riverty | AfterPay "
 "is not possible at this time. This can be due to various (temporary) reasons."
 " For questions about your rejection you can contact the customer service of "
-"AfterPay. Or you can visit the website of AfterPay and check the 'Frequently "
+"Riverty | AfterPay. Or you can visit the website of Riverty | AfterPay and check the 'Frequently "
 "asked questions' through this <a href=\"https://www.afterpay."
 "nl/nl/consumenten/vraag-en-antwoord\" target=\"_blank\">link</a>. We advise "
 "you to choose another payment method to complete your order."

library/Buckaroo_Order_Details.php

@@ -211,7 +211,7 @@ public function getInitials($str)
     public function get_products()
     {
         return $this->formatOrderItems(
-            $this->order->get_items('line_item'),
+            $this->order->get_items('line_item')
         );
     }
     /**

library/api/paymentmethods/ideal/ideal.php

@@ -76,10 +76,6 @@ public static function getIssuerList() {
                 'name' => 'bunq',
                 'logo' => 'logo_bunq.png',
             ),
-            'HANDELS' => array(
-                'name' => 'Handelsbanken',
-                'logo' => 'logo_handelsbanken.png',
-            ),
             'REVOLUT' => array(
                 'name' => 'Revolut',
                 'logo' => 'logo_revolutbanken.png',
@@ -126,9 +122,6 @@ protected function _getIssuer($issuer) {
             case 'BUNQ':
                 $issuerCode = 'BUNQNL2A';
                 break;
-            case 'HANDELS':
-                $issuerCode = 'HANDNL2A';
-                break;
             case 'REVOLUT':
                 $issuerCode = 'REVOLT21';
                 break;