Changeset 2705491

Timestamp:

04/06/2022 05:58:32 AM (4 years ago)

Author:

sokangroup

Message:

fix bugs

Location:

sokan-integration

Files:

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

sokan-integration/trunk/Sokan-integration.php

@@ -7 +7 @@
  * Plugin Name: sokan Integration
  * Description:  افزونه ای برای استخراج تمامی اطلاعات ووکامرس مورد نیاز پلتفرم سکان
- * Version: 1.2.1
+ * Version: 1.2.2
  * Author: Sokan
  * Author URI: https://Sokan.tech/

sokan-integration/trunk/admin.php

@@ -6 +6 @@
 $login_error = '';
 $last_date = 'همگام سازی نشده';
-
 if (isset($_GET['item'])) {
 
@@ -20 +19 @@
 
     if (isset($_POST[SKNG_PLUGIN_NAME . '_username'])) {
-
 
         $url = esc_url(sanitize_text_field($_POST['api_url']));

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

@@ -178 +178 @@
              GROUP BY ID
              ORDER BY `{$this->db->prefix}posts`.post_modified
+             LIMIT 500
             "
             , ARRAY_A
@@ -283 +284 @@
            AND post_id  NOT IN (SELECT `object_id` FROM `$logTable` )
            AND wp_posts.post_modified > '$date'
-           GROUP BY post_id LIMIT 2000"
+           GROUP BY post_id LIMIT 1000"
             , ARRAY_A
         );
@@ -417 +418 @@
                    GROUP BY `{$this->db->prefix}posts`.ID
                    ORDER BY `{$this->db->prefix}posts`.post_modified
-                   LIMIT 400 ",
+                   LIMIT 50 ",
             ARRAY_A
         );
@@ -463 +464 @@
                 }
 
-
                 $date = $value['modified_date'];
                 $qty = $value['_qty'] ?? 1;
@@ -504 +504 @@
                 foreach ($value as $key => $_value){
 
-                    if (strpos("weight", $key) !== false
-                        or strpos("وزن", $key) !== false
-                        or strpos("جرم", $key) !== false
+                    if (strpos($key, "weight") !== false
+                        or strpos($key, "وزن") !== false
+                        or strpos($key, "جرم") !== false
                     ) {
                         $weight = $_value;
@@ -514 +514 @@
                 }
 
-                if ($unit_price != 0) {
-
-                    $order = [
-                        'id' => (string)$value['order_id'],
-                        'item_id' => (string)$value['order_item_id'],
-                        'date' => (string)$value['post_date'],
-                        'customer' => (string)$user_id,
-                        'quantity' => (int)$qty,
-                        'unit_price' => (int)$unit_price,
-                        'product' => (string)$product_id,
-                        'type' => "SALES",
-                        'discount' => (int)$discount,
-                        'tax' => (int)$tax,
-                        'weight' => (int)$weight,
-                    ];
-
-                    if (!empty($region_id)) {
-                        $order['region'] = (string) $region_id;
-                    }
-
-                    array_push($new_orders, $order);
-
-                    if (in_array($value['order_id'], $refunded_ids)) {
-                        $refund_order = $order;
-                        $refund_order['item_id'] = $refund_order['item_id']."_refunded";
-                        $refund_order['quantity'] = -$refund_order['quantity'];
-                        $refund_order['discount'] = -$refund_order['discount'];
-                        $refund_order['type'] = "RETURN";
-                        array_push($new_orders , $refund_order);
-                    }
-
+                $order = [
+                    'id' => (string)$value['order_id'],
+                    'item_id' => (string)$value['order_item_id'],
+                    'date' => (string)$value['post_date'],
+                    'customer' => (string)$user_id,
+                    'quantity' => (int)$qty,
+                    'unit_price' => (int)$unit_price,
+                    'product' => (string)$product_id,
+                    'type' => "SALES",
+                    'discount' => (int)$discount,
+                    'tax' => (int)$tax,
+                    'weight' => (int)$weight,
+                ];
+
+                if (!empty($region_id)) {
+                    $order['region'] = (string) $region_id;
+                }
+
+                array_push($new_orders, $order);
+
+                if (in_array($value['order_id'], $refunded_ids)) {
+                    $refund_order = $order;
+                    $refund_order['item_id'] = $refund_order['item_id']."_refunded";
+                    $refund_order['quantity'] = -$refund_order['quantity'];
+                    $refund_order['discount'] = -$refund_order['discount'];
+                    $refund_order['type'] = "RETURN";
+                    array_push($new_orders , $refund_order);
                 }
             }

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

@@ -33 +33 @@
 
     /**
+     * api token
+     * @var string
+     * @since 1.2.0
+     */
+    private string $token;
+
+    /**
      * listy of endpoints
      * @var array
@@ -46 +53 @@
         $parse = parse_url(get_site_url());
         $this->siteName =  $parse['host'];
+        $this->token = get_option(SKNG_PLUGIN_NAME . '_token')??'';
     }
 
@@ -82 +90 @@
         $args = [
             'headers' => [
-                'Content-Type' => 'application/json'
+                'Content-Type' => 'application/json',
+                'Token' => $this->token
             ],
             'body' => json_encode($post),
-            'timeout' => 5,
+            'timeout' => 2,
             'method' => 'POST'
         ];
@@ -102 +111 @@
         add_filter( 'https_ssl_verify', '__return_false' );
 
-        $response           = wp_remote_get(esc_url_raw( $this->endpoints['customCodeUrl']));
+        $args = [
+            'headers' => [
+                'Content-Type' => 'application/json',
+                'Token' => $this->token
+            ]
+        ];
+
+        $response           = wp_remote_get(esc_url_raw( $this->endpoints['customCodeUrl']) ,$args);
         $http_response_code = wp_remote_retrieve_response_code( $response );
         $res                = wp_remote_retrieve_body( $response );

sokan-integration/trunk/readme.txt

@@ -3 +3 @@
 Tags: products, woocommerce, export, extract, sokan
 Requires at least: 5.2
-Tested up to: 5.8
+Tested up to: 5.9
 Donate link: http://sokan.tech/
-Stable tag: 1.2.1
+Stable tag: 1.2.2
 Requires PHP: 7.0
 License: GPLv2 or later
@@ -79 +79 @@
 == Changelog ==
 
+= 1.2.2 =
+* رفع اشکال های گزارش شده
+
 = 1.2.1 =
 * بهبود عملکرد
@@ -94 +97 @@
 == Upgrade Notice ==
 
+= 1.2.2 =
+* رفع اشکال های گزارش شده
+
 = 1.2.1 =
 * بهبود عملکرد