Changeset 2716780

Timestamp:

05/01/2022 06:43:10 AM (4 years ago)

Author:

sokangroup

Message:

Fix bugs

Location:

sokan-integration

Files:

• tags/1.3.1 (added)
• tags/1.3.1/Sokan-integration.php (added)
• tags/1.3.1/admin.php (added)
• tags/1.3.1/assets (added)
• tags/1.3.1/assets/images (added)
• tags/1.3.1/assets/images/sokan-logo.png (added)
• tags/1.3.1/include (added)
• tags/1.3.1/include/classes (added)
• tags/1.3.1/include/classes/class-skng-api.php (added)
• tags/1.3.1/include/classes/class-skng-db.php (added)
• tags/1.3.1/include/classes/class-skng-logger.php (added)
• tags/1.3.1/include/custom (added)
• tags/1.3.1/include/custom/skng-custom.php (added)
• tags/1.3.1/index.php (added)
• tags/1.3.1/job (added)
• tags/1.3.1/job/sync_data.php (added)
• tags/1.3.1/readme.txt (added)
• tags/1.3.1/uninstall.php (added)
• trunk/include/classes/class-skng-api.php (modified) (1 diff)
• trunk/include/classes/class-skng-db.php (modified) (10 diffs)

sokan-integration/trunk/include/classes/class-skng-api.php

@@ -116 +116 @@
      * send data to sokan in bulk mode
      * every time bulk mode request failed this function chunked input array to two array and retry
-     * @param $endpoint
      * @param $data
      * @return array

sokan-integration/trunk/include/classes/class-skng-db.php

@@ -156 +156 @@
             $date = $value['modified_date'] ?? $date;
             $order_date = $value['post_date'];
-            $first_name = $value[$this->order_attr['first_name']] ?? "Undefined";
-            $last_name = $value[$this->order_attr['last_name']] ?? "customer";
+            $first_name = $value[$this->order_attr['first_name']] ?? "مشتری";
+            $last_name = $value[$this->order_attr['last_name']] ?? "";
             $customer_id = $value[$this->order_attr['user_id']] ?? 0;
-            $customer_name = $first_name . " " . $last_name;
+            $customer_name = trim($first_name, " ")  . " " . trim($last_name, " ");
+            $customer_name = trim($customer_name, " ");
+            $customer_phone = $value[$this->order_attr['phone']] ?? "";
+
             if ($customer_id == 0) {
+
+                if (!empty($customer_phone)){
+                    if (preg_match('/^(?:98|\+98|0098|0)?9[0-9]{9}$/', $customer_phone)) {
+                        $customer_id = $customer_phone = preg_replace('/^(?:98|\+98|0098|0)/', "0", $customer_phone);
+                    }else{
+                        $customer_id =  $customer_phone;
+                    }
+                }
+
                 $customer_id = $customer_name;
             }
-            $customer_phone = $value[$this->order_attr['phone']] ?? "";
-            $country = $value[$this->order_attr['country']] ?? "IR";
-            $state = $value[$this->order_attr['state']] ?? "Undefined State";
-            $city = $value[$this->order_attr['city']] ?? "Undefined City";
+            $country = $value[$this->order_attr['country']] ?? "ایران";
+            $state = $value[$this->order_attr['state']] ?? "استان نا مشخص";
+            $city = $value[$this->order_attr['city']] ?? "شهر نامشخص";
 
             if (!isset($value['items']) and isset($value['_order_total'])) {
@@ -208 +219 @@
                 }
 
-                $weight = $item['pa_weight']??0;
+                $weight = $item['pa_weight'] ?? 0;
 
                 $order = [
@@ -221 +232 @@
                     'customer_id' => $customer_id,
                     'customer_name' => $customer_name,
-                    'region0' => $country,
+                    'region0' => trim($country," "),
                     'region1' => self::getStateName($state),
-                    'region2' => $city,
+                    'region2' => trim($city," "),
                     'sku_id' => $product_id,
                     'product_name' => $product_id,
@@ -230 +241 @@
 
                 if (preg_match('/^(?:98|\+98|0098|0)?9[0-9]{9}$/', $customer_phone)) {
-                    $order['customer_phone_number'] = (string)$customer_phone;
+                    $order['customer_phone_number'] = (string)preg_replace('/^(?:98|\+98|0098)/', "0", $customer_phone);
                 }
 
@@ -253 +264 @@
 
                 $product = $all_products[$order_item['sku_id']];
-                $new_orders[$key]['product_name']= $product['name'];
+                $new_orders[$key]['product_name'] = $product['name'];
 
                 if (isset($product['brands'])) {
                     foreach (array_values($product['brands']) as $br_key => $name) {
-                        $new_orders[$key]['product_brand' . $br_key]= $name;
+                        $new_orders[$key]['product_brand' . $br_key] = $name;
                         if ($br_key == 1) {
                             break;
@@ -266 +277 @@
                 if (isset($product['categories'])) {
                     foreach (array_values($product['categories']) as $cat_key => $name) {
-                        $new_orders[$key]['product_category' . $cat_key]= $name;
+                        $new_orders[$key]['product_category' . $cat_key] = $name;
                         if ($cat_key == 9) {
                             break;
@@ -274 +285 @@
 
                 if ($order_item['weight'] == 0 and isset($product['weight'])) {
-                    $new_orders[$key]['weight']= (int)$product['weight'];
-                }
-
-            }
-        }
-
-        $orders_for_sync = array_merge($this->getErrorLogs() , $new_orders);
+                    $new_orders[$key]['weight'] = (int)$product['weight'];
+                }
+
+            }
+        }
+
+        $orders_for_sync = array_merge($this->getErrorLogs(), $new_orders);
 
         return ['order' => $orders_for_sync, 'date' => $date];
@@ -337 +348 @@
                    AND `{$this->db->prefix}posts`.post_modified > '$date'
                    GROUP BY `{$this->db->prefix}posts`.ID
-                   ORDER BY `{$this->db->prefix}posts`.post_modified LIMIT 200 ",
+                   ORDER BY `{$this->db->prefix}posts`.post_modified LIMIT 50 ",
             ARRAY_A
         );
@@ -446 +457 @@
             'QHM' => 'قم',
             'KRD' => 'کردستان',
-            'KBD' => 'کهگیلوییه و بویراحمد',
+            'KBD' => 'کهگیلویه و بویراحمد',
             'GLS' => 'گلستان',
             'GIL' => 'گیلان',
@@ -459 +470 @@
         }
 
-        return $state;
+        return trim($state, " ");
     }
 }