Merge pull request #382 from Billmate/dev

Prepearing for realase 3.9.3

Author: MattiasNilsson

src/Readme.txt

@@ -84,6 +84,9 @@ If you would like to use our logos on your site:
 https://www.billmate.se/press-och-media/
 == Changelog ==
 
+=  3.9.3 (2020-01-28)
+* Fix - Card payment comes to the right thank you page with Polylang
+
 =  3.9.2 (2020-01-23)
 * Fix - Resolved debug errors being generated by module 
 * Fix - Resolved critical error in library, caused by Wordpress not being able to connect to Billmates API

src/commonfunctions.php

@@ -1,5 +1,5 @@
 <?php
-define('BILLPLUGIN_VERSION','3.9.2');
+define('BILLPLUGIN_VERSION','3.9.3');
 define('BILLMATE_CLIENT','PHP:Woocommerce:'.BILLPLUGIN_VERSION);
 define('BILLMATE_SERVER','2.1.9');
 

src/gateway-billmate.php

@@ -477,6 +477,7 @@ public function common_check_ipn_response($config = array()) {
             $checkout =         false;
             $k =                new Billmate($this->eid,$this->secret,true,$testmode == 'yes',false);
             $payment_note =     '';
+            $redirect = '';
 
             if(!empty($_GET['method']) && $_GET['method'] == 'checkout')
                 $checkout = true;
@@ -968,6 +969,11 @@ public function common_check_ipn_response($config = array()) {
                                 && $storeOrderTotalCompare + 300 >= $billmateOrderTotalCompare
                         ) {
                             // Set order as paid if paid amount matches order total amount
+                            if (version_compare(WC_VERSION, '2.0.0', '<')) {
+                                $redirect = add_query_arg('key', $order->order_key, add_query_arg('order', $order_id, get_permalink(get_option('woocommerce_thanks_page_id'))));
+                            } else {
+                                $redirect = $this->get_return_url($order);
+                            }
                             $order->payment_complete();
                             if ($this->order_status != 'default') {
                                 $order->update_status($this->order_status);
@@ -1109,13 +1115,14 @@ public function common_check_ipn_response($config = array()) {
                 }
 
                 if( $accept_url_hit ){
-                    $redirect = '';
                     WC()->cart->empty_cart();
                     delete_transient($transientPrefix.$order_id);
-                    if(version_compare(WC_VERSION, '2.0.0', '<')){
-                        $redirect = add_query_arg('key', $order->order_key, add_query_arg('order', $order_id, get_permalink(get_option('woocommerce_thanks_page_id'))));
-                    } else {
-                        $redirect = $this->get_return_url($order);
+                    if ($redirect == '') {
+                        if (version_compare(WC_VERSION, '2.0.0', '<')) {
+                            $redirect = add_query_arg('key', $order->order_key, add_query_arg('order', $order_id, get_permalink(get_option('woocommerce_thanks_page_id'))));
+                        } else {
+                            $redirect = $this->get_return_url($order);
+                        }
                     }
                     WC()->session->__unset( 'billmate_checkout_hash' );
                     WC()->session->__unset( 'billmate_checkout_order' );
@@ -1129,10 +1136,12 @@ public function common_check_ipn_response($config = array()) {
             if( $accept_url_hit ) {
                 // Remove cart
                 WC()->cart->empty_cart();
-                if(version_compare(WC_VERSION, '2.0.0', '<')){
-                    $redirect = add_query_arg('key', $order->order_key, add_query_arg('order', $order_id, get_permalink(get_option('woocommerce_thanks_page_id'))));
-                } else {
-                    $redirect = $this->get_return_url($order);
+                if ($redirect == '') {
+                    if (version_compare(WC_VERSION, '2.0.0', '<')) {
+                        $redirect = add_query_arg('key', $order->order_key, add_query_arg('order', $order_id, get_permalink(get_option('woocommerce_thanks_page_id'))));
+                    } else {
+                        $redirect = $this->get_return_url($order);
+                    }
                 }
                 WC()->session->__unset( 'billmate_checkout_hash' );
                 WC()->session->__unset( 'billmate_checkout_order' );