Changeset 3148999

Timestamp:

09/10/2024 06:09:58 AM (18 months ago)

Author:

bsecuretech

Message:

Updated to version 1.7.9

Location:

bsecure

Files:

• tags/1.7.9 (added)
• tags/1.7.9/assets (added)
• tags/1.7.9/assets/css (added)
• tags/1.7.9/assets/css/bsecure-style-admin.css (added)
• tags/1.7.9/assets/css/bsecure-style.css (added)
• tags/1.7.9/assets/fonts (added)
• tags/1.7.9/assets/fonts/fontsfree-net-sfprodisplay-regular-demo.html (added)
• tags/1.7.9/assets/fonts/fontsfree-net-sfprodisplay-regular-webfont.woff (added)
• tags/1.7.9/assets/fonts/fontsfree-net-sfprodisplay-regular-webfont.woff2 (added)
• tags/1.7.9/assets/fonts/fontsfree-net-sfprotext-regular-demo.html (added)
• tags/1.7.9/assets/fonts/fontsfree-net-sfprotext-regular-webfont.woff (added)
• tags/1.7.9/assets/fonts/fontsfree-net-sfprotext-regular-webfont.woff2 (added)
• tags/1.7.9/assets/fonts/generator_config.txt (added)
• tags/1.7.9/assets/fonts/specimen_files (added)
• tags/1.7.9/assets/fonts/specimen_files/grid_12-825-55-15.css (added)
• tags/1.7.9/assets/fonts/specimen_files/specimen_stylesheet.css (added)
• tags/1.7.9/assets/fonts/stylesheet.css (added)
• tags/1.7.9/assets/images (added)
• tags/1.7.9/assets/images/add-icon.png (added)
• tags/1.7.9/assets/images/ajax-loader-large.gif (added)
• tags/1.7.9/assets/images/ajax-loader.gif (added)
• tags/1.7.9/assets/images/bsecure-checkout-img.svg (added)
• tags/1.7.9/assets/images/bsecure-lock-img.png (added)
• tags/1.7.9/assets/images/bsecure-logo.png (added)
• tags/1.7.9/assets/images/bsecure-payment-gateway-icon-1.png (added)
• tags/1.7.9/assets/images/bsecure-payment-gateway-icon.png (added)
• tags/1.7.9/assets/images/bsecure-small-arrow.svg (added)
• tags/1.7.9/assets/images/bsecure-small-line.svg (added)
• tags/1.7.9/assets/images/bsecure-small-logo.png (added)
• tags/1.7.9/assets/images/buy-with-bsecure-black.svg (added)
• tags/1.7.9/assets/images/complete-checkout-img.png (added)
• tags/1.7.9/assets/images/down-arrow.png (added)
• tags/1.7.9/assets/images/edit-icon.png (added)
• tags/1.7.9/assets/images/fast-checkout-btn.png (added)
• tags/1.7.9/assets/images/login-with-bsecure.jpg (added)
• tags/1.7.9/assets/images/pay-with-bsecure-black.svg (added)
• tags/1.7.9/assets/images/popup-close.png (added)
• tags/1.7.9/assets/images/qisst-pay-popup-bottom-logo.svg (added)
• tags/1.7.9/assets/images/qisst-pay.png (added)
• tags/1.7.9/assets/images/qpLogo-1.png (added)
• tags/1.7.9/assets/images/qpLogo-2.png (added)
• tags/1.7.9/assets/images/select-qisstpay-at-checkout.png (added)
• tags/1.7.9/assets/js (added)
• tags/1.7.9/assets/js/bsecure-admin.js (added)
• tags/1.7.9/assets/js/bsecure-front.js (added)
• tags/1.7.9/bsecure.php (added)
• tags/1.7.9/includes (added)
• tags/1.7.9/includes/class-bsecure-admin.php (added)
• tags/1.7.9/includes/class-bsecure-apis.php (added)
• tags/1.7.9/includes/class-bsecure-checkout.php (added)
• tags/1.7.9/includes/class-sign-in-with-bsecure.php (added)
• tags/1.7.9/includes/class-wc-bsecure.php (added)
• tags/1.7.9/includes/class-wc-gateway-bsecure.php (added)
• tags/1.7.9/includes/templates (added)
• tags/1.7.9/includes/templates/checkout-reminder-popup.php (added)
• tags/1.7.9/includes/templates/error-messages.php (added)
• tags/1.7.9/includes/templates/mini-cart.php (added)
• tags/1.7.9/includes/templates/qisstpay-popup.php (added)
• tags/1.7.9/readme.txt (added)
• trunk/bsecure.php (modified) (1 diff)
• trunk/includes/class-bsecure-checkout.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)

bsecure/trunk/bsecure.php

@@ -21 +21 @@
  * @since    1.0.0
  */
-
-    
 
     function wc_besecure_run() {        

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

@@ -2835 +2835 @@
     }
 
-
+    // dubug by sk old code 
     // Hook to the product api response build process and add variations objects.   
-    public function custom_product_api_response($response, $post, $request){
-
+        // public function custom_product_api_response($response, $post, $request){
+
+        //  $params = $request->get_params();
+        //  // check request is for bsecure portal or not
+        //  if(is_wp_error( $response )  || !isset($params['bsecure']) ) {
+
+        //      return $response;
+        //  }
+                
+        //  WC()->api->includes();
+        //  WC()->api->register_resources( new WC_API_Server( '/' ) );
+            
+        //  $wc_webhook = new WC_Webhook();
+        //  $variations_objs = [];
+
+        //  $productKeys = ["id","name","short_description","slug","tags","sku","price","weight","categories","images","attributes","variations"];
+        //  $variationKeys = ["id","title","price","sku","description","image","attributes","manage_stock","stock_quantity"];
+        //  $new_response = [];
+
+        //  // Filter product data as per provided keys
+        //  /*foreach($productKeys as $productKey){
+        //      // Temprorary Commented from Asim 1.6.1
+        //      if(in_array($productKey, $response->data)){
+        //          //$new_response[$productKey] = $response->data[$productKey];
+        //      }
+
+        //  }*/
+
+
+
+        //     // Store variation data in new variable
+        //     if(isset($response->data["type"])){
+        //      if ( 'variable' === $response->data["type"] ) {
+        //         if(!empty($response->data["variations"])){ 
+        //          foreach( $response->data["variations"] as $variation ) {
+                            
+        //                  $product_objs = WC()->api->WC_API_Products->get_product( $variation );
+        //                  $variations_objs[] = !empty($product_objs['product']) ? $product_objs['product'] : [];
+        //              }
+        //            }
+        //      }
+        //  }
+
+        //     // Filter variation data as per provided keys
+        //     if(!empty($variations_objs)){
+        //      $new_response["variations"] = [];
+        //      foreach($variations_objs as $key => $variations_obj){
+
+        //          foreach($variationKeys as $variationKey){
+
+        //                  if(in_array($variationKey, $variations_obj)){
+        //                      //$new_response["variations"][$key][$variationKey] = $variations_obj[$variationKey];
+        //                  }
+        //              }
+        //      }
+        //     }       
+        //     $response->data["variations"] = $variations_objs;
+        //     return $response;
+        // }
+
+
+    // new code by sk 
+    public function custom_product_api_response($response, $post, $request) {
         $params = $request->get_params();
-        // check request is for bsecure portal or not
-        if(is_wp_error( $response )  || !isset($params['bsecure']) ) {
-
+        // Check if request is for bsecure portal or not
+        if (is_wp_error($response) || !isset($params['bsecure'])) {
             return $response;
         }
-            
-        WC()->api->includes();
-        WC()->api->register_resources( new WC_API_Server( '/' ) );
-        
+        // Identify WooCommerce version
+        $wc_version = WC()->version;
+    
+        // Check and include relevant API classes based on WooCommerce version
+        if (version_compare($wc_version, '3.6.0', '>=')) {
+            // WooCommerce 3.6.0+
+            include_once WC_ABSPATH . 'includes/api/class-wc-rest-system-status-controller.php';
+        } else {
+            // WooCommerce pre-3.6.0
+            WC()->api->includes();
+            WC()->api->register_resources(new WC_API_Server('/'));
+        }
+    
         $wc_webhook = new WC_Webhook();
         $variations_objs = [];
 
-        $productKeys = ["id","name","short_description","slug","tags","sku","price","weight","categories","images","attributes","variations"];
-        $variationKeys = ["id","title","price","sku","description","image","attributes","manage_stock","stock_quantity"];
+        // $productKeys = ["id", "name", "short_description", "slug", "tags", "sku", "price", "weight", "categories", "images", "attributes", "variations"];
+        $variationKeys = ["id", "title", "price", "sku", "description", "image", "attributes", "manage_stock", "stock_quantity"];
         $new_response = [];
 
         // Filter product data as per provided keys
-        /*foreach($productKeys as $productKey){
-            // Temprorary Commented from Asim 1.6.1
-            if(in_array($productKey, $response->data)){
-                //$new_response[$productKey] = $response->data[$productKey];
-            }
-
-        }*/
-
-
-
-        // Store variation data in new variable
-        if(isset($response->data["type"])){
-            if ( 'variable' === $response->data["type"] ) {
-               if(!empty($response->data["variations"])){ 
-                foreach( $response->data["variations"] as $variation ) {
-                        
-                        $product_objs = WC()->api->WC_API_Products->get_product( $variation );
-                        $variations_objs[] = !empty($product_objs['product']) ? $product_objs['product'] : [];
-                    }
-                  }
-            }
-        }
-
-        // Filter variation data as per provided keys
-        if(!empty($variations_objs)){
-            $new_response["variations"] = [];
-            foreach($variations_objs as $key => $variations_obj){
-
-                foreach($variationKeys as $variationKey){
-
-                        if(in_array($variationKey, $variations_obj)){
-                            //$new_response["variations"][$key][$variationKey] = $variations_obj[$variationKey];
-                        }
+        // foreach($productKeys as $productKey){
+        //  // Temprorary Commented from Asim 1.6.1
+        //  if(in_array($productKey, $response->data)){
+        //      //$new_response[$productKey] = $response->data[$productKey];
+        //  }
+
+        // }
+
+        // Store variation data in new variable
+        if (isset($response->data["type"]) && 'variable' === $response->data["type"]) {
+            // write_log('Product is of type variable.');
+            if (!empty($response->data["variations"])) {
+                // write_log('Variations found: ' . print_r($response->data["variations"], true));
+                foreach ($response->data["variations"] as $variation) {
+                    // Get product variation using wc_get_product
+                    $product = wc_get_product($variation);
+                    if ($product) {
+                        $product_data = $product->get_data();
+                        $variations_objs[] = $product_data;
+                    } else {
+                        // write_log('Failed to get product for variation ID: ' . $variation);
                     }
-            }
-        }       
-        $response->data["variations"] = $variations_objs;
-        return $response;
-    }
+                }
+            } else {
+                // write_log('No variations found.');
+            }
+        } else {
+            // write_log('Product is not of type variable or type is not set.');
+        }
+    
+        // Filter variation data as per provided keys
+        if (!empty($variations_objs)) {
+            $new_response["variations"] = [];
+            foreach ($variations_objs as $key => $variations_obj) {
+                foreach ($variationKeys as $variationKey) {
+                    if (array_key_exists($variationKey, $variations_obj)) {
+                        // $new_response["variations"][$key][$variationKey] = $variations_obj[$variationKey];
+                    }
+                }
+            }
+        }
+    
+        $response->data["variations"] = $variations_objs;
+    
+        // write_log('Final Response Data: ' . print_r($response->data, true));
+    
+        return $response;
+    }
+    
+
+    // new code by sk 
 
     /**

bsecure/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.4
 Requires PHP: 5.6.20 or above
-Stable tag: 1.7.8
+Stable tag: 1.7.9
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -182 +182 @@
 * 1.7.8 Released with General Update and Bug Fixes
 
+= 1.7.9 September 09, 2024 =
+* 1.7.9 Released with General Update and Bug Fixes
+
 == Screenshots ==