Changeset 1787349

Timestamp:

12/14/2017 11:47:49 PM (8 years ago)

Author:

cloughit

Message:

2017.11.30

Location:

payment-gateway-poli-for-woocommerce/trunk

Files:

• readme.txt (modified) (2 diffs)
• woocommerce-poli.php (modified) (6 diffs)

payment-gateway-poli-for-woocommerce/trunk/readme.txt

@@ -4 +4 @@
 Donate link: https://cloughit.com.au/donate/
 Requires at least: 4.0
-Tested up to: 4.8
-Stable tag: 2017.05.22
+Tested up to: 4.9.1
+Stable tag: 2017.11.30
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -46 +46 @@
 == Changelog ==
 
+= 2017.11.30 =
+
+* MOD: Changed method to get order details
+* MOD: Changed method to obtain URL's
+
 = 2017.05.22 =
 

payment-gateway-poli-for-woocommerce/trunk/woocommerce-poli.php

@@ -5 +5 @@
  * Author:      Clough I.T. Solutions
  * Author URI:  https://cloughit.com.au
- * Version:     2017.05.22
+ * Version:     2017.11.30
  * Text Domain: payment-gateway-poli-for-woocommerce
  * License:     GNU General Public License v2 or later
@@ -78 +78 @@
         public function process_payment( $order_id ) {
             global $woocommerce;
-            $order = new WC_Order( $order_id );
+            // 2017.11.30
+            // $order = new WC_Order( $order_id );
+            $order = wc_get_order( $order_id );
 
             // Mark as on-hold (we're awaiting the cheque)
@@ -89 +91 @@
                 'Amount' => $order->get_total(),
                 'CurrencyCode' => get_woocommerce_currency(),
-                'MerchantReference' => $order_id,
+                // 2017.11.30
+                // 'MerchantReference' => $order_id,
+                'MerchantReference' => $order->get_id(),
                 'MerchantHomepageURL' => home_url( '/' ),
                 'SuccessURL' => str_replace( 'https:', 'http:', add_query_arg( 'wc-api', 'poli_nudge', home_url( '/' ) ) ),
                 'FailureURL' => str_replace( 'https:', 'http:', add_query_arg( 'wc-api', 'poli_nudge', home_url( '/' ) ) ),
-                'CancellationURL' => get_permalink( woocommerce_get_page_id( 'pay' ) ),
+                // 2017.11.30
+                // 'CancellationURL' => get_permalink( woocommerce_get_page_id( 'pay' ) ),
+                'CancellationURL' => WC_Order::get_checkout_payment_url(),
                 'NotificationURL' => str_replace( 'https:', 'http:', add_query_arg( 'wc-api', 'poli_nudge', home_url( '/' ) ) )
             );
@@ -146 +152 @@
             curl_setopt( $ch, CURLOPT_POST, 0 );
             curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, 0 );
-            curl_setopt($ch, CURLOPT_REFERER, $referrer);//Set the referrer
+            curl_setopt( $ch, CURLOPT_REFERER, $referrer);//Set the referrer
             curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
             $response = curl_exec( $ch );
@@ -155 +161 @@
             if ( $json['TransactionStatusCode'] == 'Completed' ) {
                 $order_id = $json['MerchantReference'];
-                $order = new WC_Order( $order_id );
+                // 2017.11.30
+                // $order = new WC_Order( $order_id );
+                $order = wc_get_order( $order_id );
+                
                 $order->add_order_note( __( 'POLi Nudge Recieved. POLi ID: ' . $json['TransactionRefNo'], 'payment-gateway-poli-for-woocommerce' ) );
                 $order->payment_complete();
@@ -170 +179 @@
                 $error_message = $json['ErrorMessage'];
                 $woocommerce->add_error( __( 'Payment error:', 'payment-gateway-poli-for-woocommerce') . ' Order ID: ' . $order_id . ' Error Code: ' . $error_code . ' Error Message: ' .$error_message );
-                $redirect_url = get_permalink( woocommerce_get_page_id( 'pay' ) );
+                // 2017.11.30
+                // $redirect_url = get_permalink( woocommerce_get_page_id( 'pay' ) );
+                $redirect_url = WC_Order::get_checkout_payment_url();
                 wp_safe_redirect( $redirect_url );
                 exit();