Changeset 2712100

Timestamp:

04/20/2022 10:50:54 AM (4 years ago)

Author:

quadpay

Message:

version 1.7.0 (defer funds capture)

Location:

quadpay-gateway-for-woocommerce

Files:

• tags/1.7.0 (copied) (copied from quadpay-gateway-for-woocommerce/trunk)
• tags/1.7.0/includes/class-quadpay-api.php (added)
• tags/1.7.0/includes/class-quadpay-gateway.php (modified) (19 diffs)
• tags/1.7.0/includes/class-quadpay-logger.php (added)
• tags/1.7.0/includes/class-quadpay-settings.php (modified) (4 diffs)
• tags/1.7.0/quadpay.php (modified) (5 diffs)
• tags/1.7.0/readme.txt (modified) (2 diffs)
• trunk/includes/class-quadpay-api.php (added)
• trunk/includes/class-quadpay-gateway.php (modified) (19 diffs)
• trunk/includes/class-quadpay-logger.php (added)
• trunk/includes/class-quadpay-settings.php (modified) (4 diffs)
• trunk/quadpay.php (modified) (5 diffs)
• trunk/readme.txt (modified) (2 diffs)

quadpay-gateway-for-woocommerce/tags/1.7.0/includes/class-quadpay-gateway.php

@@ -4 +4 @@
 
     /**
-     * @var $_instance WC_Gateway_QuadPay The reference to the singleton instance of this class
+     * The reference to the singleton instance of this class
+     *
+     * @var $_instance WC_Gateway_QuadPay
      */
     private static $_instance = NULL;
 
     /**
-     * @var boolean Whether or not logging is enabled
-     */
-    public static $log_enabled = false;
-
-    /**
-     * @var WC_Logger Logger instance
-     */
-    public static $log = false;
-
-    /**
      * @var string
      */
-    private $territory = 'US';
+    private $client_id;
+
     /**
      * @var string
      */
-    private $client_id;
+    private $client_secret;
+
     /**
      * @var string
      */
-    private $client_secret;
+    private $mode;
+
     /**
      * @var string
      */
-    private $mode;
+    private $minimum_amount;
+
     /**
      * @var string
      */
-    private $minimum_amount;
-    /**
-     * @var string
-     */
     private $maximum_amount;
-    /**
-     * @var string
-     */
-    public $orderurl;
-    /**
-     * @var string
-     */
-    private $configurationUrl;
-    /**
-     * @var string
-     */
-    private $order_check_time;
 
     /**
@@ -80 +60 @@
         $this->method_title = __( 'Zip - Pay in 4 installments', 'woo_quadpay' );
         $this->method_description = __( 'Use Zip as a credit or debit card processor for WooCommerce.', 'woo_quadpay' );
-
         $this->title = __( 'Zip - Pay in 4 installments', 'woo_quadpay');
-
         $this->description = __('Pay in 4 installments.','woo_quadpay');
-
-        $this->supports = array( 'products', 'refunds' );
-
+        $this->supports = [ 'products', 'refunds' ];
         $this->icon = QUADPAY_WC_PLUGIN_URL . 'assets/images/zip-logo-color.svg';
 
@@ -99 +75 @@
         $this->init_settings();
 
-        $api_url = $this->quadpay_settings->get_environment('api_url');
-
-        $this->orderurl         = $api_url . '/order';
-        $this->configurationUrl = $api_url . '/configuration';
-
-        self::$log_enabled = ($this->get_option( 'logging' ) === 'yes');
-
-        if ($this->mode !== 'production') {
+        if ( $this->mode !== 'production' && !is_admin() ) {
             $this->title .= ' (TEST MODE)';
         }
@@ -115 +84 @@
     public function init()
     {
-        add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-
-        add_action( 'woocommerce_thankyou', array( $this, 'payment_callback' ) );
-
-        // Don't enable QuadPay if the amount limits are not met
-        add_filter( 'woocommerce_available_payment_gateways', array( $this, 'check_cart_within_limits' ), 99, 1 );
-
-        add_action( 'woocommerce_update_options_checkout', array( $this, 'save_options_page') );
+        add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, [ $this, 'process_admin_options' ] );
+
+        add_action( 'woocommerce_thankyou', [ $this, 'payment_callback' ] );
+
+        add_action( 'woocommerce_update_options_checkout', [ $this, 'save_options_page' ] );
+
+        add_action( 'woocommerce_order_status_changed', [ $this, 'process_capture' ], null, 4 );
+        add_action( 'woocommerce_order_status_changed', [ $this, 'process_void' ], null, 4 );
     }
 
@@ -129 +98 @@
      */
     private function init_options() {
-        $this->territory                         = $this->get_option( 'territory', 'US' );
-        $this->client_id                         = $this->get_option( 'client_id' );
-        $this->client_secret                     = $this->get_option( 'client_secret' );
-        $this->mode                              = $this->get_option( 'testmode' );
-        $this->minimum_amount                    = $this->get_option( 'quadpay-amount-minimum' );
-        $this->maximum_amount                    = $this->get_option( 'quadpay-maximum-amount' );
-        // Default value 24h
-        $this->order_check_time =
-            ( !empty( $this->get_option( 'order_check_time' ) ) ? $this->get_option( 'order_check_time' ) : 'DAY_IN_SECONDS');
-    }
-
-    /**
-     * Check if this gateway is enabled
+        $this->client_id = $this->get_option( 'client_id' );
+        $this->client_secret = $this->get_option( 'client_secret' );
+        $this->mode = $this->get_option( 'testmode' );
+        $this->minimum_amount = $this->get_option( 'quadpay-amount-minimum', 35 );
+        $this->maximum_amount = $this->get_option( 'quadpay-maximum-amount', 1500 );
+    }
+
+    /**
+     * @inheritDoc
      */
     public function is_available() {
+
         if ( 'yes' !== $this->enabled ) {
             return false;
@@ -149 +115 @@
 
         if ( ! ( $this->client_id && $this->client_secret ) ) {
+            return false;
+        }
+
+        if ( is_admin() || !WC()->cart ) {
+            return true;
+        }
+
+        $total = $this->get_order_total();
+        if ( $total < $this->minimum_amount || $total > $this->maximum_amount ) {
+            return false;
+        }
+
+        $billing_country = '';
+        if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.0', '<' ) ) {
+            global $woocommerce;
+            $billing_country = $woocommerce->customer->country;
+        } else if ( null !== WC()->customer && null !== WC()->customer->get_billing_country() ) {
+            // make sure to call the member function only if not null
+            // @since 1.3.11
+            $billing_country = WC()->customer->get_billing_country();
+        }
+
+        if ( ! in_array( $billing_country, Quadpay_WC_Settings::ALLOWED_COUNTRIES ) ) {
             return false;
         }
@@ -166 +155 @@
      */
     public function admin_options() {
-
-        wp_cache_flush();
-
-        $settings = get_option( 'woocommerce_quadpay_settings' );
-        $min_amount = $settings['quadpay-amount-minimum'];
-        $max_amount = $settings['quadpay-maximum-amount'];
-        unset( $settings );
-
         ?>
         <h2><?php _e( 'Zip Gateway', 'woo_quadpay' ); ?></h2>
         <?php
-        $login = (bool) ( false === $this->get_quadpay_authorization_code( 'login check' ) ? false : true );
+        $login = ( $this->get_quadpay_authorization_code() !== false );
         ?>
         <p style="color: <?php echo $login ? 'green' : 'red' ?>">
-            <?php echo( !$login ? __( 'Zip login failed. Please check your Client ID and Client Secret.', 'woo_quadpay' ) : __( 'Validation of Zip login credentials passed successful.', 'woo_quadpay' ) ); ?>
+            <?php echo $login ?
+                __( 'Validation of Zip login credentials passed successful.', 'woo_quadpay' ) :
+                __( 'Zip login failed. Please check your Client ID and Client Secret.', 'woo_quadpay' );
+            ?>
         </p>
 
@@ -191 +175 @@
                 </th>
                 <td class="forminp">
-                    <?php echo $min_amount ?>
+                    <?php echo $this->minimum_amount ?>
                 </td>
             </tr>
@@ -199 +183 @@
                 </th>
                 <td class="forminp">
-                    <?php echo $max_amount ?>
+                    <?php echo $this->maximum_amount ?>
                 </td>
             </tr>
+            <?php if ($this->get_option('defer_funds_capture', false)): ?>
+            <tr valign="top">
+                <th scope="row" class="titledesc">
+                    <label for="woocommerce_quadpay_max_amount"><?php _e( 'Defer Funds Capture', 'woo_quadpay' ) ?></label>
+                </th>
+                <td class="forminp"><?php _e( 'Yes', 'woo_quadpay' ) ?></td>
+            </tr>
+            <?php endif; ?>
             </tbody>
         </table>
@@ -244 +236 @@
      * Request an order token from QuadPay
      *
-     * @param string $reference where does the request come from
-     *
-     * @return  string or boolean false if no token generated
-     */
-    public function get_quadpay_authorization_code( $reference = 'get_quadpay_authorization_code' ) {
-
-        $access_token = wp_cache_get( 'quadpay_access_token', 'quadpay' );
-
-        if ( false !== $access_token ) {
-            self::log( 'Access token from cache' );
-            return $access_token;
-        }
-
-        if ( false === $this->apiKeysAvailable( $reference ) ) {
-            return false;
-        }
-
-        $AuthURL = $this->quadpay_settings->get_environment( 'auth_url' );
-
-        $AuthBody = array(
-            'client_id'     => $this->client_id,
-            'client_secret' => $this->client_secret,
-            'audience'      => $this->quadpay_settings->get_environment( 'auth_audience' ),
-            'grant_type'    => 'client_credentials',
-        );
-
-        $args = array(
-            'method' => 'POST',
-            'headers' => array( 'Content-Type' => 'application/json'),
-            'body' =>  json_encode( $AuthBody )
-        );
-
-        $response = wp_remote_post($AuthURL ,$args);
+     * @return string|false
+     * @deprecated
+     */
+    public function get_quadpay_authorization_code() {
+        return Quadpay_WC_Api::instance()->get_auth_token() ?: false;
+    }
+
+    /**
+     * Save options page in admin, update payment limits
+     */
+    public function save_options_page() {
+        self::log( __METHOD__ );
+        wp_cache_flush();
+        // reload settings and options
+        $this->init_settings();
+        $this->init_options();
+        // update configuration from api
+        $this->update_payment_limits();
+    }
+
+    /**
+     * Update settings from configuration api (min, max and dfc)
+     *
+     * @return bool
+     */
+    public function update_payment_limits() {
+
+        if ( !$this->client_id || !$this->client_secret ) {
+            return false;
+        }
+
+        self::log( __METHOD__ );
+
+        $response = Quadpay_WC_Api::instance()->configuration();
 
         if ( is_wp_error( $response ) ) {
-            self::log( '[Authentication] QuadPay API Error: ' . $response->get_error_message() );
-            return false;
-        }
-
-        $body = json_decode(wp_remote_retrieve_body($response));
-
-        $response_code = wp_remote_retrieve_response_code( $response );
-
-        if ( $response_code == 200 ) {
-
-            self::log( '[Retrieve response] Response code ' . $response_code . ' valid');
-
-            //store this in cache
-            wp_cache_set('quadpay_access_token', $body->access_token, 'quadpay', $body->expires_in);
-
-            self::log( '[Retrieve response] Access token available.' );
-
-            return $body->access_token;
-
-        } else {
-
-            if ( 401 == $response_code ) {
-                self::log( '[Retrieve response] QuadPay login failed. Please check login credentials.' );
-            } else {
-                self::log( '[Retrieve response] Error response code ' . $response_code );
-            }
-
-            return false;
-        }
-    }
-
-    private function apiKeysAvailable( $reference ) {
-
-        if ( empty( $this->client_id ) || empty( $this->client_secret ) ) {
-            self::log( '[API key availability check] API keys not available. Reference: ' . $reference );
-
-            return false;
-        }
-
-        self::log( '[API key availability check] API keys available. Reference: ' . $reference );
-        //self::log( '[API key availability check] Client ID: ' . $this->client_id );
-        //self::log( '[API key availability check] Client secret: ' . $this->client_secret );
+            return false;
+        }
+
+        $this->quadpay_settings->update_options([
+            'quadpay-amount-minimum' => $response->minimumAmount,
+            'quadpay-maximum-amount' => $response->maximumAmount,
+            'defer_funds_capture' => $response->deferFundsCapture
+        ]);
 
         return true;
-    }
-
-    public function save_options_page() {
-        self::log( '[Saved settings] start' );
-        wp_cache_flush();
-        $this->init_options();
-        $this->update_payment_limits();
-        self::log( '[Saved settings] end' );
-    }
-
-    public function update_payment_limits() {
-
-        // Get existing limits
-        $settings = get_option('woocommerce_quadpay_settings');
-
-        if( false === $this->apiKeysAvailable( 'update_payment_limits' ) ) {
-            return false;
-        }
-
-        self::log( '[Updating payment limits] request values');
-
-        $headers = array(
-                'headers' => array(
-                    'Authorization' => 'Bearer ' . $this->get_quadpay_authorization_code( 'update_payment_limits' ),
-                )
-        );
-
-        $response      = wp_remote_get( $this->configurationUrl, $headers );
-        $body          = json_decode( wp_remote_retrieve_body( $response ) );
-        $response_code = wp_remote_retrieve_response_code( $response );
-
-        self::log( '[Updating payment limits] response code: ' . $response_code );
-        self::log( '[Updating payment limits] response: ' . print_r( $body, true ) );
-
-        if ( $response_code == 200 ) {
-
-            $settings['quadpay-amount-minimum'] = $body->minimumAmount;
-            $settings['quadpay-maximum-amount'] = $body->maximumAmount;
-
-            update_option( 'woocommerce_quadpay_settings', $settings );
-
-            return true;
-        }
-
-        return false;
     }
 
@@ -375 +289 @@
      *
      * @param int $order_id
-     *
      * @return array
      */
     public function process_payment( $order_id ) {
 
-        if ( function_exists( 'wc_get_order' ) ) {
-            $order = wc_get_order( $order_id );
-        } else {
-            $order = new WC_Order( $order_id );
-        }
-
-        // Get the authorization token
-        $access_token = $this->get_quadpay_authorization_code( 'process_payment');
+        $order = wc_get_order( $order_id );
 
         //Process here
-        $orderitems = $order->get_items();
+        $order_items = $order->get_items();
         $items = array();
 
-        if ( count($orderitems ) ) {
-
-            foreach ( $orderitems as $item ) {
-
-                if ( $item['variation_id'] ) {
-
-                    if ( function_exists( "wc_get_product" ) ) {
-                        $product = wc_get_product( $item['variation_id'] );
-                    } else {
-                        $product = new WC_Product( $item['variation_id'] );
-                    }
-
-                } else {
-
-                    if ( function_exists( "wc_get_product" ) ) {
-                        $product = wc_get_product( $item['product_id'] );
-                    } else {
-                        $product = new WC_Product( $item['product_id'] );
-                    }
-
-                }
+        if ( count($order_items ) ) {
+
+            foreach ( $order_items as $item ) {
+
+                $product = wc_get_product( $item['variation_id'] ?: $item['product_id'] );
 
                 $items[] = array(
@@ -465 +355 @@
                 'postcode'     => $this->get_order_prop( $order, 'shipping_postcode' ),
             ),
-            'description'       => 'string',
+            'description'       => "Order #$order_id",
             'items'             => $items,
             'merchant'          => array(
@@ -474 +364 @@
             'taxAmount'         => $order->get_total_tax(),
             'shippingAmount'    => $shipping_total,
-            'merchantFeeForPaymentPlan' => $mfpp_total
+            'merchantFeeForPaymentPlan' => $mfpp_total,
+            'metadata' => array(
+                'platform' => 'WooCommerce'
+            )
         );
 
-        $headers = array(
-            'Content-Type'  => 'application/json',
-            'Authorization' => 'Bearer ' . $access_token,
+        self::log( 'POST Order request');
+        $response = Quadpay_WC_Api::instance()->order( $body );
+
+        // Couldn't generate token
+        if ( is_wp_error($response) ) {
+
+            $order->add_order_note(
+                __('Unable to generate the order token. Payment could not proceed.', 'woo_quadpay' )
+            );
+
+            wc_add_notice(
+                __('Sorry, there was a problem preparing your payment. Please try again.', 'woo_quadpay'),
+                'error'
+            );
+
+            return [];
+        }
+
+        // Order token successful, save it so we can confirm it later
+        update_post_meta( $order_id, '_quadpay_order_token', $response->token );
+        update_post_meta( $order_id, '_quadpay_order_id', $response->orderId );
+
+        return array(
+            'result'    => 'success',
+            'redirect'  => $response->redirectUrl
         );
-
-        $order_args = array(
-            'method'  => 'POST',
-            'headers' => $headers,
-            'body'    => json_encode( $body ),
-            'timeout' => 30,
-        );
-
-        self::log( 'POST Order request: '.print_r( $order_args,true ) );
-
-        $APIURL = $this->orderurl;
-
-        $order_response = wp_remote_post( $APIURL, $order_args );
-
-        $response_code = wp_remote_retrieve_response_code( $order_response );
-
-        $order_body = json_decode( wp_remote_retrieve_body( $order_response ) );
-
-        self::log( 'POST Order response: ' . print_r( $order_body,true ) );
-
-        $valid_response_code = array( 200, 201 );
-
-        if ( ! in_array( $response_code, $valid_response_code ) ) {
-            // Couldn't generate token
-            $order->add_order_note(__('Unable to generate the order token. Payment couldn\'t proceed.', 'woo_quadpay' ) );
-
-            wc_add_notice(__('Sorry, there was a problem preparing your payment. Please try again.', 'woo_quadpay'),'error');
-
-            return;
-
-        } else {
-            // Order token successful, save it so we can confirm it later
-            update_post_meta( $order_id,'_quadpay_order_token', $order_body->token );
-
-            $redirect = $order_body->redirectUrl;
-
-            return array(
-                'result'    => 'success',
-                'redirect'  => $redirect
-            );
-        }
-
-    }
-
+    }
+
+    /**
+     * Resolves Zip order id from order metadata
+     *
+     * @param $order_id
+     * @return string|false
+     */
     public function get_quadpay_order_id( $order_id ) {
 
@@ -533 +412 @@
         }
 
-        $access_token = $this->get_quadpay_authorization_code( 'get_quadpay_order_id');
         $order_token  = get_post_meta( $order_id, '_quadpay_order_token', true );
 
@@ -540 +418 @@
         }
 
-        //check if quadpay order id already exists
-
-        //get the order id and save in postmeta
-        $get_args = array(
-            'headers'   => array(
-                'Content-Type' => 'application/json',
-                'Authorization' => 'Bearer '. $access_token
-            ),
-        );
-
-        $getOrderUrl = $this->orderurl . '?token=' . $order_token;
-
-        $get_response = wp_remote_get( $getOrderUrl, $get_args );
-        $get_body     = json_decode( wp_remote_retrieve_body( $get_response ) );
-
-        self::log( 'Get Order result: ' . print_r( $get_body, true ) );
-
-        $quadpay_order_id     = $get_body->orderId;
-        $quadpay_order_status = $get_body->orderStatus;
-
-        //store order id for future purposes
-        if ( $quadpay_order_status !== 'Approved' ) {
-            return false;
-        }
-
-        update_post_meta($order_id,'_quadpay_order_id', $quadpay_order_id);
-        update_post_meta($order_id,'_quadpay_order_status', $quadpay_order_status);
-
-        return $quadpay_order_id;
-    }
-
-    /**
-     * @param $order_id
-     */
-    public function payment_callback($order_id) {
-
-        if ( function_exists( "wc_get_order" ) ) {
-            $order = wc_get_order( $order_id );
-        } else {
-            $order = new WC_Order( $order_id );
-        }
+        update_post_meta($order_id, '_quadpay_order_id', $order_token );
+
+        return $order_token;
+    }
+
+    /**
+     * Thank You page callback
+     *
+     * @param int $order_id
+     */
+    public function payment_callback( $order_id ) {
+
+        $order = wc_get_order( $order_id );
 
         if ( 'quadpay' !== $order->get_payment_method() ) {
@@ -587 +437 @@
 
         //save the order id
-        $quadpay_order_id = $this->get_quadpay_order_id($order_id);
-
-        $order_token = get_post_meta($order_id, '_quadpay_order_token', true);
-        if ($quadpay_order_id == false) {
-            $order->add_order_note(sprintf(__('Failure to process the Zip payment.','woo_quadpay') ));
-        } else if ( !empty($order_token) ) {
-
-            $quadpay_order_id = $this->get_quadpay_order_id($order_id);
-
-            //Update status for order
-            if (isset($_GET['status'])) {
-
-                $query_string = $_GET['status'];
-
-                if ($query_string != NULL) {
-                    if ($query_string === 'confirmed') {
-
-                        $order->add_order_note(sprintf(__('Payment approved. Zip Order ID: '.$quadpay_order_id.' ','woo_quadpay') ));
-                        $order->payment_complete($quadpay_order_id);
-                        wc_empty_cart();
-
-                    } elseif ($query_string === 'cancelled') {
-
-                        $order->add_order_note(sprintf(__('Zip payment is pending approval. Zip Order ID: '.$quadpay_order_id.' ','woo_quadpay') ));
-                        $order->update_status( 'cancelled' );
-
-
-                    } elseif ($query_string === 'failure') {
-
-                        $order->add_order_note(sprintf(__('Zip payment declined. Order ID from Zip: '.$quadpay_order_id.' ','woo_quadpay') ));
-                        $order->update_status('failed');
-                    }
-
-                } else {
-                    $order->update_status('pending');
-                }
-            }
-
-        }
-
-    }
-
-    /**
-     * Check whether the cart amount is within payment limits
-     *
-     * @param  array $gateways Enabled gateways
-     * @return  array Enabled gateways, possibly with QuadPay removed
-     */
-    public function check_cart_within_limits($gateways) {
-
-        if ( is_admin() ) {
-            return $gateways;
-        }
-
-        $total = WC()->cart->total;
-
-        $minAmount = isset( $this->minimum_amount ) ? $this->minimum_amount : null;
-        $maxAmount = isset( $this->maximum_amount ) ? $this->maximum_amount : null;
-
-        if ( $minAmount == null || $maxAmount == null ) {
-            self::log('Requesting payment limit update');
-
-            $status = $this->update_payment_limits();
-
-            if ( $status ) {
-
-                $settings = get_option( 'woocommerce_quadpay_settings' );
-
-                $minAmount = $settings['quadpay-amount-minimum'];
-                $maxAmount = $settings['quadpay-maximum-amount'];
-
-            }
-        } else {
-            self::log('Using cached payment limits');
-        }
-
-        $pbi = ( $total >= $minAmount && $total <= $maxAmount );
-
-        $billing_country = '';
-        if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.0', '<' ) ) {
-            global $woocommerce;
-            $billing_country = $woocommerce->customer->country;
-        } else if ( null !== WC()->customer && null !== WC()->customer->get_billing_country() ) {
-            // make sure to call the member function only if not null
-            // @since 1.3.11
-            $billing_country = WC()->customer->get_billing_country();
-        }
-
-        if ( ! $pbi || ! in_array( $billing_country, array( 'US', 'CA' ) ) ) {
-            unset( $gateways['quadpay'] );
-        }
-
-        return $gateways;
-    }
-
-    /**
-     * Can the order be refunded?
-     *
-     * @param  object $order WC_Order
+        $quadpay_order_id = $this->get_quadpay_order_id( $order_id );
+
+        if ( $quadpay_order_id === false ) {
+            $order->add_order_note(sprintf(__('Failure to process the Zip payment.', 'woo_quadpay')));
+            return;
+        }
+
+        // check response and not query
+        $this->sync_order_status( $order );
+    }
+
+    /**
+     * Can the order be refunded
+     *
+     * @param  WC_Order $order
      * @return bool
      */
     public function can_refund_order( $order ) {
-        return $order && $order->get_transaction_id();
-    }
-
-    /**
-     * Process a refund if supported
-     *
-     * @param object $order_id WC_Order
+        //return $order && $order->get_transaction_id();
+        return $order && in_array( $order->get_status(), wc_get_is_paid_statuses() );
+    }
+
+    /**
+     * Process a refund
+     *
+     * @param int $order_id
      * @param float $amount
      * @param string $reason
      *
-     * @return  boolean True or false based on success
+     * @return bool
      */
     public function process_refund( $order_id, $amount = null, $reason = '' ) {
 
         $quadpay_order_id = $this->get_quadpay_order_id( $order_id );
-
-        $order = new WC_Order( $order_id );
+        $order = wc_get_order( $order_id );
 
         if ( empty( $quadpay_order_id ) ) {
-
             $order->add_order_note( sprintf( __( 'There was an error submitting the refund to Zip.', 'woo_quadpay' ) ) );
-
-            return false;
-        }
-
-        $access_token  = $this->get_quadpay_authorization_code( 'process_refund' );
-        $random_string = wp_generate_password( 8, false, false );
-
-        $refund_args = array(
-            'headers' => array(
-                'Content-Type'  => 'application/json',
-                'Authorization' => 'Bearer ' . $access_token,
-            ),
-            'body'    => json_encode( array(
-                'requestId'               => 'Order #' . $order_id . '-' . $random_string,
-                'amount'                  => $amount,
-                'merchantRefundReference' => 'Order #' . $order_id . '-' . $random_string,
-            ) ),
-        );
-
-        $refundOrderUrl = $this->orderurl.'/'.$quadpay_order_id.'/refund';
-
-        $refund_response = wp_remote_post( $refundOrderUrl, $refund_args );
-        $refund_body     = json_decode( wp_remote_retrieve_body( $refund_response ) );
-
-        self::log( 'Refund body: ' . print_r( $refund_body, true ) );
-
-        $response_code = (int)$refund_response['response']['code'];
-
-        if ( $response_code === 201 || $response_code === 200 ) {
-            $order->add_order_note( sprintf( __( 'Refund of $%s successfully sent to Zip.', 'woo_quadpay' ), $amount ) );
-            return true;
-        }
-
-        if ( $response_code === 404 ) {
-            $order->add_order_note( sprintf( __( 'Order not found on Zip.', 'woo_quadpay' ) ) );
-        } else {
+            return false;
+        }
+
+        $merchant_refund_reference = 'Order #' . $order_id . '-' . wp_generate_password( 8, false, false );
+
+        $response = Quadpay_WC_Api::instance()->refund( $quadpay_order_id, $amount, $merchant_refund_reference );
+
+        if ( is_wp_error($response) ) {
             $order->add_order_note( sprintf( __( 'There was an error submitting the refund to Zip.', 'woo_quadpay' ) ) );
-        }
-
-        return false;
+            return false;
+        }
+
+        $order->add_order_note(sprintf(
+                __( 'Refund of %s successfully sent to Zip.', 'woo_quadpay' ),
+                wc_price( $amount, array( 'currency' => $order->get_currency() ) )
+        ) );
+        return true;
+    }
+
+    /**
+     * Capture order on Zip side, DFC
+     *
+     * @param int $order_id
+     * @param string $from
+     * @param string $to
+     * @return bool
+     */
+    public function process_capture( $order_id, $from, $to ) {
+
+        // no need for manual capture
+        if ( !$this->get_option('defer_funds_capture') ) {
+            return false;
+        }
+
+        if ( ! ( in_array( $from, [ 'pending', 'on-hold' ] ) && in_array( $to, wc_get_is_paid_statuses() ) ) ) {
+            return false;
+        }
+
+        $quadpay_order_id = $this->get_quadpay_order_id( $order_id );
+        if ( empty( $quadpay_order_id ) ) {
+            return false;
+        }
+
+        $order = wc_get_order( $order_id );
+        $amount = $order->get_total() - $order->get_total_refunded();
+
+        if ($amount < 0.01) {
+            return false;
+        }
+
+        $merchant_reference = 'Order #' . $order_id . '-' . wp_generate_password( 8, false, false );
+
+        $response = Quadpay_WC_Api::instance()->capture( $quadpay_order_id, $amount, $merchant_reference );
+
+        if ( is_wp_error($response) ) {
+            $order->add_order_note(
+                    sprintf( __( 'There was an error submitting the capture to Zip.', 'woo_quadpay' ) ) .
+                    ' ' .
+                    $response->get_error_message()
+            );
+            return false;
+        }
+
+        $order->payment_complete( $quadpay_order_id );
+        $order->add_order_note(sprintf(
+                __( 'Capture of %s successfully sent to Zip.', 'woo_quadpay' ),
+                wc_price( $amount, array( 'currency' => $order->get_currency() ) )
+        ) );
+
+        return true;
+    }
+
+    /**
+     * Void order on Zip side, DFC
+     *
+     * @param $order_id
+     * @param string $from
+     * @param string $to
+     * @return bool
+     */
+    public function process_void( $order_id, $from, $to ) {
+
+        if ( !$this->get_option('defer_funds_capture') ) {
+            return false;
+        }
+
+        if ( ! ( in_array( $from, [ 'pending', 'on-hold' ] ) && in_array( $to, [ 'cancelled', 'failed' ] ) ) ) {
+            return false;
+        }
+
+        $quadpay_order_id = $this->get_quadpay_order_id( $order_id );
+        if ( empty( $quadpay_order_id ) ) {
+            return false;
+        }
+
+        $order = wc_get_order( $order_id );
+        $amount = $order->get_total() - $order->get_total_refunded();
+
+        if ($amount < 0.01) {
+            return false;
+        }
+
+        $merchant_reference = 'Order #' . $order_id . '-' . wp_generate_password( 8, false, false );
+
+        /** @var WP_Error $response */
+        $response = Quadpay_WC_Api::instance()->void( $quadpay_order_id, $amount, $merchant_reference );
+
+        if ( is_wp_error($response) ) {
+            $order->add_order_note(
+                    sprintf( __( 'There was an error submitting the void to Zip.', 'woo_quadpay' ) ) .
+                    ' ' .
+                    $response->get_error_message()
+            );
+            return false;
+        }
+
+        $order->add_order_note(sprintf(
+                __( 'Void of %s successfully sent to Zip.', 'woo_quadpay' ),
+                wc_price( $amount, array( 'currency' => $order->get_currency() ) )
+        ) );
+        return true;
     }
 
@@ -755 +601 @@
      * Logging method
      *
-     * @param  string $message
-     */
-    public static function log( $message ) {
-        if ( self::$log_enabled ) {
-            if ( empty( self::$log ) ) {
-                self::$log = new WC_Logger();
-            }
-            self::$log->add( 'quadpay', $message );
-        }
-
-        if( WP_DEBUG && WP_DEBUG_LOG ) {
-            error_log($message);
-        }
-    }
-
-    /**
-     * Check the order status of all pending orders that didn't return to the thank you page or marked as Pending by QuadPay
+     * @param string $message
+     * @param string|null $source
+     */
+    public static function log( $message, $source = null ) {
+        Quadpay_WC_Logger::log( $message, $source );
+    }
+
+    /**
+     * Check the order status of all pending orders that didn't return to the thank you page or marked as Pending by Zip
+     *
+     * @note: old code was also checking on-hold orders, but we don't have any (only DFC)
      */
     public function check_pending_orders() {
+
+        // Default value 24h
+        $order_check_time = $this->get_option( 'order_check_time', 'DAY_IN_SECONDS');
 
         // Get PENDING orders that may have been abandoned, or browser window closed after approved
@@ -779 +622 @@
             'status'         => 'pending',
             'type'           => 'shop_order',
-            'date_created'   => '>' . ( time() - DAY_IN_SECONDS ),
+            'date_created'   => '>' . ( time() - constant( $order_check_time ) ),
             'limit'          => -1,
             'payment_method' => 'quadpay',
         );
+
         $pending_orders = wc_get_orders( $args );
 
@@ -790 +634 @@
 
         foreach ( $pending_orders as $order ) {
-
-            $order_id = $order->get_id();
-
-            $quadpay_order_token = get_post_meta( $order_id, '_quadpay_order_token', true );
-
-            // Check if there's a stored order token. If not, it's not an QuadPay order.
-            if ( ! $quadpay_order_token ) continue;
-
-            self::log( 'Checking abandoned order for WC Order ID ' . $order_id . ', Zip Token ' . $quadpay_order_token );
-
-            $response = wp_remote_get(
-                $this->orderurl.'?token=' . $quadpay_order_token,
-                array(
-                    'headers'=>array(
-                        'Authorization' => 'Bearer ' . $this->get_quadpay_authorization_code( 'check_pending_orders'),
-                    )
-                )
-            );
-
-            $body = json_decode( wp_remote_retrieve_body( $response ) );
-
-            self::log( 'Checking abandoned order result: ' . print_r( $body,true ) );
-
-            $response_code = wp_remote_retrieve_response_code( $response );
-
-            // Check status of order
-            if ( $response_code == 200 ) {
-
-                // Check status of order
-                if ( $body->orderStatus === 'Approved' ) {
-                    $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment approved. Zip Order ID: %s', 'woo_quadpay' ), $body->orderId ) );
-                    $order->payment_complete( $order_id );
-                } elseif ( $body->orderStatus === 'Created' ) {
-                    $order->add_order_note( __( 'Checked payment status with Zip. Still pending approval.', 'woo_quadpay' ) );
-                    $order->update_status( 'pending' );
-                } elseif ( $body->orderStatus === 'Abandoned' ) {
-                    $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment %s. Zip Order ID: %s', 'woo_quadpay' ), strtolower( $body->orderStatus ), $body->orderId ) );
-                    $order->update_status( 'cancelled' );
-                } else {
-                    $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment %s. Zip Order ID: %s', 'woo_quadpay' ), strtolower( $body->orderStatus ), $body->orderId ) );
-                    $order->update_status( 'failed' );
+            $this->sync_order_status($order);
+        }
+    }
+
+    /**
+     * Checks order status on Zip and updates order accordingly
+     *
+     * @param WC_Order $order
+     * @param bool $forceStatus
+     * @return bool
+     */
+    public function sync_order_status( $order, $forceStatus = false ) {
+
+        $payment_method = $order->get_payment_method();
+
+        if ( 'quadpay' !== $payment_method ) {
+            return false;
+        }
+
+        $order_id = $order->get_id();
+        $quadpay_order_id = $this->get_quadpay_order_id( $order_id );
+
+        if ( ! $quadpay_order_id ) {
+            return false;
+        }
+
+        self::log( 'Order ID ' . $order_id . ', Zip Order ID ' . $quadpay_order_id, __METHOD__ );
+        $response = Quadpay_WC_Api::instance()->get_order( $quadpay_order_id );
+
+        if ( is_wp_error( $response ) ) {
+            return false;
+        }
+
+        $order->add_order_note(
+            sprintf(
+                __('Zip payment %s. Zip Order ID: %s', 'woo_quadpay'),
+                strtolower($response->orderStatus),
+                $response->orderId
+            )
+        );
+
+        // Check status of order
+        switch ($response->orderStatus) {
+            case 'Approved':
+                if ( $forceStatus || $order->get_status() === 'pending' ) {
+
+                    if ( $this->get_option('defer_funds_capture') ) {
+                        $order->update_status('on-hold');
+                    } else {
+                        $order->payment_complete($quadpay_order_id);
+                    }
+
                 }
 
-            } else {
-
-                $order_date = method_exists( $order, 'get_date_created' ) ? $order->get_date_created() : $order->order_date;
-
-                if ( strtotime( 'now' ) - strtotime( $order_date ) > 3600 ) {
-                    $order->add_order_note( sprintf( __( 'Pending Order Expired' ) ) );
-                    $order->update_status( 'cancelled' );
+                break;
+
+            case 'Created':
+                if ( $forceStatus && $order->get_status() !== 'pending' ) {
+                    $order->update_status('pending');
                 }
-            }
-
-        }
-    }
-
-    /**
-     * Check the order status of all on-hold orders that didn't return to the thank you page or marked as Pending by QuadPay
-     */
-    public function check_on_hold_orders() {
-
-        self::log( 'Start checking On Hold orders' );
-
-        // Get ON-HOLD orders that are "pending" at QuadPay that need to be checked whether approved or denied
-        $args = array(
-            'status'         => 'on-hold',
-            'type'           => 'shop_order',
-            'date_created'   => '>' . ( time() - constant( $this->order_check_time ) ),
-            'limit'          => -1,
-            'payment_method' => 'quadpay',
-        );
-
-        $on_hold_orders = wc_get_orders( $args );
-
-        if ( empty( $on_hold_orders ) ) {
-
-            self::log( 'No On Hold orders found (' . $this->order_check_time . ')' );
-            self::log( 'End checking On Hold orders' );
-
-            return;
-        }
-
-        self::log( count( $on_hold_orders ) . ' On Hold orders found' );
-
-        foreach ( $on_hold_orders as $order ) {
-
-            $order_id = $order->get_id();
-
-            $quadpay_order_token = get_post_meta( $order_id, '_quadpay_order_token', true );
-
-            // Check if there's a stored order token. If not, it's not an QuadPay order.
-            if ( ! $quadpay_order_token ) continue;
-
-            self::log( 'Checking abandoned order for WC Order ID ' . $order_id . ', QuadPay Token ' . $quadpay_order_token );
-
-            $response = wp_remote_get(
-                $this->orderurl.'?token=' . $quadpay_order_token,
-                array(
-                    'headers'=>array(
-                        'Authorization' => 'Bearer ' . $this->get_quadpay_authorization_code( 'check_on_hold_orders' ),
-                    )
-                )
-            );
-
-            $body = json_decode( wp_remote_retrieve_body( $response ) );
-
-            self::log( 'Checking abandoned order result: ' . print_r( $body, true ) );
-
-            $response_code = wp_remote_retrieve_response_code( $response );
-
-            // Check status of order
-            if ( $response_code == 200 ) {
-
-                // Check status of order
-                if ( $body->orderStatus === 'Approved' ) {
-                    $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment approved. Zip Order ID: %s', 'woo_quadpay' ), $body->orderId ) );
-                    $order->payment_complete( $order_id );
-                } elseif ( $body->orderStatus === 'Created' ) {
-                    $order->add_order_note( __( 'Checked payment status with Zip. Still pending approval.', 'woo_quadpay' ) );
-                    $order->update_status( 'pending' );
-                } elseif ( $body->orderStatus === 'Abandoned' ) {
-                    $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment %s. Zip Order ID: %s', 'woo_quadpay' ), strtolower( $body->orderStatus ), $body->orderId ) );
-                    $order->update_status( 'cancelled' );
-                } else {
-                    $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment %s. Zip Order ID: %s', 'woo_quadpay' ), strtolower( $body->orderStatus ), $body->orderId ) );
-                    $order->update_status( 'failed' );
+
+                break;
+
+            case 'Abandoned':
+            case 'Declined':
+                if ( $forceStatus || $order->get_status() === 'pending' ) {
+                    $order->update_status('cancelled');
                 }
 
-            } else {
-
-                $order_date = method_exists( $order, 'get_date_created' ) ? $order->get_date_created() : $order->order_date;
-
-                if ( strtotime( 'now' ) - strtotime( $order_date ) > 3600 ) {
-
-                    $order->add_order_note( sprintf( __( 'On Hold Order Expired at Zip' ) ) );
-                    $order->update_status( 'cancelled' );
-
+                break;
+
+            default:
+                if ( $forceStatus ) {
+                    $order->update_status('failed');
                 }
 
-            }
-
-        }
-
+                break;
+        }
+
+        return true;
     }
 

quadpay-gateway-for-woocommerce/tags/1.7.0/includes/class-quadpay-settings.php

@@ -26 +26 @@
         'api_url_v2' => 'https://gateway.quadpay.com'
     ];
+
+    const ALLOWED_COUNTRIES = [ 'US', 'CA' ];
 
     /**
@@ -152 +154 @@
                     'WEEK_IN_SECONDS'  => __( 'One Week', 'woo_quadpay' ),
                     'MONTH_IN_SECONDS' => __( 'One Month', 'woo_quadpay' ),
-                    'YEAR_IN_SECONDS'  => __( 'One Year', 'woo_quadpay' ),
                 ),
                 'description' => __( 'How far back should authorized, not captured orders be checked for status change.', 'woo_quadpay' ),
+                'default' => 'DAY_IN_SECONDS'
             ),
             'widget_settings' => array(
@@ -240 +242 @@
         $quadpay_settings = get_option( self::SETTINGS_KEY, [] );
 
-        if (isset ($quadpay_settings[$key]) ) {
+        if ( isset( $quadpay_settings[$key] ) ) {
             return $quadpay_settings[$key];
         }
@@ -249 +251 @@
 
         return $default;
+    }
+
+    /**
+     * @param $options
+     * @return bool
+     */
+    public function update_options( $options )
+    {
+        $quadpay_settings = get_option( self::SETTINGS_KEY, [] );
+        $quadpay_settings = array_merge( $quadpay_settings, $options );
+
+        return update_option( 'woocommerce_quadpay_settings', $quadpay_settings );
     }
 

quadpay-gateway-for-woocommerce/tags/1.7.0/quadpay.php

@@ -5 +5 @@
 Author: Zip Co Limited
 Author URI: https://zip.co
-Version: 1.6.0
+Version: 1.7.0
 WC requires at least: 3.1.0
-WC tested up to: 5.9
+WC tested up to: 6.3
 */
 
-define( 'QUADPAY_WC_VERSION', '1.6.0' );
+define( 'QUADPAY_WC_VERSION', '1.7.0' );
 define( 'QUADPAY_WC_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 
 require_once __DIR__ . '/includes/class-quadpay-settings.php';
+require_once __DIR__ . '/includes/class-quadpay-logger.php';
+require_once __DIR__ . '/includes/class-quadpay-api.php';
 require_once __DIR__ . '/includes/class-quadpay-widget.php';
 require_once __DIR__ . '/includes/class-quadpay-mfpp.php';
@@ -46 +48 @@
 
             $gateway = WC_Gateway_QuadPay::instance();
-
             $order_id = wc_get_order_id_by_order_key( $_GET['key'] );
-
-            if ( function_exists( "wc_get_order" ) ) {
-                $order = wc_get_order( $order_id );
-            } else {
-                $order = new WC_Order( $order_id );
-            }
+            $order = wc_get_order( $order_id );
 
             if ( $order && $order->get_payment_method() === 'quadpay' ) {
@@ -80 +76 @@
 
     /**
-     * Call the cron task to check all on-hold orders status in the gateway
-     **/
-    function quadpay_check_on_hold_orders_cron_jobs() {
-        $gateway = WC_Gateway_QuadPay::instance();
-        $gateway->check_on_hold_orders();
-    }
-    add_action( 'quadpay_forty_five_minutes_cron_jobs', 'quadpay_check_on_hold_orders_cron_jobs' );
-
-    /**
      * Call the cron task to check the merchant payment limits on QuadPay
      **/
@@ -125 +112 @@
         }
 
-        $order_actions['check_quadpay_status'] = 'Check payment status on Zip';
+        $order_actions['check_quadpay_status'] = __( 'Check payment status on Zip' , 'woo_quadpay' );
 
         return $order_actions;
@@ -159 +146 @@
 
         $gateway = WC_Gateway_QuadPay::instance();
-
-        $response = wp_remote_get(
-            $gateway->orderurl.'?token=' . $quadpay_order_token,
-            array(
-                'headers'=>array(
-                    'Authorization' => 'Bearer ' . $gateway->get_quadpay_authorization_code( 'quadpay_woocommerce_check_order_payment_status' ),
-                )
-            )
-        );
-
-        $body = json_decode( wp_remote_retrieve_body( $response ) );
-
-        $response_code = wp_remote_retrieve_response_code( $response );
-
-        $response_message = wp_remote_retrieve_response_message( $response );
-
-        // Check status of order
-        if ( $response_code == 200 ) {
-
-            // Check status of order
-            if ( 'Approved' === $body->orderStatus ) {
-                $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment approved. Zip Order ID: %s', 'woo_quadpay' ), $body->orderId ) );
-                $order->payment_complete( $order_id );
-            } elseif ( 'Created' === $body->orderStatus ) {
-                $order->add_order_note( __( 'Checked payment status with Zip. Still pending approval.', 'woo_quadpay' ) );
-                $order->update_status( 'pending' );
-            } elseif ( 'Abandoned' === $body->orderStatus ) {
-                $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment %s. Zip Order ID: %s', 'woo_quadpay' ), strtolower( $body->orderStatus ), $body->orderId ) );
-                $order->update_status( 'cancelled' );
-            } else {
-                $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment %s. Zip Order ID: %s', 'woo_quadpay' ), strtolower( $body->orderStatus ), $body->orderId ) );
-                $order->update_status( 'failed' );
-            }
-
-        } else {
-            $order->add_order_note( 'Can\'t check order payment status on Zip (response message: ' . $response_message . ').' );
+        if ( !$gateway->sync_order_status( $order ) ) {
+            $order->add_order_note( 'Can\'t check order payment status on Zip.' );
         }
 

quadpay-gateway-for-woocommerce/tags/1.7.0/readme.txt

@@ -4 +4 @@
 * Requires at least: 4.7
 * Tested up to: 5.9
-* Stable tag: 1.6.0
+* Stable tag: 1.7.0
 * Requires PHP: 7.0
 * License: GPLv3
@@ -59 +59 @@
 == Changelog ==
 
+= 1.7.0 =
+* Defer funds capture support
+* Multiple place order and API improvements
+* Compatibility - tested up to WooCommerce 6.3
+
 = 1.6.0 =
 * Added payment widget on checkout

quadpay-gateway-for-woocommerce/trunk/includes/class-quadpay-gateway.php

@@ -4 +4 @@
 
     /**
-     * @var $_instance WC_Gateway_QuadPay The reference to the singleton instance of this class
+     * The reference to the singleton instance of this class
+     *
+     * @var $_instance WC_Gateway_QuadPay
      */
     private static $_instance = NULL;
 
     /**
-     * @var boolean Whether or not logging is enabled
-     */
-    public static $log_enabled = false;
-
-    /**
-     * @var WC_Logger Logger instance
-     */
-    public static $log = false;
-
-    /**
      * @var string
      */
-    private $territory = 'US';
+    private $client_id;
+
     /**
      * @var string
      */
-    private $client_id;
+    private $client_secret;
+
     /**
      * @var string
      */
-    private $client_secret;
+    private $mode;
+
     /**
      * @var string
      */
-    private $mode;
+    private $minimum_amount;
+
     /**
      * @var string
      */
-    private $minimum_amount;
-    /**
-     * @var string
-     */
     private $maximum_amount;
-    /**
-     * @var string
-     */
-    public $orderurl;
-    /**
-     * @var string
-     */
-    private $configurationUrl;
-    /**
-     * @var string
-     */
-    private $order_check_time;
 
     /**
@@ -80 +60 @@
         $this->method_title = __( 'Zip - Pay in 4 installments', 'woo_quadpay' );
         $this->method_description = __( 'Use Zip as a credit or debit card processor for WooCommerce.', 'woo_quadpay' );
-
         $this->title = __( 'Zip - Pay in 4 installments', 'woo_quadpay');
-
         $this->description = __('Pay in 4 installments.','woo_quadpay');
-
-        $this->supports = array( 'products', 'refunds' );
-
+        $this->supports = [ 'products', 'refunds' ];
         $this->icon = QUADPAY_WC_PLUGIN_URL . 'assets/images/zip-logo-color.svg';
 
@@ -99 +75 @@
         $this->init_settings();
 
-        $api_url = $this->quadpay_settings->get_environment('api_url');
-
-        $this->orderurl         = $api_url . '/order';
-        $this->configurationUrl = $api_url . '/configuration';
-
-        self::$log_enabled = ($this->get_option( 'logging' ) === 'yes');
-
-        if ($this->mode !== 'production') {
+        if ( $this->mode !== 'production' && !is_admin() ) {
             $this->title .= ' (TEST MODE)';
         }
@@ -115 +84 @@
     public function init()
     {
-        add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-
-        add_action( 'woocommerce_thankyou', array( $this, 'payment_callback' ) );
-
-        // Don't enable QuadPay if the amount limits are not met
-        add_filter( 'woocommerce_available_payment_gateways', array( $this, 'check_cart_within_limits' ), 99, 1 );
-
-        add_action( 'woocommerce_update_options_checkout', array( $this, 'save_options_page') );
+        add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, [ $this, 'process_admin_options' ] );
+
+        add_action( 'woocommerce_thankyou', [ $this, 'payment_callback' ] );
+
+        add_action( 'woocommerce_update_options_checkout', [ $this, 'save_options_page' ] );
+
+        add_action( 'woocommerce_order_status_changed', [ $this, 'process_capture' ], null, 4 );
+        add_action( 'woocommerce_order_status_changed', [ $this, 'process_void' ], null, 4 );
     }
 
@@ -129 +98 @@
      */
     private function init_options() {
-        $this->territory                         = $this->get_option( 'territory', 'US' );
-        $this->client_id                         = $this->get_option( 'client_id' );
-        $this->client_secret                     = $this->get_option( 'client_secret' );
-        $this->mode                              = $this->get_option( 'testmode' );
-        $this->minimum_amount                    = $this->get_option( 'quadpay-amount-minimum' );
-        $this->maximum_amount                    = $this->get_option( 'quadpay-maximum-amount' );
-        // Default value 24h
-        $this->order_check_time =
-            ( !empty( $this->get_option( 'order_check_time' ) ) ? $this->get_option( 'order_check_time' ) : 'DAY_IN_SECONDS');
-    }
-
-    /**
-     * Check if this gateway is enabled
+        $this->client_id = $this->get_option( 'client_id' );
+        $this->client_secret = $this->get_option( 'client_secret' );
+        $this->mode = $this->get_option( 'testmode' );
+        $this->minimum_amount = $this->get_option( 'quadpay-amount-minimum', 35 );
+        $this->maximum_amount = $this->get_option( 'quadpay-maximum-amount', 1500 );
+    }
+
+    /**
+     * @inheritDoc
      */
     public function is_available() {
+
         if ( 'yes' !== $this->enabled ) {
             return false;
@@ -149 +115 @@
 
         if ( ! ( $this->client_id && $this->client_secret ) ) {
+            return false;
+        }
+
+        if ( is_admin() || !WC()->cart ) {
+            return true;
+        }
+
+        $total = $this->get_order_total();
+        if ( $total < $this->minimum_amount || $total > $this->maximum_amount ) {
+            return false;
+        }
+
+        $billing_country = '';
+        if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.0', '<' ) ) {
+            global $woocommerce;
+            $billing_country = $woocommerce->customer->country;
+        } else if ( null !== WC()->customer && null !== WC()->customer->get_billing_country() ) {
+            // make sure to call the member function only if not null
+            // @since 1.3.11
+            $billing_country = WC()->customer->get_billing_country();
+        }
+
+        if ( ! in_array( $billing_country, Quadpay_WC_Settings::ALLOWED_COUNTRIES ) ) {
             return false;
         }
@@ -166 +155 @@
      */
     public function admin_options() {
-
-        wp_cache_flush();
-
-        $settings = get_option( 'woocommerce_quadpay_settings' );
-        $min_amount = $settings['quadpay-amount-minimum'];
-        $max_amount = $settings['quadpay-maximum-amount'];
-        unset( $settings );
-
         ?>
         <h2><?php _e( 'Zip Gateway', 'woo_quadpay' ); ?></h2>
         <?php
-        $login = (bool) ( false === $this->get_quadpay_authorization_code( 'login check' ) ? false : true );
+        $login = ( $this->get_quadpay_authorization_code() !== false );
         ?>
         <p style="color: <?php echo $login ? 'green' : 'red' ?>">
-            <?php echo( !$login ? __( 'Zip login failed. Please check your Client ID and Client Secret.', 'woo_quadpay' ) : __( 'Validation of Zip login credentials passed successful.', 'woo_quadpay' ) ); ?>
+            <?php echo $login ?
+                __( 'Validation of Zip login credentials passed successful.', 'woo_quadpay' ) :
+                __( 'Zip login failed. Please check your Client ID and Client Secret.', 'woo_quadpay' );
+            ?>
         </p>
 
@@ -191 +175 @@
                 </th>
                 <td class="forminp">
-                    <?php echo $min_amount ?>
+                    <?php echo $this->minimum_amount ?>
                 </td>
             </tr>
@@ -199 +183 @@
                 </th>
                 <td class="forminp">
-                    <?php echo $max_amount ?>
+                    <?php echo $this->maximum_amount ?>
                 </td>
             </tr>
+            <?php if ($this->get_option('defer_funds_capture', false)): ?>
+            <tr valign="top">
+                <th scope="row" class="titledesc">
+                    <label for="woocommerce_quadpay_max_amount"><?php _e( 'Defer Funds Capture', 'woo_quadpay' ) ?></label>
+                </th>
+                <td class="forminp"><?php _e( 'Yes', 'woo_quadpay' ) ?></td>
+            </tr>
+            <?php endif; ?>
             </tbody>
         </table>
@@ -244 +236 @@
      * Request an order token from QuadPay
      *
-     * @param string $reference where does the request come from
-     *
-     * @return  string or boolean false if no token generated
-     */
-    public function get_quadpay_authorization_code( $reference = 'get_quadpay_authorization_code' ) {
-
-        $access_token = wp_cache_get( 'quadpay_access_token', 'quadpay' );
-
-        if ( false !== $access_token ) {
-            self::log( 'Access token from cache' );
-            return $access_token;
-        }
-
-        if ( false === $this->apiKeysAvailable( $reference ) ) {
-            return false;
-        }
-
-        $AuthURL = $this->quadpay_settings->get_environment( 'auth_url' );
-
-        $AuthBody = array(
-            'client_id'     => $this->client_id,
-            'client_secret' => $this->client_secret,
-            'audience'      => $this->quadpay_settings->get_environment( 'auth_audience' ),
-            'grant_type'    => 'client_credentials',
-        );
-
-        $args = array(
-            'method' => 'POST',
-            'headers' => array( 'Content-Type' => 'application/json'),
-            'body' =>  json_encode( $AuthBody )
-        );
-
-        $response = wp_remote_post($AuthURL ,$args);
+     * @return string|false
+     * @deprecated
+     */
+    public function get_quadpay_authorization_code() {
+        return Quadpay_WC_Api::instance()->get_auth_token() ?: false;
+    }
+
+    /**
+     * Save options page in admin, update payment limits
+     */
+    public function save_options_page() {
+        self::log( __METHOD__ );
+        wp_cache_flush();
+        // reload settings and options
+        $this->init_settings();
+        $this->init_options();
+        // update configuration from api
+        $this->update_payment_limits();
+    }
+
+    /**
+     * Update settings from configuration api (min, max and dfc)
+     *
+     * @return bool
+     */
+    public function update_payment_limits() {
+
+        if ( !$this->client_id || !$this->client_secret ) {
+            return false;
+        }
+
+        self::log( __METHOD__ );
+
+        $response = Quadpay_WC_Api::instance()->configuration();
 
         if ( is_wp_error( $response ) ) {
-            self::log( '[Authentication] QuadPay API Error: ' . $response->get_error_message() );
-            return false;
-        }
-
-        $body = json_decode(wp_remote_retrieve_body($response));
-
-        $response_code = wp_remote_retrieve_response_code( $response );
-
-        if ( $response_code == 200 ) {
-
-            self::log( '[Retrieve response] Response code ' . $response_code . ' valid');
-
-            //store this in cache
-            wp_cache_set('quadpay_access_token', $body->access_token, 'quadpay', $body->expires_in);
-
-            self::log( '[Retrieve response] Access token available.' );
-
-            return $body->access_token;
-
-        } else {
-
-            if ( 401 == $response_code ) {
-                self::log( '[Retrieve response] QuadPay login failed. Please check login credentials.' );
-            } else {
-                self::log( '[Retrieve response] Error response code ' . $response_code );
-            }
-
-            return false;
-        }
-    }
-
-    private function apiKeysAvailable( $reference ) {
-
-        if ( empty( $this->client_id ) || empty( $this->client_secret ) ) {
-            self::log( '[API key availability check] API keys not available. Reference: ' . $reference );
-
-            return false;
-        }
-
-        self::log( '[API key availability check] API keys available. Reference: ' . $reference );
-        //self::log( '[API key availability check] Client ID: ' . $this->client_id );
-        //self::log( '[API key availability check] Client secret: ' . $this->client_secret );
+            return false;
+        }
+
+        $this->quadpay_settings->update_options([
+            'quadpay-amount-minimum' => $response->minimumAmount,
+            'quadpay-maximum-amount' => $response->maximumAmount,
+            'defer_funds_capture' => $response->deferFundsCapture
+        ]);
 
         return true;
-    }
-
-    public function save_options_page() {
-        self::log( '[Saved settings] start' );
-        wp_cache_flush();
-        $this->init_options();
-        $this->update_payment_limits();
-        self::log( '[Saved settings] end' );
-    }
-
-    public function update_payment_limits() {
-
-        // Get existing limits
-        $settings = get_option('woocommerce_quadpay_settings');
-
-        if( false === $this->apiKeysAvailable( 'update_payment_limits' ) ) {
-            return false;
-        }
-
-        self::log( '[Updating payment limits] request values');
-
-        $headers = array(
-                'headers' => array(
-                    'Authorization' => 'Bearer ' . $this->get_quadpay_authorization_code( 'update_payment_limits' ),
-                )
-        );
-
-        $response      = wp_remote_get( $this->configurationUrl, $headers );
-        $body          = json_decode( wp_remote_retrieve_body( $response ) );
-        $response_code = wp_remote_retrieve_response_code( $response );
-
-        self::log( '[Updating payment limits] response code: ' . $response_code );
-        self::log( '[Updating payment limits] response: ' . print_r( $body, true ) );
-
-        if ( $response_code == 200 ) {
-
-            $settings['quadpay-amount-minimum'] = $body->minimumAmount;
-            $settings['quadpay-maximum-amount'] = $body->maximumAmount;
-
-            update_option( 'woocommerce_quadpay_settings', $settings );
-
-            return true;
-        }
-
-        return false;
     }
 
@@ -375 +289 @@
      *
      * @param int $order_id
-     *
      * @return array
      */
     public function process_payment( $order_id ) {
 
-        if ( function_exists( 'wc_get_order' ) ) {
-            $order = wc_get_order( $order_id );
-        } else {
-            $order = new WC_Order( $order_id );
-        }
-
-        // Get the authorization token
-        $access_token = $this->get_quadpay_authorization_code( 'process_payment');
+        $order = wc_get_order( $order_id );
 
         //Process here
-        $orderitems = $order->get_items();
+        $order_items = $order->get_items();
         $items = array();
 
-        if ( count($orderitems ) ) {
-
-            foreach ( $orderitems as $item ) {
-
-                if ( $item['variation_id'] ) {
-
-                    if ( function_exists( "wc_get_product" ) ) {
-                        $product = wc_get_product( $item['variation_id'] );
-                    } else {
-                        $product = new WC_Product( $item['variation_id'] );
-                    }
-
-                } else {
-
-                    if ( function_exists( "wc_get_product" ) ) {
-                        $product = wc_get_product( $item['product_id'] );
-                    } else {
-                        $product = new WC_Product( $item['product_id'] );
-                    }
-
-                }
+        if ( count($order_items ) ) {
+
+            foreach ( $order_items as $item ) {
+
+                $product = wc_get_product( $item['variation_id'] ?: $item['product_id'] );
 
                 $items[] = array(
@@ -465 +355 @@
                 'postcode'     => $this->get_order_prop( $order, 'shipping_postcode' ),
             ),
-            'description'       => 'string',
+            'description'       => "Order #$order_id",
             'items'             => $items,
             'merchant'          => array(
@@ -474 +364 @@
             'taxAmount'         => $order->get_total_tax(),
             'shippingAmount'    => $shipping_total,
-            'merchantFeeForPaymentPlan' => $mfpp_total
+            'merchantFeeForPaymentPlan' => $mfpp_total,
+            'metadata' => array(
+                'platform' => 'WooCommerce'
+            )
         );
 
-        $headers = array(
-            'Content-Type'  => 'application/json',
-            'Authorization' => 'Bearer ' . $access_token,
+        self::log( 'POST Order request');
+        $response = Quadpay_WC_Api::instance()->order( $body );
+
+        // Couldn't generate token
+        if ( is_wp_error($response) ) {
+
+            $order->add_order_note(
+                __('Unable to generate the order token. Payment could not proceed.', 'woo_quadpay' )
+            );
+
+            wc_add_notice(
+                __('Sorry, there was a problem preparing your payment. Please try again.', 'woo_quadpay'),
+                'error'
+            );
+
+            return [];
+        }
+
+        // Order token successful, save it so we can confirm it later
+        update_post_meta( $order_id, '_quadpay_order_token', $response->token );
+        update_post_meta( $order_id, '_quadpay_order_id', $response->orderId );
+
+        return array(
+            'result'    => 'success',
+            'redirect'  => $response->redirectUrl
         );
-
-        $order_args = array(
-            'method'  => 'POST',
-            'headers' => $headers,
-            'body'    => json_encode( $body ),
-            'timeout' => 30,
-        );
-
-        self::log( 'POST Order request: '.print_r( $order_args,true ) );
-
-        $APIURL = $this->orderurl;
-
-        $order_response = wp_remote_post( $APIURL, $order_args );
-
-        $response_code = wp_remote_retrieve_response_code( $order_response );
-
-        $order_body = json_decode( wp_remote_retrieve_body( $order_response ) );
-
-        self::log( 'POST Order response: ' . print_r( $order_body,true ) );
-
-        $valid_response_code = array( 200, 201 );
-
-        if ( ! in_array( $response_code, $valid_response_code ) ) {
-            // Couldn't generate token
-            $order->add_order_note(__('Unable to generate the order token. Payment couldn\'t proceed.', 'woo_quadpay' ) );
-
-            wc_add_notice(__('Sorry, there was a problem preparing your payment. Please try again.', 'woo_quadpay'),'error');
-
-            return;
-
-        } else {
-            // Order token successful, save it so we can confirm it later
-            update_post_meta( $order_id,'_quadpay_order_token', $order_body->token );
-
-            $redirect = $order_body->redirectUrl;
-
-            return array(
-                'result'    => 'success',
-                'redirect'  => $redirect
-            );
-        }
-
-    }
-
+    }
+
+    /**
+     * Resolves Zip order id from order metadata
+     *
+     * @param $order_id
+     * @return string|false
+     */
     public function get_quadpay_order_id( $order_id ) {
 
@@ -533 +412 @@
         }
 
-        $access_token = $this->get_quadpay_authorization_code( 'get_quadpay_order_id');
         $order_token  = get_post_meta( $order_id, '_quadpay_order_token', true );
 
@@ -540 +418 @@
         }
 
-        //check if quadpay order id already exists
-
-        //get the order id and save in postmeta
-        $get_args = array(
-            'headers'   => array(
-                'Content-Type' => 'application/json',
-                'Authorization' => 'Bearer '. $access_token
-            ),
-        );
-
-        $getOrderUrl = $this->orderurl . '?token=' . $order_token;
-
-        $get_response = wp_remote_get( $getOrderUrl, $get_args );
-        $get_body     = json_decode( wp_remote_retrieve_body( $get_response ) );
-
-        self::log( 'Get Order result: ' . print_r( $get_body, true ) );
-
-        $quadpay_order_id     = $get_body->orderId;
-        $quadpay_order_status = $get_body->orderStatus;
-
-        //store order id for future purposes
-        if ( $quadpay_order_status !== 'Approved' ) {
-            return false;
-        }
-
-        update_post_meta($order_id,'_quadpay_order_id', $quadpay_order_id);
-        update_post_meta($order_id,'_quadpay_order_status', $quadpay_order_status);
-
-        return $quadpay_order_id;
-    }
-
-    /**
-     * @param $order_id
-     */
-    public function payment_callback($order_id) {
-
-        if ( function_exists( "wc_get_order" ) ) {
-            $order = wc_get_order( $order_id );
-        } else {
-            $order = new WC_Order( $order_id );
-        }
+        update_post_meta($order_id, '_quadpay_order_id', $order_token );
+
+        return $order_token;
+    }
+
+    /**
+     * Thank You page callback
+     *
+     * @param int $order_id
+     */
+    public function payment_callback( $order_id ) {
+
+        $order = wc_get_order( $order_id );
 
         if ( 'quadpay' !== $order->get_payment_method() ) {
@@ -587 +437 @@
 
         //save the order id
-        $quadpay_order_id = $this->get_quadpay_order_id($order_id);
-
-        $order_token = get_post_meta($order_id, '_quadpay_order_token', true);
-        if ($quadpay_order_id == false) {
-            $order->add_order_note(sprintf(__('Failure to process the Zip payment.','woo_quadpay') ));
-        } else if ( !empty($order_token) ) {
-
-            $quadpay_order_id = $this->get_quadpay_order_id($order_id);
-
-            //Update status for order
-            if (isset($_GET['status'])) {
-
-                $query_string = $_GET['status'];
-
-                if ($query_string != NULL) {
-                    if ($query_string === 'confirmed') {
-
-                        $order->add_order_note(sprintf(__('Payment approved. Zip Order ID: '.$quadpay_order_id.' ','woo_quadpay') ));
-                        $order->payment_complete($quadpay_order_id);
-                        wc_empty_cart();
-
-                    } elseif ($query_string === 'cancelled') {
-
-                        $order->add_order_note(sprintf(__('Zip payment is pending approval. Zip Order ID: '.$quadpay_order_id.' ','woo_quadpay') ));
-                        $order->update_status( 'cancelled' );
-
-
-                    } elseif ($query_string === 'failure') {
-
-                        $order->add_order_note(sprintf(__('Zip payment declined. Order ID from Zip: '.$quadpay_order_id.' ','woo_quadpay') ));
-                        $order->update_status('failed');
-                    }
-
-                } else {
-                    $order->update_status('pending');
-                }
-            }
-
-        }
-
-    }
-
-    /**
-     * Check whether the cart amount is within payment limits
-     *
-     * @param  array $gateways Enabled gateways
-     * @return  array Enabled gateways, possibly with QuadPay removed
-     */
-    public function check_cart_within_limits($gateways) {
-
-        if ( is_admin() ) {
-            return $gateways;
-        }
-
-        $total = WC()->cart->total;
-
-        $minAmount = isset( $this->minimum_amount ) ? $this->minimum_amount : null;
-        $maxAmount = isset( $this->maximum_amount ) ? $this->maximum_amount : null;
-
-        if ( $minAmount == null || $maxAmount == null ) {
-            self::log('Requesting payment limit update');
-
-            $status = $this->update_payment_limits();
-
-            if ( $status ) {
-
-                $settings = get_option( 'woocommerce_quadpay_settings' );
-
-                $minAmount = $settings['quadpay-amount-minimum'];
-                $maxAmount = $settings['quadpay-maximum-amount'];
-
-            }
-        } else {
-            self::log('Using cached payment limits');
-        }
-
-        $pbi = ( $total >= $minAmount && $total <= $maxAmount );
-
-        $billing_country = '';
-        if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '3.0', '<' ) ) {
-            global $woocommerce;
-            $billing_country = $woocommerce->customer->country;
-        } else if ( null !== WC()->customer && null !== WC()->customer->get_billing_country() ) {
-            // make sure to call the member function only if not null
-            // @since 1.3.11
-            $billing_country = WC()->customer->get_billing_country();
-        }
-
-        if ( ! $pbi || ! in_array( $billing_country, array( 'US', 'CA' ) ) ) {
-            unset( $gateways['quadpay'] );
-        }
-
-        return $gateways;
-    }
-
-    /**
-     * Can the order be refunded?
-     *
-     * @param  object $order WC_Order
+        $quadpay_order_id = $this->get_quadpay_order_id( $order_id );
+
+        if ( $quadpay_order_id === false ) {
+            $order->add_order_note(sprintf(__('Failure to process the Zip payment.', 'woo_quadpay')));
+            return;
+        }
+
+        // check response and not query
+        $this->sync_order_status( $order );
+    }
+
+    /**
+     * Can the order be refunded
+     *
+     * @param  WC_Order $order
      * @return bool
      */
     public function can_refund_order( $order ) {
-        return $order && $order->get_transaction_id();
-    }
-
-    /**
-     * Process a refund if supported
-     *
-     * @param object $order_id WC_Order
+        //return $order && $order->get_transaction_id();
+        return $order && in_array( $order->get_status(), wc_get_is_paid_statuses() );
+    }
+
+    /**
+     * Process a refund
+     *
+     * @param int $order_id
      * @param float $amount
      * @param string $reason
      *
-     * @return  boolean True or false based on success
+     * @return bool
      */
     public function process_refund( $order_id, $amount = null, $reason = '' ) {
 
         $quadpay_order_id = $this->get_quadpay_order_id( $order_id );
-
-        $order = new WC_Order( $order_id );
+        $order = wc_get_order( $order_id );
 
         if ( empty( $quadpay_order_id ) ) {
-
             $order->add_order_note( sprintf( __( 'There was an error submitting the refund to Zip.', 'woo_quadpay' ) ) );
-
-            return false;
-        }
-
-        $access_token  = $this->get_quadpay_authorization_code( 'process_refund' );
-        $random_string = wp_generate_password( 8, false, false );
-
-        $refund_args = array(
-            'headers' => array(
-                'Content-Type'  => 'application/json',
-                'Authorization' => 'Bearer ' . $access_token,
-            ),
-            'body'    => json_encode( array(
-                'requestId'               => 'Order #' . $order_id . '-' . $random_string,
-                'amount'                  => $amount,
-                'merchantRefundReference' => 'Order #' . $order_id . '-' . $random_string,
-            ) ),
-        );
-
-        $refundOrderUrl = $this->orderurl.'/'.$quadpay_order_id.'/refund';
-
-        $refund_response = wp_remote_post( $refundOrderUrl, $refund_args );
-        $refund_body     = json_decode( wp_remote_retrieve_body( $refund_response ) );
-
-        self::log( 'Refund body: ' . print_r( $refund_body, true ) );
-
-        $response_code = (int)$refund_response['response']['code'];
-
-        if ( $response_code === 201 || $response_code === 200 ) {
-            $order->add_order_note( sprintf( __( 'Refund of $%s successfully sent to Zip.', 'woo_quadpay' ), $amount ) );
-            return true;
-        }
-
-        if ( $response_code === 404 ) {
-            $order->add_order_note( sprintf( __( 'Order not found on Zip.', 'woo_quadpay' ) ) );
-        } else {
+            return false;
+        }
+
+        $merchant_refund_reference = 'Order #' . $order_id . '-' . wp_generate_password( 8, false, false );
+
+        $response = Quadpay_WC_Api::instance()->refund( $quadpay_order_id, $amount, $merchant_refund_reference );
+
+        if ( is_wp_error($response) ) {
             $order->add_order_note( sprintf( __( 'There was an error submitting the refund to Zip.', 'woo_quadpay' ) ) );
-        }
-
-        return false;
+            return false;
+        }
+
+        $order->add_order_note(sprintf(
+                __( 'Refund of %s successfully sent to Zip.', 'woo_quadpay' ),
+                wc_price( $amount, array( 'currency' => $order->get_currency() ) )
+        ) );
+        return true;
+    }
+
+    /**
+     * Capture order on Zip side, DFC
+     *
+     * @param int $order_id
+     * @param string $from
+     * @param string $to
+     * @return bool
+     */
+    public function process_capture( $order_id, $from, $to ) {
+
+        // no need for manual capture
+        if ( !$this->get_option('defer_funds_capture') ) {
+            return false;
+        }
+
+        if ( ! ( in_array( $from, [ 'pending', 'on-hold' ] ) && in_array( $to, wc_get_is_paid_statuses() ) ) ) {
+            return false;
+        }
+
+        $quadpay_order_id = $this->get_quadpay_order_id( $order_id );
+        if ( empty( $quadpay_order_id ) ) {
+            return false;
+        }
+
+        $order = wc_get_order( $order_id );
+        $amount = $order->get_total() - $order->get_total_refunded();
+
+        if ($amount < 0.01) {
+            return false;
+        }
+
+        $merchant_reference = 'Order #' . $order_id . '-' . wp_generate_password( 8, false, false );
+
+        $response = Quadpay_WC_Api::instance()->capture( $quadpay_order_id, $amount, $merchant_reference );
+
+        if ( is_wp_error($response) ) {
+            $order->add_order_note(
+                    sprintf( __( 'There was an error submitting the capture to Zip.', 'woo_quadpay' ) ) .
+                    ' ' .
+                    $response->get_error_message()
+            );
+            return false;
+        }
+
+        $order->payment_complete( $quadpay_order_id );
+        $order->add_order_note(sprintf(
+                __( 'Capture of %s successfully sent to Zip.', 'woo_quadpay' ),
+                wc_price( $amount, array( 'currency' => $order->get_currency() ) )
+        ) );
+
+        return true;
+    }
+
+    /**
+     * Void order on Zip side, DFC
+     *
+     * @param $order_id
+     * @param string $from
+     * @param string $to
+     * @return bool
+     */
+    public function process_void( $order_id, $from, $to ) {
+
+        if ( !$this->get_option('defer_funds_capture') ) {
+            return false;
+        }
+
+        if ( ! ( in_array( $from, [ 'pending', 'on-hold' ] ) && in_array( $to, [ 'cancelled', 'failed' ] ) ) ) {
+            return false;
+        }
+
+        $quadpay_order_id = $this->get_quadpay_order_id( $order_id );
+        if ( empty( $quadpay_order_id ) ) {
+            return false;
+        }
+
+        $order = wc_get_order( $order_id );
+        $amount = $order->get_total() - $order->get_total_refunded();
+
+        if ($amount < 0.01) {
+            return false;
+        }
+
+        $merchant_reference = 'Order #' . $order_id . '-' . wp_generate_password( 8, false, false );
+
+        /** @var WP_Error $response */
+        $response = Quadpay_WC_Api::instance()->void( $quadpay_order_id, $amount, $merchant_reference );
+
+        if ( is_wp_error($response) ) {
+            $order->add_order_note(
+                    sprintf( __( 'There was an error submitting the void to Zip.', 'woo_quadpay' ) ) .
+                    ' ' .
+                    $response->get_error_message()
+            );
+            return false;
+        }
+
+        $order->add_order_note(sprintf(
+                __( 'Void of %s successfully sent to Zip.', 'woo_quadpay' ),
+                wc_price( $amount, array( 'currency' => $order->get_currency() ) )
+        ) );
+        return true;
     }
 
@@ -755 +601 @@
      * Logging method
      *
-     * @param  string $message
-     */
-    public static function log( $message ) {
-        if ( self::$log_enabled ) {
-            if ( empty( self::$log ) ) {
-                self::$log = new WC_Logger();
-            }
-            self::$log->add( 'quadpay', $message );
-        }
-
-        if( WP_DEBUG && WP_DEBUG_LOG ) {
-            error_log($message);
-        }
-    }
-
-    /**
-     * Check the order status of all pending orders that didn't return to the thank you page or marked as Pending by QuadPay
+     * @param string $message
+     * @param string|null $source
+     */
+    public static function log( $message, $source = null ) {
+        Quadpay_WC_Logger::log( $message, $source );
+    }
+
+    /**
+     * Check the order status of all pending orders that didn't return to the thank you page or marked as Pending by Zip
+     *
+     * @note: old code was also checking on-hold orders, but we don't have any (only DFC)
      */
     public function check_pending_orders() {
+
+        // Default value 24h
+        $order_check_time = $this->get_option( 'order_check_time', 'DAY_IN_SECONDS');
 
         // Get PENDING orders that may have been abandoned, or browser window closed after approved
@@ -779 +622 @@
             'status'         => 'pending',
             'type'           => 'shop_order',
-            'date_created'   => '>' . ( time() - DAY_IN_SECONDS ),
+            'date_created'   => '>' . ( time() - constant( $order_check_time ) ),
             'limit'          => -1,
             'payment_method' => 'quadpay',
         );
+
         $pending_orders = wc_get_orders( $args );
 
@@ -790 +634 @@
 
         foreach ( $pending_orders as $order ) {
-
-            $order_id = $order->get_id();
-
-            $quadpay_order_token = get_post_meta( $order_id, '_quadpay_order_token', true );
-
-            // Check if there's a stored order token. If not, it's not an QuadPay order.
-            if ( ! $quadpay_order_token ) continue;
-
-            self::log( 'Checking abandoned order for WC Order ID ' . $order_id . ', Zip Token ' . $quadpay_order_token );
-
-            $response = wp_remote_get(
-                $this->orderurl.'?token=' . $quadpay_order_token,
-                array(
-                    'headers'=>array(
-                        'Authorization' => 'Bearer ' . $this->get_quadpay_authorization_code( 'check_pending_orders'),
-                    )
-                )
-            );
-
-            $body = json_decode( wp_remote_retrieve_body( $response ) );
-
-            self::log( 'Checking abandoned order result: ' . print_r( $body,true ) );
-
-            $response_code = wp_remote_retrieve_response_code( $response );
-
-            // Check status of order
-            if ( $response_code == 200 ) {
-
-                // Check status of order
-                if ( $body->orderStatus === 'Approved' ) {
-                    $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment approved. Zip Order ID: %s', 'woo_quadpay' ), $body->orderId ) );
-                    $order->payment_complete( $order_id );
-                } elseif ( $body->orderStatus === 'Created' ) {
-                    $order->add_order_note( __( 'Checked payment status with Zip. Still pending approval.', 'woo_quadpay' ) );
-                    $order->update_status( 'pending' );
-                } elseif ( $body->orderStatus === 'Abandoned' ) {
-                    $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment %s. Zip Order ID: %s', 'woo_quadpay' ), strtolower( $body->orderStatus ), $body->orderId ) );
-                    $order->update_status( 'cancelled' );
-                } else {
-                    $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment %s. Zip Order ID: %s', 'woo_quadpay' ), strtolower( $body->orderStatus ), $body->orderId ) );
-                    $order->update_status( 'failed' );
+            $this->sync_order_status($order);
+        }
+    }
+
+    /**
+     * Checks order status on Zip and updates order accordingly
+     *
+     * @param WC_Order $order
+     * @param bool $forceStatus
+     * @return bool
+     */
+    public function sync_order_status( $order, $forceStatus = false ) {
+
+        $payment_method = $order->get_payment_method();
+
+        if ( 'quadpay' !== $payment_method ) {
+            return false;
+        }
+
+        $order_id = $order->get_id();
+        $quadpay_order_id = $this->get_quadpay_order_id( $order_id );
+
+        if ( ! $quadpay_order_id ) {
+            return false;
+        }
+
+        self::log( 'Order ID ' . $order_id . ', Zip Order ID ' . $quadpay_order_id, __METHOD__ );
+        $response = Quadpay_WC_Api::instance()->get_order( $quadpay_order_id );
+
+        if ( is_wp_error( $response ) ) {
+            return false;
+        }
+
+        $order->add_order_note(
+            sprintf(
+                __('Zip payment %s. Zip Order ID: %s', 'woo_quadpay'),
+                strtolower($response->orderStatus),
+                $response->orderId
+            )
+        );
+
+        // Check status of order
+        switch ($response->orderStatus) {
+            case 'Approved':
+                if ( $forceStatus || $order->get_status() === 'pending' ) {
+
+                    if ( $this->get_option('defer_funds_capture') ) {
+                        $order->update_status('on-hold');
+                    } else {
+                        $order->payment_complete($quadpay_order_id);
+                    }
+
                 }
 
-            } else {
-
-                $order_date = method_exists( $order, 'get_date_created' ) ? $order->get_date_created() : $order->order_date;
-
-                if ( strtotime( 'now' ) - strtotime( $order_date ) > 3600 ) {
-                    $order->add_order_note( sprintf( __( 'Pending Order Expired' ) ) );
-                    $order->update_status( 'cancelled' );
+                break;
+
+            case 'Created':
+                if ( $forceStatus && $order->get_status() !== 'pending' ) {
+                    $order->update_status('pending');
                 }
-            }
-
-        }
-    }
-
-    /**
-     * Check the order status of all on-hold orders that didn't return to the thank you page or marked as Pending by QuadPay
-     */
-    public function check_on_hold_orders() {
-
-        self::log( 'Start checking On Hold orders' );
-
-        // Get ON-HOLD orders that are "pending" at QuadPay that need to be checked whether approved or denied
-        $args = array(
-            'status'         => 'on-hold',
-            'type'           => 'shop_order',
-            'date_created'   => '>' . ( time() - constant( $this->order_check_time ) ),
-            'limit'          => -1,
-            'payment_method' => 'quadpay',
-        );
-
-        $on_hold_orders = wc_get_orders( $args );
-
-        if ( empty( $on_hold_orders ) ) {
-
-            self::log( 'No On Hold orders found (' . $this->order_check_time . ')' );
-            self::log( 'End checking On Hold orders' );
-
-            return;
-        }
-
-        self::log( count( $on_hold_orders ) . ' On Hold orders found' );
-
-        foreach ( $on_hold_orders as $order ) {
-
-            $order_id = $order->get_id();
-
-            $quadpay_order_token = get_post_meta( $order_id, '_quadpay_order_token', true );
-
-            // Check if there's a stored order token. If not, it's not an QuadPay order.
-            if ( ! $quadpay_order_token ) continue;
-
-            self::log( 'Checking abandoned order for WC Order ID ' . $order_id . ', QuadPay Token ' . $quadpay_order_token );
-
-            $response = wp_remote_get(
-                $this->orderurl.'?token=' . $quadpay_order_token,
-                array(
-                    'headers'=>array(
-                        'Authorization' => 'Bearer ' . $this->get_quadpay_authorization_code( 'check_on_hold_orders' ),
-                    )
-                )
-            );
-
-            $body = json_decode( wp_remote_retrieve_body( $response ) );
-
-            self::log( 'Checking abandoned order result: ' . print_r( $body, true ) );
-
-            $response_code = wp_remote_retrieve_response_code( $response );
-
-            // Check status of order
-            if ( $response_code == 200 ) {
-
-                // Check status of order
-                if ( $body->orderStatus === 'Approved' ) {
-                    $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment approved. Zip Order ID: %s', 'woo_quadpay' ), $body->orderId ) );
-                    $order->payment_complete( $order_id );
-                } elseif ( $body->orderStatus === 'Created' ) {
-                    $order->add_order_note( __( 'Checked payment status with Zip. Still pending approval.', 'woo_quadpay' ) );
-                    $order->update_status( 'pending' );
-                } elseif ( $body->orderStatus === 'Abandoned' ) {
-                    $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment %s. Zip Order ID: %s', 'woo_quadpay' ), strtolower( $body->orderStatus ), $body->orderId ) );
-                    $order->update_status( 'cancelled' );
-                } else {
-                    $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment %s. Zip Order ID: %s', 'woo_quadpay' ), strtolower( $body->orderStatus ), $body->orderId ) );
-                    $order->update_status( 'failed' );
+
+                break;
+
+            case 'Abandoned':
+            case 'Declined':
+                if ( $forceStatus || $order->get_status() === 'pending' ) {
+                    $order->update_status('cancelled');
                 }
 
-            } else {
-
-                $order_date = method_exists( $order, 'get_date_created' ) ? $order->get_date_created() : $order->order_date;
-
-                if ( strtotime( 'now' ) - strtotime( $order_date ) > 3600 ) {
-
-                    $order->add_order_note( sprintf( __( 'On Hold Order Expired at Zip' ) ) );
-                    $order->update_status( 'cancelled' );
-
+                break;
+
+            default:
+                if ( $forceStatus ) {
+                    $order->update_status('failed');
                 }
 
-            }
-
-        }
-
+                break;
+        }
+
+        return true;
     }
 

quadpay-gateway-for-woocommerce/trunk/includes/class-quadpay-settings.php

@@ -26 +26 @@
         'api_url_v2' => 'https://gateway.quadpay.com'
     ];
+
+    const ALLOWED_COUNTRIES = [ 'US', 'CA' ];
 
     /**
@@ -152 +154 @@
                     'WEEK_IN_SECONDS'  => __( 'One Week', 'woo_quadpay' ),
                     'MONTH_IN_SECONDS' => __( 'One Month', 'woo_quadpay' ),
-                    'YEAR_IN_SECONDS'  => __( 'One Year', 'woo_quadpay' ),
                 ),
                 'description' => __( 'How far back should authorized, not captured orders be checked for status change.', 'woo_quadpay' ),
+                'default' => 'DAY_IN_SECONDS'
             ),
             'widget_settings' => array(
@@ -240 +242 @@
         $quadpay_settings = get_option( self::SETTINGS_KEY, [] );
 
-        if (isset ($quadpay_settings[$key]) ) {
+        if ( isset( $quadpay_settings[$key] ) ) {
             return $quadpay_settings[$key];
         }
@@ -249 +251 @@
 
         return $default;
+    }
+
+    /**
+     * @param $options
+     * @return bool
+     */
+    public function update_options( $options )
+    {
+        $quadpay_settings = get_option( self::SETTINGS_KEY, [] );
+        $quadpay_settings = array_merge( $quadpay_settings, $options );
+
+        return update_option( 'woocommerce_quadpay_settings', $quadpay_settings );
     }
 

quadpay-gateway-for-woocommerce/trunk/quadpay.php

@@ -5 +5 @@
 Author: Zip Co Limited
 Author URI: https://zip.co
-Version: 1.6.0
+Version: 1.7.0
 WC requires at least: 3.1.0
-WC tested up to: 5.9
+WC tested up to: 6.3
 */
 
-define( 'QUADPAY_WC_VERSION', '1.6.0' );
+define( 'QUADPAY_WC_VERSION', '1.7.0' );
 define( 'QUADPAY_WC_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 
 require_once __DIR__ . '/includes/class-quadpay-settings.php';
+require_once __DIR__ . '/includes/class-quadpay-logger.php';
+require_once __DIR__ . '/includes/class-quadpay-api.php';
 require_once __DIR__ . '/includes/class-quadpay-widget.php';
 require_once __DIR__ . '/includes/class-quadpay-mfpp.php';
@@ -46 +48 @@
 
             $gateway = WC_Gateway_QuadPay::instance();
-
             $order_id = wc_get_order_id_by_order_key( $_GET['key'] );
-
-            if ( function_exists( "wc_get_order" ) ) {
-                $order = wc_get_order( $order_id );
-            } else {
-                $order = new WC_Order( $order_id );
-            }
+            $order = wc_get_order( $order_id );
 
             if ( $order && $order->get_payment_method() === 'quadpay' ) {
@@ -80 +76 @@
 
     /**
-     * Call the cron task to check all on-hold orders status in the gateway
-     **/
-    function quadpay_check_on_hold_orders_cron_jobs() {
-        $gateway = WC_Gateway_QuadPay::instance();
-        $gateway->check_on_hold_orders();
-    }
-    add_action( 'quadpay_forty_five_minutes_cron_jobs', 'quadpay_check_on_hold_orders_cron_jobs' );
-
-    /**
      * Call the cron task to check the merchant payment limits on QuadPay
      **/
@@ -125 +112 @@
         }
 
-        $order_actions['check_quadpay_status'] = 'Check payment status on Zip';
+        $order_actions['check_quadpay_status'] = __( 'Check payment status on Zip' , 'woo_quadpay' );
 
         return $order_actions;
@@ -159 +146 @@
 
         $gateway = WC_Gateway_QuadPay::instance();
-
-        $response = wp_remote_get(
-            $gateway->orderurl.'?token=' . $quadpay_order_token,
-            array(
-                'headers'=>array(
-                    'Authorization' => 'Bearer ' . $gateway->get_quadpay_authorization_code( 'quadpay_woocommerce_check_order_payment_status' ),
-                )
-            )
-        );
-
-        $body = json_decode( wp_remote_retrieve_body( $response ) );
-
-        $response_code = wp_remote_retrieve_response_code( $response );
-
-        $response_message = wp_remote_retrieve_response_message( $response );
-
-        // Check status of order
-        if ( $response_code == 200 ) {
-
-            // Check status of order
-            if ( 'Approved' === $body->orderStatus ) {
-                $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment approved. Zip Order ID: %s', 'woo_quadpay' ), $body->orderId ) );
-                $order->payment_complete( $order_id );
-            } elseif ( 'Created' === $body->orderStatus ) {
-                $order->add_order_note( __( 'Checked payment status with Zip. Still pending approval.', 'woo_quadpay' ) );
-                $order->update_status( 'pending' );
-            } elseif ( 'Abandoned' === $body->orderStatus ) {
-                $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment %s. Zip Order ID: %s', 'woo_quadpay' ), strtolower( $body->orderStatus ), $body->orderId ) );
-                $order->update_status( 'cancelled' );
-            } else {
-                $order->add_order_note( sprintf( __( 'Checked payment status with Zip. Payment %s. Zip Order ID: %s', 'woo_quadpay' ), strtolower( $body->orderStatus ), $body->orderId ) );
-                $order->update_status( 'failed' );
-            }
-
-        } else {
-            $order->add_order_note( 'Can\'t check order payment status on Zip (response message: ' . $response_message . ').' );
+        if ( !$gateway->sync_order_status( $order ) ) {
+            $order->add_order_note( 'Can\'t check order payment status on Zip.' );
         }
 

quadpay-gateway-for-woocommerce/trunk/readme.txt

@@ -4 +4 @@
 * Requires at least: 4.7
 * Tested up to: 5.9
-* Stable tag: 1.6.0
+* Stable tag: 1.7.0
 * Requires PHP: 7.0
 * License: GPLv3
@@ -59 +59 @@
 == Changelog ==
 
+= 1.7.0 =
+* Defer funds capture support
+* Multiple place order and API improvements
+* Compatibility - tested up to WooCommerce 6.3
+
 = 1.6.0 =
 * Added payment widget on checkout