Changeset 3334077

Timestamp:

07/25/2025 09:26:21 AM (6 months ago)

Author:

smackcoders

Message:

Version 1.2 - Bug fix

Location:

w2s-sync

Files:

• tags/1.2 (added)
• tags/1.2/admin (added)
• tags/1.2/admin/views (added)
• tags/1.2/admin/views/class-w2ssyn-admin-page.php (added)
• tags/1.2/assets (added)
• tags/1.2/assets/css (added)
• tags/1.2/assets/css/style.css (added)
• tags/1.2/assets/image (added)
• tags/1.2/assets/image/Customer.png (added)
• tags/1.2/assets/image/Order.png (added)
• tags/1.2/assets/image/Power-03.png (added)
• tags/1.2/assets/image/Power-04.png (added)
• tags/1.2/assets/image/Product.png (added)
• tags/1.2/assets/js (added)
• tags/1.2/assets/js/script.js (added)
• tags/1.2/includes (added)
• tags/1.2/includes/class-w2ssyn-hooks.php (added)
• tags/1.2/includes/class-w2ssyn-swi-connector.php (added)
• tags/1.2/includes/installation (added)
• tags/1.2/includes/installation/class-w2ssyn-install.php (added)
• tags/1.2/includes/installation/class-w2ssyn-uninstall.php (added)
• tags/1.2/includes/modules (added)
• tags/1.2/includes/modules/class-w2ssyn-auditlogs.php (added)
• tags/1.2/includes/modules/class-w2ssyn-swi-config.php (added)
• tags/1.2/includes/modules/class-w2ssyn-swi-customer-sync.php (added)
• tags/1.2/includes/modules/class-w2ssyn-swi-mapping.php (added)
• tags/1.2/includes/modules/class-w2ssyn-swi-order-sync.php (added)
• tags/1.2/includes/modules/class-w2ssyn-swi-product-sync.php (added)
• tags/1.2/includes/modules/class-w2ssyn-swi-shopify-authentication.php (added)
• tags/1.2/includes/modules/class-w2ssyn-swi-sync-helper.php (added)
• tags/1.2/includes/modules/class-w2ssyn-swi-woocommerce-authentication.php (added)
• tags/1.2/readme.txt (added)
• tags/1.2/screenshot-1.png (added)
• tags/1.2/screenshot-2.png (added)
• tags/1.2/screenshot-3.png (added)
• tags/1.2/screenshot-4.png (added)
• tags/1.2/screenshot-5.png (added)
• tags/1.2/screenshot-6.png (added)
• tags/1.2/w2s-sync.php (added)
• trunk/assets/css/style.css (modified) (1 diff)
• trunk/includes/modules/class-w2ssyn-swi-customer-sync.php (modified) (1 diff)
• trunk/includes/modules/class-w2ssyn-swi-order-sync.php (modified) (1 diff)
• trunk/readme.txt (modified) (5 diffs)
• trunk/w2s-sync.php (modified) (1 diff)

w2s-sync/trunk/assets/css/style.css

@@ -19 +19 @@
   margin-right: 5px;
 }
-.custom-dates{
+#custom-dates{
   display: none;
+  margin-left: 40px;
+  margin-top: 10px;
 }
 .smack-button-group-button{

w2s-sync/trunk/includes/modules/class-w2ssyn-swi-customer-sync.php

@@ -154 +154 @@
 
     public static function w2ssyn_shopify_to_woo_create_customers($w2ssyn_woo_base_url, $w2ssyn_consumer_key, $w2ssyn_consumer_secret, $w2ssyn_shopify_base_url, $w2ssyn_shopify_token)
-    {
-        global $wpdb;
-        W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action('customer', 'create', 'success', 'Starting Shopify to WooCommerce customer sync...');
-
-        // Fetch field mappings from the database
-        $w2ssyn_field_mappings = $wpdb->get_results("SELECT shopify_field, woocommerce_field FROM {$wpdb->prefix}w2ssyn_field_mappings WHERE entity_type = 'customer'", OBJECT_K);
-
-        // Convert mappings to an associative array
-        $w2ssyn_mappings = array();
-        foreach ($w2ssyn_field_mappings as $w2ssyn_mapping) {
-            $w2ssyn_mappings[$w2ssyn_mapping->shopify_field] = $w2ssyn_mapping->woocommerce_field;
-        }
-
-        // Fetch Shopify customers
-        $w2ssyn_shopify_url      = "{$w2ssyn_shopify_base_url}customers.json?limit=250";
-        $w2ssyn_shopify_url      = W2SSYN_Sync_Helper::w2ssyn_add_date_filter($w2ssyn_shopify_url, 'customer');
-        $w2ssyn_shopify_response = wp_remote_get(
-            $w2ssyn_shopify_url,
-            array(
-                'headers'   => array(
-                    'Content-Type'           => 'application/json',
-                    'X-Shopify-Access-Token' => $w2ssyn_shopify_token,
-                ),
-                'timeout'   => 30,
-                'sslverify' => false,
-            )
-        );
-
-        if (is_wp_error($w2ssyn_shopify_response)) {
-            W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action('customer', 'create', 'failure', 'Shopify API Error: ' . $w2ssyn_shopify_response->get_error_message());
-            return;
-        }
-
-        $w2ssyn_shopify_customers = json_decode(wp_remote_retrieve_body($w2ssyn_shopify_response), true)['customers'] ?? array();
-
-        if (empty($w2ssyn_shopify_customers)) {
-            W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action('customer', 'create', 'failure', 'No Shopify customers found.');
-            return;
-        }
-
-        // Loop through Shopify customers
-        foreach ($w2ssyn_shopify_customers as $w2ssyn_shopify_customer) {
-            $w2ssyn_shopify_customer_id = $w2ssyn_shopify_customer['id'];
-
-            // Check if the customer exists in the local database
-            $w2ssyn_existing_customer = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->prefix}w2ssyn_customers WHERE shopify_customer_id = %s", $w2ssyn_shopify_customer_id));
+{
+    global $wpdb;
+
+    W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action('customer', 'create', 'success', 'Starting Shopify to WooCommerce customer sync...');
+
+    $w2ssyn_shopify_headers = array(
+        'Content-Type' => 'application/json',
+        'X-Shopify-Access-Token' => $w2ssyn_shopify_token,
+    );
+
+    $w2ssyn_shopify_url = "{$w2ssyn_shopify_base_url}customers.json?limit=250";
+    $w2ssyn_response = wp_remote_get($w2ssyn_shopify_url, [
+        'headers' => $w2ssyn_shopify_headers,
+        'timeout' => 30,
+        'sslverify' => false,
+    ]);
+
+    if (is_wp_error($w2ssyn_response)) {
+        W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action('customer', 'create', 'failure', 'Shopify API Error: ' . $w2ssyn_response->get_error_message());
+        return;
+    }
+
+    $w2ssyn_customers = json_decode(wp_remote_retrieve_body($w2ssyn_response), true)['customers'] ?? [];
+
+    if (empty($w2ssyn_customers)) {
+        W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action('customer', 'create', 'failure', 'No Shopify customers found.');
+        return;
+    }
+
+    foreach ($w2ssyn_customers as $w2ssyn_customer) {
+        $w2ssyn_existing_customer = $wpdb->get_row($wpdb->prepare(
+            "SELECT * FROM {$wpdb->prefix}w2ssyn_customers WHERE shopify_customer_id = %s",
+            $w2ssyn_customer['id']
+        ));
+
+        if ($w2ssyn_existing_customer) {
+            $w2ssyn_woo_customer_id = $w2ssyn_existing_customer->woocommerce_customer_id;
+
+            $w2ssyn_check_url = "{$w2ssyn_woo_base_url}customers/{$w2ssyn_woo_customer_id}?consumer_key={$w2ssyn_consumer_key}&consumer_secret={$w2ssyn_consumer_secret}";
+            $w2ssyn_check_response = wp_remote_get($w2ssyn_check_url, ['sslverify' => false]);
+
+            if (!is_wp_error($w2ssyn_check_response) && wp_remote_retrieve_response_code($w2ssyn_check_response) == 200) {
+                W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action('customer', 'create', 'success', 'WooCommerce customer exists, skipping ID: ' . $w2ssyn_customer['id']);
+                continue;
+            } else {
+                $w2ssyn_existing_customer = null;
+                W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action('customer', 'create', 'warning', 'WooCommerce customer missing, will recreate ID: ' . $w2ssyn_customer['id']);
+            }
+        }
+
+        $w2ssyn_woo_payload = [
+            'email' => $w2ssyn_customer['email'],
+            'first_name' => $w2ssyn_customer['first_name'] ?? '',
+            'last_name' => $w2ssyn_customer['last_name'] ?? '',
+        ];
+
+        $w2ssyn_create_url = "{$w2ssyn_woo_base_url}customers?consumer_key={$w2ssyn_consumer_key}&consumer_secret={$w2ssyn_consumer_secret}";
+        $w2ssyn_create_response = wp_remote_post($w2ssyn_create_url, [
+            'body' => json_encode($w2ssyn_woo_payload),
+            'headers' => ['Content-Type' => 'application/json'],
+            'sslverify' => false,
+            'timeout' => 30,
+        ]);
+
+        $w2ssyn_create_body = json_decode(wp_remote_retrieve_body($w2ssyn_create_response), true);
+
+        if (!is_wp_error($w2ssyn_create_response) && isset($w2ssyn_create_body['id'])) {
+            $w2ssyn_woo_customer_id = $w2ssyn_create_body['id'];
+
+            W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action('customer', 'create', 'success', 'Created WooCommerce customer: ' . $w2ssyn_customer['email']);
 
             if ($w2ssyn_existing_customer) {
-                // Check if the WooCommerce customer still exists
-                $w2ssyn_woo_customer_id    = $w2ssyn_existing_customer->woocommerce_customer_id;
-                $w2ssyn_woo_check_url      = "{$w2ssyn_woo_base_url}customers/{$w2ssyn_woo_customer_id}?consumer_key=$w2ssyn_consumer_key&consumer_secret=$w2ssyn_consumer_secret";
-                $w2ssyn_woo_check_response = wp_remote_get($w2ssyn_woo_check_url, array('sslverify' => false));
-
-                if (is_wp_error($w2ssyn_woo_check_response) || wp_remote_retrieve_response_code($w2ssyn_woo_check_response) == 404) {
-                    W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action('customer', 'create', 'failure', 'WooCommerce customer missing, recreating ID: ' . $w2ssyn_shopify_customer_id);
-                    $w2ssyn_existing_customer = null; // Force recreation
-                } else {
-                    W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action('customer', 'create', 'success', 'WooCommerce customer exists, skipping ID: ' . $w2ssyn_shopify_customer_id);
-                    continue;
-                }
-            }
-
-            // Map Shopify customer data to WooCommerce format dynamically
-            $w2ssyn_woo_customer = array();
-            foreach ($w2ssyn_mappings as $w2ssyn_shopify_field => $w2ssyn_woo_field) {
-                if (isset($w2ssyn_shopify_customer[$w2ssyn_shopify_field])) {
-                    $w2ssyn_woo_customer[$w2ssyn_woo_field] = $w2ssyn_shopify_customer[$w2ssyn_shopify_field];
-                }
-            }
-
-            // Handle address if available
-            if (!empty($w2ssyn_shopify_customer['default_address'])) {
-                $w2ssyn_woo_customer['billing'] = array(
-                    'address_1' => $w2ssyn_shopify_customer['default_address']['address1'] ?? '',
-                    'address_2' => $w2ssyn_shopify_customer['default_address']['address2'] ?? '',
-                    'city'      => $w2ssyn_shopify_customer['default_address']['city'] ?? '',
-                    'state'     => $w2ssyn_shopify_customer['default_address']['province'] ?? '',
-                    'postcode'  => $w2ssyn_shopify_customer['default_address']['zip'] ?? '',
-                    'country'   => $w2ssyn_shopify_customer['default_address']['country'] ?? '',
-                    'phone'     => $w2ssyn_shopify_customer['default_address']['phone'] ?? '',
-                );
-            }
-
-            W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action('customer', 'create', 'success', 'Creating WooCommerce Customer for ID: ' . $w2ssyn_shopify_customer_id);
-
-            // Create customer in WooCommerce
-            $w2ssyn_woo_create_url    = "{$w2ssyn_woo_base_url}customers?consumer_key=$w2ssyn_consumer_key&consumer_secret=$w2ssyn_consumer_secret";
-            $w2ssyn_woo_post_response = wp_remote_post(
-                $w2ssyn_woo_create_url,
-                array(
-                    'headers'   => array('Content-Type' => 'application/json'),
-                    'body'      => json_encode($w2ssyn_woo_customer),
-                    'method'    => 'POST',
-                    'timeout'   => 30,
-                    'sslverify' => false,
-                )
+                $wpdb->update(
+                    $wpdb->prefix . 'w2ssyn_customers',
+                    ['woocommerce_customer_id' => $w2ssyn_woo_customer_id],
+                    ['id' => $w2ssyn_existing_customer->id]
+                );
+            } else {
+                $wpdb->insert(
+                    $wpdb->prefix . 'w2ssyn_customers',
+                    [
+                        'shopify_customer_id' => $w2ssyn_customer['id'],
+                        'woocommerce_customer_id' => $w2ssyn_woo_customer_id,
+                        'first_name' => $w2ssyn_customer['first_name'] ?? '',
+                        'last_name' => $w2ssyn_customer['last_name'] ?? '',
+                        'email' => $w2ssyn_customer['email'] ?? '',
+                        'address' => json_encode($w2ssyn_customer['addresses'] ?? []),
+                    ]
+                );
+            }
+        } else {
+            W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action(
+                'customer',
+                'create',
+                'failure',
+                'Failed to create WooCommerce customer: ' . $w2ssyn_customer['email'] . ' - ' . wp_remote_retrieve_body($w2ssyn_create_response)
             );
-
-            $w2ssyn_woo_response_raw = wp_remote_retrieve_body($w2ssyn_woo_post_response);
-            $w2ssyn_woo_post_body    = json_decode($w2ssyn_woo_response_raw, true);
-
-            if (is_wp_error($w2ssyn_woo_post_response)) {
-                W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action('customer', 'create', 'failure', 'WooCommerce API Error: ' . $w2ssyn_woo_post_response->get_error_message());
-            } elseif (empty($w2ssyn_woo_post_body['id'])) {
-                W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action('customer', 'create', 'failure', 'WooCommerce response error: ' . json_encode($w2ssyn_woo_post_body));
-            } else {
-                W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action('customer', 'create', 'success', 'Successfully created WooCommerce customer for ID: ' . $w2ssyn_shopify_customer_id);
-                $w2ssyn_woo_customer_id = $w2ssyn_woo_post_body['id'];
-
-                // Update or insert new record in DB
-                $wpdb->replace(
-                    $wpdb->prefix . 'w2ssyn_customers',
-                    array(
-                        'shopify_customer_id'     => $w2ssyn_shopify_customer_id,
-                        'woocommerce_customer_id' => $w2ssyn_woo_customer_id,
-                        'first_name'              => $w2ssyn_woo_customer['first_name'] ?? '',
-                        'last_name'               => $w2ssyn_woo_customer['last_name'] ?? '',
-                        'email'                   => $w2ssyn_woo_customer['email'] ?? '',
-                        'address'                 => json_encode($w2ssyn_woo_customer['billing'] ?? array()),
-                    )
-                );
-            }
-
-            // Optional delay to prevent hitting API rate limits
-            sleep(2);
-        }
-
-        W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action('customer', 'create', 'success', 'Shopify to WooCommerce customer sync completed.');
-    }
+        }
+
+        sleep(2); // Prevent rate limits
+    }
+
+    W2SSYN_SWI_Audit_Log::w2ssyn_log_sync_action('customer', 'create', 'success', 'Shopify to WooCommerce customer sync completed.');
+}
+
 
 

w2s-sync/trunk/includes/modules/class-w2ssyn-swi-order-sync.php

@@ -233 +233 @@
                 if (is_wp_error($w2ssyn_woo_order_response) || wp_remote_retrieve_response_code($w2ssyn_woo_order_response) === 404) {
                     // If the WooCommerce order does not exist, create it
-
+$w2ssyn_order_data = array(
+  'status'      => $w2ssyn_order_status,
+  'customer_id' => $w2ssyn_customer_id,
+  'line_items'  => $w2ssyn_line_items,
+  'total'       => $w2ssyn_order_total,
+  'shipping'    => array(
+    'address' => array(
+      'line1'    => $w2ssyn_shopify_order['shipping_address']['address1'] ?? '',
+      'line2'    => $w2ssyn_shopify_order['shipping_address']['address2'] ?? '',
+      'city'     => $w2ssyn_shopify_order['shipping_address']['city'] ?? '',
+      'state'    => $w2ssyn_shopify_order['shipping_address']['province'] ?? '',
+      'postcode' => $w2ssyn_shopify_order['shipping_address']['zip'] ?? '',
+      'country'  => $w2ssyn_shopify_order['shipping_address']['country'] ?? '',
+    ),
+  ),
+);
+
+// 2. Send it to WooCommerce
+$w2ssyn_order_response = wp_remote_post(
+  "{$w2ssyn_woo_base_url}orders",
+  array(
+    'method'    => 'POST',
+    'headers'   => array(
+      'Content-Type'  => 'application/json',
+      'Authorization' => 'Basic ' . base64_encode("{$w2ssyn_woo_consumer_key}:{$w2ssyn_woo_consumer_secret}"),
+    ),
+    'body'      => json_encode($w2ssyn_order_data),
+    'sslverify' => false,
+    'timeout'   => 60,
+  )
+);
+
+// 3. Log the response
+$code = wp_remote_retrieve_response_code($w2ssyn_order_response);
+$body = wp_remote_retrieve_body($w2ssyn_order_response);
+
+// 4. On success, save the new order ID
+if ( $code === 201 ) {
+  $data = json_decode($body, true);
+  if ( ! empty($data['id']) ) {
+    $wpdb->update(
+      $w2ssyn_table_name,
+      [ 'woocommerce_order_id' => $data['id'] ],
+      [ 'shopify_order_id'     => $w2ssyn_shopify_order_id ]
+    );
+  }
+}
                     // Prepare line items for WooCommerce order from Shopify data
                     $w2ssyn_line_items = array();

w2s-sync/trunk/readme.txt

@@ -1 @@
-=== W2S-Sync ===
+=== W2S Sync – WooCommerce to Shopify Integration ===
 Contributors: smackcoders, smacksupport
 Donate link: https://www.smackcoders.com/contact-us.html
 Requires at least: 5.0
 Tested up to: 6.8
-Version: 1.1
+Version: 1.2
 Requires PHP: 7.2
-Stable tag: 1.1
+Stable tag: 1.2
 Author: smackcoders
 Author URI: https://www.smackcoders.com
@@ -21 +21 @@
 [youtube https://www.youtube.com/watch?v=1-tuqBcU0RM&t=52s]
 
+== Authentication – How to Connect Your Stores ==
+
+To begin syncing, you need to securely connect your WooCommerce and Shopify stores by generating API credentials for both platforms:
+
+- **WooCommerce**: Generate Consumer Key and Secret from your WordPress admin.
+- **Shopify**: Create a private app to get your Admin API access token.
+
+Follow the step-by-step guide here:  
+[Authentication Setup Guide](https://www.smackcoders.com/documentation/woocommerce-to-shopify-integration/woocommerce-to-shopify-integration-authentication-setup)
+
+Once connected, visual indicators (Green, Yellow, Red) show the status of your authentication.
+
 **Key Benefits:**
-- Bi-directional sync between WooCommerce and Shopify
-- One-time migration or continuous data synchronization
-- Supports syncing of Products, Orders, and Customers
-- Easy authentication with WooCommerce API keys and Shopify access token
-- Schedule syncs: On Save, Hourly, Daily, Weekly, or within a custom date range
-- Auto field mapping and customizable sync actions (Create, Update, Delete)
-- Visual indicators for successful authentication and sync status
-- Audit Log for detailed activity tracking and debugging
+- **Bi-Directional Sync**  
+Sync data both ways: WooCommerce → Shopify, Shopify → WooCommerce, or keep both stores in sync at the same time.
+- **Real-Time & Scheduled Sync**  
+Trigger sync instantly on product save or set automatic sync intervals — hourly, daily, weekly, or within a custom date range.
+- **Sync Key Data Types**  
+Support for syncing Products, Orders, and Customers. Choose whether to Create, Update, or Delete data.
+- **Auto Field Mapping**  
+WooCommerce and Shopify fields are automatically matched — reduce setup effort and avoid mismatches.
+- **Audit Log**  
+View a full history of all sync activities, including timestamps, success/failure status, and detailed actions.
+- **One-Time or Continuous Use**  
+Use W2S for a single migration or leave it running for continuous integration between your platforms.
+- **Local Data & Secure Credentials**  
+Your credentials are stored locally in WordPress and are only used to connect to your own stores. No external services involved.
 
 **How It Works:**
@@ -59 +77 @@
 
 = Can I schedule a nightly sync? =  
-Yes—choose **Daily** under Schedule Sync. Ensure WP-Cron is active.
+Yes choose **Daily** under Schedule Sync. Ensure WP-Cron is active.
 
 = Does this support Shopify → WooCommerce product sync? =  
@@ -104 +122 @@
 
 == Changelog ==
+= 1.2 =
+* Bug fixes
 = 1.1 =
 * Bug fix
@@ -112 +132 @@
 == Upgrade Notice ==
 
-= 1.1 =
+= 1.2 =
 Upgrade now to get latest update.
 apps-fileview.texmex_20250501.00_p3

w2s-sync/trunk/w2s-sync.php

@@ -1 +1 @@
 <?php
+
 /**
  * Plugin Name:       W2S-Sync
  * Plugin URI:        https://www.smackcoders.com/
  * Description:       A custom Shopify-WooCommerce integration plugin for WordPress that enables two-way synchronization of customers, products, and orders. It features automated scheduling, configurable sync settings, secure API authentication, detailed audit logs, and customizable field mappings—ensuring seamless data consistency across both eCommerce platforms.
- * Version:           1.0
+ * Version:           1.2
  * Requires at least: 6.0
  * Requires PHP:      7.4