Merge branch 'release/1.3.0'

ixopay · Oct 1, 2019 · ca0afb2 · ca0afb2
2 parents e611ab3 + 9e85974
commit ca0afb2
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Release Notes
 
+## v1.3.0 (2019-09-30)
+### Added
+- Preauthorize/Capture/Void transaction request option
+- Plugin author, WooCommerce minimum & tested up to version
+### Changed
+- Unified payment failure response
+
 ## v1.2.0 (2019-09-10)
 ### Added
 - [README](README.md) note on enabling/disabling additional adapters

diff --git a/build.php b/build.php
@@ -2,7 +2,7 @@
 /**
  * extension source version
  */
-$version = '1.2.0';
+$version = '1.3.0';
 
 /**
  * dist filename

diff --git a/src/classes/includes/payment-gateway-cloud-creditcard.php b/src/classes/includes/payment-gateway-cloud-creditcard.php
@@ -106,10 +106,21 @@ public function process_payment($orderId)
         }
 
         /**
-         * debit
+         * transaction
          */
-        $debit = new \PaymentGatewayCloud\Client\Transaction\Debit();
-        $debit->setTransactionId($orderId)
+        $transactionRequest = $this->get_option('transactionRequest');
+        $transaction = null;
+        switch ($transactionRequest) {
+            case 'preauthorize':
+                $transaction = new \PaymentGatewayCloud\Client\Transaction\Preauthorize();
+                break;
+            case 'debit':
+            default:
+                $transaction = new \PaymentGatewayCloud\Client\Transaction\Debit();
+                break;
+        }
+
+        $transaction->setTransactionId($orderId)
             ->setAmount(floatval($this->order->get_total()))
             ->setCurrency($this->order->get_currency())
             ->setCustomer($customer)
@@ -131,21 +142,29 @@ public function process_payment($orderId)
                     'redirect' => $this->order->get_checkout_payment_url(false),
                 ];
             }
-            $debit->setTransactionToken($token);
+            $transaction->setTransactionToken($token);
         }
 
         /**
          * transaction
          */
-        $result = $client->debit($debit);
+        switch ($transactionRequest) {
+            case 'preauthorize':
+                $result = $client->preauthorize($transaction);
+                break;
+            case 'debit':
+            default:
+                $result = $client->debit($transaction);
+                break;
+        }
 
         if ($result->isSuccess()) {
             $woocommerce->cart->empty_cart();
 
-            $gatewayReferenceId = $result->getReferenceId();
+            // $gatewayReferenceId = $result->getReferenceId();
             if ($result->getReturnType() == PaymentGatewayCloud\Client\Transaction\Result::RETURN_TYPE_ERROR) {
-                $errors = $result->getErrors();
-                $this->order->update_status('failed', __('Payment failed or was declined', 'woocommerce'));
+                // $errors = $result->getErrors();
+                return $this->paymentFailedResponse();
             } elseif ($result->getReturnType() == PaymentGatewayCloud\Client\Transaction\Result::RETURN_TYPE_REDIRECT) {
                 return [
                     'result' => 'success',
@@ -166,9 +185,16 @@ public function process_payment($orderId)
         /**
          * something went wrong
          */
-        wp_send_json_error([
-            'error' => $result->getFirstError()->getMessage(),
-        ]);
+        return $this->paymentFailedResponse();
+    }
+
+    private function paymentFailedResponse()
+    {
+        $this->order->update_status('failed', __('Payment failed or was declined', 'woocommerce'));
+        return [
+            'result' => 'error',
+            'redirect' => $this->get_return_url($this->order),
+        ];
     }
 
     public function process_callback()
@@ -245,6 +271,17 @@ public function init_form_fields()
                 'description' => 'Integration Key',
                 'default' => '',
             ],
+            'transactionRequest' => [
+                'title' => 'Transaction Request',
+                'type' => 'select',
+                'label' => 'Transaction Request',
+                'description' => 'Transaction Request',
+                'default' => 'debit',
+                'options' => [
+                    'debit' => 'Debit',
+                    'preauthorize' => 'Preauthorize/Capture/Void',
+                ],
+            ],
         ];
     }
 

diff --git a/src/readme.txt b/src/readme.txt
@@ -2,9 +2,11 @@
 Contributors: Payment Gateway Cloud
 Tags: Credit Card, e-commerce, payment, checkout
 Requires at least: 4.9
-Tested up to: 5.0.4
+Tested up to: 5.2.3
 Requires PHP: 7.1
 Stable tag: X.Y.Z
+WC requires at least: 3.6.0
+WC tested up to: 3.7.0
 
 Payment Gateway Cloud WooCommerce Extension
 

diff --git a/src/woocommerce-payment-gateway-cloud.php b/src/woocommerce-payment-gateway-cloud.php
@@ -3,6 +3,9 @@
  * Plugin Name: WooCommerce Payment Gateway Cloud Extension
  * Description: Payment Gateway Cloud for WooCommerce
  * Version: X.Y.Z
+ * Author: Payment Gateway Cloud
+ * WC requires at least: 3.6.0
+ * WC tested up to: 3.7.0
  */
 if (!defined('ABSPATH')) {
     exit;