Changeset 2683703

Timestamp:

02/23/2022 12:08:00 PM (4 years ago)

Author:

bsecuretech

Message:

1.6.3 Released General Update and Bug Fixes

Location:

bsecure/trunk

Files:

• bsecure.php (modified) (1 diff)
• includes/class-bsecure-checkout.php (modified) (13 diffs)
• includes/class-wc-bsecure.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)

bsecure/trunk/bsecure.php

@@ -6 +6 @@
  * Author: bSecure
  * Author URI:
- * Version: 1.6.2
+ * Version: 1.6.3
  *
  */

bsecure/trunk/includes/class-bsecure-checkout.php

@@ -40 +40 @@
 const BSECURE_INITIATED_STATUS = 2;
 const BSECURE_EXPIRED_STATUS = 6;
+const BSECURE_FAILED_STATUS = 7;
 const BSECURE_DEV_VIEW_ORDER_URL = 'https://partners-dev.bsecure.app/view-order/';
 const BSECURE_STAGE_VIEW_ORDER_URL = 'https://partners-stage.bsecure.app/view-order/';
@@ -296 +297 @@
     */
     public function manage_order_webhook_api(){     
-
+        
         $order_data = json_decode(file_get_contents('php://input'));
 
@@ -334 +335 @@
 
                 if(!empty($wc_order)){          
-
+                    
                     $order = wc_get_order($wc_order->ID);
 
@@ -343 +344 @@
 
                     $bsecure_order_id = $order->get_meta('_bsecure_order_id');
+                    $bsecure_order_id = !empty($bsecure_order_id) ? $bsecure_order_id : $order->get_id();
 
                     $return_json = ['status' => true, 'msg' => __("Order status updated successfully.", 'wc-bsecure'),'bsecure_order_id' => $bsecure_order_id];                 
@@ -352 +354 @@
                         || $placement_status == Bsecure_Checkout::BSECURE_INITIATED_STATUS) {
 
-                        $return_json = ['status' => true, 'msg' =>__("Sorry! your order has not been proccessed.","wc-bsecure"), 'bsecure_order_id' => $bsecure_order_id];
-
-                    } else {
+                        $return_json = ['status' => true, 'msg' =>__("Sorry! your order has not been proccessed.","wc-bsecure"), 'bsecure_order_id' => $order_data->merchant_order_id];
+
+                    }  else {                       
 
                         $order_id = $this->createOrderFromBsecureToWc($order_data); 
@@ -363 +365 @@
 
                             $bsecure_order_id = $order->get_meta('_bsecure_order_id');
+                            $bsecure_order_id = !empty($bsecure_order_id) ? $bsecure_order_id : $order->get_id();
 
                             // if order not success
@@ -372 +375 @@
                             } else {
 
-                                $return_json = ['status' => true, 'msg' => __("Order added successfully at woocommerce.", "wc-bsecure"), 'bsecure_order_id' => $bsecure_order_id];
+                                $msg = __("Order added successfully at woocommerce.", "wc-bsecure");
+
+                                if($placement_status == Bsecure_Checkout::BSECURE_EXPIRED_STATUS || $placement_status == Bsecure_Checkout::BSECURE_FAILED_STATUS){
+                                    $statusTitle = ($order_data->placement_status == Bsecure_Checkout::BSECURE_EXPIRED_STATUS) ? __('expired','wc-bsecure') : __('failed','wc-bsecure');
+
+                                    $msg = __("This order is ".$statusTitle." at bSecure portal but status is different at woocommerce.", "wc-bsecure");
+                                }
+
+                                $return_json = ['status' => true, 'msg' => $msg, 'bsecure_order_id' => $bsecure_order_id];
 
                             }                           
@@ -612 +623 @@
 
             // Get Order //
-            $this->access_token = $response->access_token;
-
-            //$headers =    'Authorization: Bearer '.$this->access_token;
-
-            //$headers =    ['Authorization' => 'Bearer '.$this->access_token];
+            $this->access_token = $response->access_token;          
 
             $headers =   $this->getApiHeaders($this->access_token);
@@ -679 +686 @@
             } 
 
-            else if ($order_data->placement_status == Bsecure_Checkout::BSECURE_EXPIRED_STATUS ) {
+            else if ($order_data->placement_status == Bsecure_Checkout::BSECURE_EXPIRED_STATUS || $order_data->placement_status == Bsecure_Checkout::BSECURE_FAILED_STATUS ) {
+
+                $statusTitle = ($order_data->placement_status == Bsecure_Checkout::BSECURE_EXPIRED_STATUS) ? __('expired','wc-bsecure') : __('failed','wc-bsecure');
 
                 if( ! WC()->cart->is_empty() ){
@@ -688 +697 @@
                 wc_clear_notices();
 
-                wc_add_notice(__("Sorry! Your order has been expired.","wc-bsecure"), 'notice' );
+                wc_add_notice(__("Sorry! Your order has been ".$statusTitle.".","wc-bsecure"), 'notice' );
 
                 wp_redirect(wc_get_page_permalink( 'shop' ));
@@ -810 +819 @@
 
                 }
-
-                return $this->updateOrderPaymentGateway($order, $order_data, $isCustomer);
+                
+                // check if payment method is bSecure then update status
+                if($order->get_payment_method() == 'bsecures' || ($order_data->payment_method->id == 1 && $order->get_payment_method() == 'cod' )){
+
+                    return $this->updateOrderPaymentGateway($order, $order_data, $isCustomer);
+                }else{
+
+                    return  $order->get_id();
+                }               
 
             }
@@ -2203 +2219 @@
      * Use this function if payment gateway order type used
      */
-    public function updateOrderPaymentGateway($order, $order_data, $customer){
+    public function updateOrderPaymentGateway($order, $order_data, $customer){      
 
         $placement_status   = $order_data->placement_status;
@@ -2346 +2362 @@
 
       if( function_exists('WC') ){
-        
+
+        WC()->session = new WC_Session_Handler();
+            WC()->session->init();          
         WC()->cart = new WC_Cart();
 
         if( ! WC()->cart->is_empty() ){
-
                 WC()->cart->empty_cart();
             }

bsecure/trunk/includes/class-wc-bsecure.php

@@ -30 +30 @@
 
     const PLUGIN_NAME = 'WooCommerce';
-    const PLUGIN_VERSION = '1.6.2';
+    const PLUGIN_VERSION = '1.6.3';
     const QISSTPAY_PER_MONTH = 4;
     const QISSTPAY_AMOUNT_MAX_LIMIT = 50000;

bsecure/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 5.9
 Requires PHP: 5.6.20 or above
-Stable tag: 1.6.2
+Stable tag: 1.6.3
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -95 +95 @@
 * 1.5.2 is a general update and QisstPay feature is live
 
-== 1.5.4 September 10, 2021 ==
-* 1.5.4 is a general update
-
-== 1.5.6 October 07, 2021 ==
-* 1.5.6 General Update & bug resolved 
-
 == 1.5.7 October 26, 2021 ==
 * 1.5.7 General Update & Buyer Protection Feature
@@ -110 +104 @@
 * 1.6.0 Released General Update & Bug Fixes
 
-== 1.6.1 February 11, 2021 ==
+== 1.6.1 February 11, 2022 ==
 * 1.6.1 Released General Update, PIM api integration and Bug Fixes
 
+== 1.6.3 February 23, 2022 ==
+* 1.6.3 Released General Update and Bug Fixes
+
 == Screenshots ==