Changeset 2738574

Timestamp:

06/07/2022 11:20:03 AM (4 years ago)

Author:

bostateam

Message:

Handle cities/areas when network is down.

Location:

bosta-woocommerce

Files:

• bosta-woocommerce.php (modified) (8 diffs)
• tags/2.9.1/bosta-woocommerce.php (modified) (1 diff)
• trunk/bosta-woocommerce.php (modified) (1 diff)

bosta-woocommerce/bosta-woocommerce.php

@@ -5 +5 @@
  * Author: Bosta
  * Author URI: https://www.bosta.co/
- * Version: 2.9
+ * Version: 2.9.1
  * Requires at least: 5.0
  * Tested up to: 5.8.3
@@ -21 +21 @@
 
 add_action('admin_print_styles', 'bosta_stylesheet');
+
+function console_log($output, $with_script_tags = true) {
+    $js_code = 'console.log(' . json_encode($output, JSON_HEX_TAG) . 
+');';
+    if ($with_script_tags) {
+        $js_code = '<script>' . $js_code . '</script>';
+    }
+    echo $js_code;
+}
+
 function bosta_stylesheet()
 {
@@ -29 +39 @@
 function get_new_cities()
 {
-    $result = wp_remote_post('https://app.bosta.co/api/v0/cities?context=dropoff', array(
+    $APIKey = get_option('woocommerce_bosta_settings')['APIKey'];
+    $url = 'https://app.bosta.co/api/v0/businesses/' . $APIKey. '/info';
+    $business_result = wp_remote_get($url, array(
         'timeout' => 30,
+        'method' => 'GET',
+        'headers' => array(
+            'Content-Type' => 'application/json',
+            'X-Requested-By' => 'WooCommerce',
+        ),
+    ));
+    if (is_wp_error($business_result) || $business_result['response']['code'] !== 200) {
+        $countryId = "60e4482c7cb7d4bc4849c4d5";
+    } else {
+        $business = json_decode($business_result['body']);
+        $countryId = $business->country->_id;
+    }
+
+    $cities_url = 'https://app.bosta.co/api/v0/cities?context=dropoff&countryId=' . $countryId;
+    // $cities_url = 'https://app.bosta.co/api/v0/cities?context=dropoff';
+    $result = wp_remote_post($cities_url, array(
+       'timeout' => 30,
         'method' => 'GET',
         'headers' => array(
@@ -38 +67 @@
         ),
     ));
+
     if (is_wp_error($result)) {
         $error_message = $result->get_error_message();
@@ -56 +86 @@
 function get_new_states()
 {
-    $states = wp_remote_post('https://app.bosta.co/api/v0/cities/getAllDistricts?context=dropoff', array(
+    $APIKey = get_option('woocommerce_bosta_settings')['APIKey'];
+    $url = 'https://app.bosta.co/api/v0/businesses/' . $APIKey. '/info';
+    $business_result = wp_remote_get($url, array(
+        'timeout' => 30,
+        'method' => 'GET',
+        'headers' => array(
+            'Content-Type' => 'application/json',
+            'X-Requested-By' => 'WooCommerce',
+        ),
+    ));
+
+    if (is_wp_error($business_result) || $business_result['response']['code'] !== 200) {
+        $countryId = "60e4482c7cb7d4bc4849c4d5";
+    } else {
+        $business = json_decode($business_result['body']);
+        $countryId = $business->country->_id;
+    }
+
+    $states_url = 'https://app.bosta.co/api/v0/cities/getAllDistricts?context=dropoff&countryId=' . $countryId;
+
+    $states = wp_remote_post($states_url, array(
         'timeout' => 30,
         'method' => 'GET',
@@ -82 +132 @@
     }
 }
+$resultCities = get_new_cities();
 $resultStates = get_new_states();
-$resultCities = get_new_cities();
 
 add_filter('woocommerce_checkout_fields', 'bost_override_checkout_city_fields');
@@ -119 +169 @@
     global $resultCities;
     $states = $resultStates;
-    for ($i = 0; $i < count($resultStates); $i++) {
+    for ($i = 0; $i < count(array($resultStates)); $i++) {
         $resultStates[$i] = __($resultStates[$i], 'wps');
     }
@@ -194 +244 @@
     global $resultStates;
     $bostaStates = array();
-    for ($i = 0; $i < count($resultStates); $i++) {
-        for ($x = 0; $x < count($resultStates[$i]); $x++) {
+    for ($i = 0; $i < count(array($resultStates)); $i++) {
+        for ($x = 0; $x < count(array($resultStates[$i])); $x++) {
             $new_val = $resultStates[$i][$x]->zoneName . ' - ' . $resultStates[$i][$x]->districtName;
             array_push($bostaStates, $new_val);

bosta-woocommerce/tags/2.9.1/bosta-woocommerce.php

@@ -40 +40 @@
 {
     $APIKey = get_option('woocommerce_bosta_settings')['APIKey'];
-    // $APIKey = md5('606ead9eaeace1ab89ad10181b68ea391a518f48fb3d52516c0c6ec343e87611');
     $url = 'https://app.bosta.co/api/v0/businesses/' . $APIKey. '/info';
     $business_result = wp_remote_get($url, array(

bosta-woocommerce/trunk/bosta-woocommerce.php

@@ -40 +40 @@
 {
     $APIKey = get_option('woocommerce_bosta_settings')['APIKey'];
-    // $APIKey = md5('606ead9eaeace1ab89ad10181b68ea391a518f48fb3d52516c0c6ec343e87611');
     $url = 'https://app.bosta.co/api/v0/businesses/' . $APIKey. '/info';
     $business_result = wp_remote_get($url, array(