Changeset 2442211

Timestamp:

12/18/2020 10:47:54 AM (5 years ago)

Author:

quadpay

Message:

• Fix - fixed issue with checking QuadPay status for on hold and pending orders
• Tweak - added time settings for order check
• Tweak - added detailed log and order notes messages
• Tweak - added "Discover" as a credit card option in QuadPay checkout button

Location:

quadpay-gateway-for-woocommerce

Files:

• tags/1.3.8 (added)
• tags/1.3.8/LICENSE (added)
• tags/1.3.8/README.md (added)
• tags/1.3.8/assets (added)
• tags/1.3.8/assets/css (added)
• tags/1.3.8/assets/css/widget.css (added)
• tags/1.3.8/assets/images (added)
• tags/1.3.8/assets/images/quadpay-logo-color.svg (added)
• tags/1.3.8/assets/js (added)
• tags/1.3.8/assets/js/frontend.js (added)
• tags/1.3.8/assets/js/webcomponents-loader.js (added)
• tags/1.3.8/config (added)
• tags/1.3.8/config/config.php (added)
• tags/1.3.8/quadpay.php (added)
• tags/1.3.8/readme.txt (added)
• trunk/quadpay.php (modified) (12 diffs)
• trunk/readme.txt (modified) (1 diff)

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

@@ -5 +5 @@
 Author: QuadPay, Inc.
 Author URI: https://www.quadpay.com
-Version: 1.3.8
+Version: 1.3.9
 WC requires at least: 3.1.0
 WC tested up to: 4.8.0
@@ -85 +85 @@
          */
         private $configurationUrl;
+        /**
+         * @var string
+         */
+        private $order_check_time;
 
         /**
@@ -136 +140 @@
             }
 
-            $this->description = __('Pay in 4 interest-free installments. Credit and debit cards accepted: Visa, Mastercard, Amex','woo_quadpay');
+            $this->description = __('Pay in 4 interest-free installments. Credit and debit cards accepted: Visa, Mastercard, Amex, Discover','woo_quadpay');
 
             self::$log_enabled  = $this->get_option( 'logging' ) === 'yes' ? true : false;
@@ -167 +171 @@
             $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');
 
         }
@@ -227 +234 @@
                     'type'        => 'select',
                     'options'     => $env_values,
-                    'description' => __( 'When in in Test/Sandbox mode, no transactions will actually be processed.', 'woo_quadpay' ),
+                    'description' => __( 'When in Test/Sandbox mode, no transactions will actually be processed.', 'woo_quadpay' ),
                 ),
                 'client_id'       => array(
@@ -248 +255 @@
                     'default'     => 'no',
                     'desc_tip'    => true,
+                ),
+                'order_check_settings' => array(
+                    'title'       => __( 'Order Check', 'woo_quadpay ' ),
+                    'type'        => 'title',
+                    'description' => __( '' ),
+                ),
+                'order_check_time'                  => array(
+                    'title'       => __( 'Order Check Timeframe', 'woo_quadpay' ),
+                    'label'       => __( 'Order Check Timeframe', 'woo_quadpay' ),
+                    'type'        => 'select',
+                    'options'     => array(
+                            'DAY_IN_SECONDS'   => __( '24h hours', 'woo_quadpay' ),
+                            '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' ),
                 ),
                 'widget_settings' => array(
@@ -929 +953 @@
                 self::$log->add( 'quadpay', $message );
             }
+
+            if( WP_DEBUG && WP_DEBUG_LOG )
+                error_log( $message );
+
         }
 
@@ -1028 +1056 @@
         public function check_on_hold_orders() {
 
+            $this->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() - DAY_IN_SECONDS ),
-                'limit'          => -1,
-                'payment_method' => 'quadpay',
-            );
+            $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 ) ) {
+
+                $this->log( 'No On Hold orders found (' . $this->order_check_time . ')' );
+                $this->log( 'End checking On Hold orders' );
+
                 return;
             }
+
+            $this->log( count( $on_hold_orders ) . ' On Hold orders found' );
 
             foreach ( $on_hold_orders as $order ) {
@@ -1100 +1139 @@
                     if ( strtotime( 'now' ) - strtotime( $order_date ) > 3600 ) {
 
-                        $order->add_order_note( sprintf( __( 'On Hold Order Expired' ) ) );
+                        $order->add_order_note( sprintf( __( 'On Hold Order Expired at QuadPay' ) ) );
                         $order->update_status( 'cancelled' );
 
@@ -1367 +1406 @@
      * Process custom WooCommerce Order Actions: Check payment status on QuadPay
      *
-     * @param object $order
+     * @param $order
      *
      * @since 1.3.0
@@ -1407 +1446 @@
         $response_code = wp_remote_retrieve_response_code( $response );
 
-        // Check status of order
+        $response_message = wp_remote_retrieve_response_message( $response );
+
+        // Check status of order
         if ( $response_code == 200 ) {
 
             // Check status of order
-            if ( $body->orderStatus == "Approved" ) {
+            if ( 'Approved' == $body->orderStatus ) {
 
                 $order->add_order_note( sprintf( __( 'Checked payment status with QuadPay. Payment approved. QuadPay Order ID: %s', 'woo_quadpay' ), $body->orderId ) );
                 $order->payment_complete( $order_id );
 
-            } elseif ( $body->orderStatus == "Created" ) {
+            } elseif ( 'Created' == $body->orderStatus ) {
 
                 $order->add_order_note( __( 'Checked payment status with QuadPay. Still pending approval.', 'woo_quadpay' ) );
                 $order->update_status( 'pending' );
 
-            } elseif ( $body->orderStatus == 'Abandoned' ) {
+            } elseif ( 'Abandoned' == $body->orderStatus ) {
 
                 $order->add_order_note( sprintf( __( 'Checked payment status with QuadPay. Payment %s. QuadPay Order ID: %s', 'woo_quadpay' ), strtolower( $body->orderStatus ), $body->orderId ) );
@@ -1435 +1476 @@
         } else {
 
-            $order->add_order_note( 'Can\'t check order payment status on QuadPay, try again later.' );
+            $order->add_order_note( 'Can\'t check order payment status on QuadPay (response message: ' . $response_message . ').' );
 
         }

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

@@ -53 +53 @@
 * none
 
+= 1.3.9 =
+* Fix - fixed issue with checking QuadPay status for on hold and pending orders
+* Tweak - added time settings for order check
+* Tweak - added detailed log and order notes messages
+* Tweak - added "Discover" as a credit card option in QuadPay checkout button
+
 == Changelog ==
 = 1.3.8 =