Merge pull request #367 from buckaroo-it/develop

Update, Test & Release (4.2.1)

Author: vildanbina

index.php

@@ -6,7 +6,7 @@
 Author: Buckaroo
 Author URI: http://www.buckaroo.nl
 Description: Buckaroo payment system plugin for WooCommerce.
-Version: 4.2.0
+Version: 4.2.1
 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.pot

@@ -2,7 +2,7 @@
 # This file is distributed under the GPLv2 or later.
 msgid ""
 msgstr ""
-"Project-Id-Version: WC Buckaroo BPE Gateway 4.2.0\n"
+"Project-Id-Version: WC Buckaroo BPE Gateway 4.2.1\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wc-buckaroo-bpe-gateway\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

readme.txt

@@ -4,7 +4,7 @@ Author: Buckaroo
 Tags: WooCommerce, payments, Buckaroo
 Requires at least: 5.3.18
 Tested up to: 6.7.2
-Stable tag: 4.2.0
+Stable tag: 4.2.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -72,6 +72,9 @@ The “Buckaroo Woocommerce Payments Plugin” has been translated into 3 locale
 [Translate “Buckaroo Woocommerce Payments Plugin” into your language.](https://translate.wordpress.org/projects/wp-plugins/wc-buckaroo-bpe-gateway/)
 
 == Changelog ==
+= 4.2.1 =
+BP-4404 Fix: Invoice/order number for Riverty transactions in the Buckaroo plaza are incorrect due to a suffix that is added.
+BP-4402 Fix: PayPal Express checkout returns error “Cannot process Buckaroo transaction”
 = 4.2.0 =
 BP-4323 Fix: Warning: get_cart was called incorrectly.
 BP-4326 Fix: CustomerNumber has a wrong value (“0”) for Riverty transactions.

src/Core/Plugin.php

@@ -16,7 +16,7 @@ class Plugin
      *
      * @var string
      */
-    public const VERSION = '4.2.0';
+    public const VERSION = '4.2.1';
 
     /**
      * Instance of PaymentGatewayRegistry.

src/Gateways/AbstractPaymentProcessor.php

@@ -74,11 +74,7 @@ protected function get_order(): WC_Order
 
     private function get_invoice_number(): string
     {
-        if (in_array($this->gateway->id, ['buckaroo_afterpaynew', 'buckaroo_afterpay'])) {
-            return (string) $this->get_order()->get_order_number() . time();
-        }
-
-        return (string) $this->get_order()->get_order_number();
+        return $this->get_order()->get_order_number();
     }
 
     public function get_return_url($order = null): string

src/Gateways/PaypalExpress/PaypalExpressOrder.php

@@ -2,6 +2,10 @@
 
 namespace Buckaroo\Woocommerce\Gateways\PaypalExpress;
 
+use WC_Order;
+use WC_Order_Item_Fee;
+use stdClass;
+
 /**
  * PayPal express order class
  * php version 7.2

src/PaymentProcessors/ReturnProcessor.php

@@ -181,10 +181,6 @@ protected function handleFailureRedirect($paymentGateway, $order, $responseParse
 
     protected function getRedirectUrl($paymentGateway, $order, $type = 'success')
     {
-        if (is_admin()) {
-            return wp_get_referer() ?: $order->get_edit_order_url();
-        }
-
         return $type === 'success'
             ? $paymentGateway->get_return_url($order)
             : $paymentGateway->get_failed_url();