Changeset 3451370

Timestamp:

02/01/2026 12:48:20 PM (2 weeks ago)

Author:

philiasolutions

Message:

• Added Order Status for Synchronization

Location:

philia-integration

Files:

• tags/1.13 (added)
• tags/1.13/assets (added)
• tags/1.13/assets/philia-api-settings.js (added)
• tags/1.13/assets/philia-api-sync.js (added)
• tags/1.13/assets/philia-login-redirect.js (added)
• tags/1.13/includes (added)
• tags/1.13/includes/class-api-log.php (added)
• tags/1.13/includes/class-api-settings.php (added)
• tags/1.13/includes/class-core-api.php (added)
• tags/1.13/includes/class-login-redirect.php (added)
• tags/1.13/includes/class-philia-wallet.php (added)
• tags/1.13/includes/class-webhook-sender.php (added)
• tags/1.13/includes/templates (added)
• tags/1.13/includes/templates/wc-endpoint-wallet.php (added)
• tags/1.13/includes/templates/woo-wallet-partial-payment.php (added)
• tags/1.13/philia-integration.php (added)
• tags/1.13/readme.txt (added)
• trunk/includes/class-api-settings.php (modified) (8 diffs)
• trunk/includes/class-webhook-sender.php (modified) (6 diffs)
• trunk/philia-integration.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)

philia-integration/trunk/includes/class-api-settings.php

@@ -115 +115 @@
             __('Phone Meta Key', 'philia-integration'),
             array($this, 'phone_meta_field_callback'),
+            'philia-api-settings',
+            'philia_api_settings_section'
+        );
+
+        // Order Status for Sync
+        add_settings_field(
+            'order_sync_status',
+            __('Order Status for Synchronization', 'philia-integration'),
+            array($this, 'order_sync_status_field_callback'),
             'philia-api-settings',
             'philia_api_settings_section'
@@ -179 +188 @@
                 if( isset( $settings['api_url'] ) && !empty( $settings['api_url'] ) && isset( $settings['api_key'] ) && !empty( $settings['api_key'] ) )
                 {
-                    $res = self::create_and_send_woocommerce_api_key( $settings['api_url'] , $settings['api_key'], $settings['phone_meta'], $settings['data_sync'] );
+                    $res = self::create_and_send_woocommerce_api_key( $settings['api_url'] , $settings['api_key'], $settings['phone_meta'], $settings['data_sync'], $settings['order_sync_status'] );
                     if( wp_remote_retrieve_response_code( $res ) == 200 )
                     {
@@ -293 +302 @@
 
     /**
+     * Outputs the dropdown for order status synchronization.
+     * 
+     * @return void
+     */
+    public function order_sync_status_field_callback()
+    {
+        $settings = get_option('philia_api_settings');
+        
+        // Get the selected order status, default to 'completed'
+        $selected_status = isset($settings['order_sync_status']) ? $settings['order_sync_status'] : 'completed';
+        
+        // Get all available WooCommerce order statuses
+        $order_statuses = wc_get_order_statuses();
+        
+        echo '<select name="philia_api_settings[order_sync_status]" id="philia-order-sync-status">';
+        foreach ($order_statuses as $status_key => $status_label) {
+            // Remove 'wc-' prefix from status key
+            $status_value = str_replace('wc-', '', $status_key);
+            $selected = selected($selected_status, $status_value, false);
+            echo '<option value="' . esc_attr($status_value) . '" ' . $selected . '>' . esc_html($status_label) . '</option>';
+        }
+        echo '</select>';
+        ?>
+        <p class="description"><?php echo esc_attr__('Select which order status should trigger synchronization with Philia. Only orders with this status will be sent.', 'philia-integration'); ?></p>
+        <?php
+    }
+
+    /**
      * Checkbox field to show "Login to Philia" in My Account menu.
      */
@@ -466 +503 @@
         }
 
+        // Sanitize order sync status
+        if (isset($input['order_sync_status'])) {
+            $sanitized_input['order_sync_status'] = sanitize_text_field($input['order_sync_status']);
+        } else {
+            // Default to 'completed' if not set
+            $sanitized_input['order_sync_status'] = 'completed';
+        }
+
         return $sanitized_input;
     }
@@ -493 +538 @@
      * @return array|WP_Error The response from the remote server or WP_Error on failure.
      */
-    public static function create_and_send_woocommerce_api_key($philia_url, $philia_key, $philia_phone_key, $philia_data_sync)
+    public static function create_and_send_woocommerce_api_key($philia_url, $philia_key, $philia_phone_key, $philia_data_sync, $order_sync_status = NULL)
     {
         if (!class_exists('WooCommerce')) {
@@ -549 +594 @@
 
         $body = json_encode([
-            'philia_url'   => $philia_url,
-            'url'          => get_site_url(),
-            'key'          => $consumer_key,
-            'secret'       => $consumer_secret,
-            'type'         => 'woocommerce',
-            'version'      => $version,
-            'rest_prefix'  => $rest_prefix, // Include the current REST API prefix,
-            'data_sync'    => $philia_data_sync,
-            'extra_field_1' => $philia_phone_key
+            'philia_url'        => $philia_url,
+            'url'               => get_site_url(),
+            'key'               => $consumer_key,
+            'secret'            => $consumer_secret,
+            'type'              => 'woocommerce',
+            'version'           => $version,
+            'plugin_version'    => PHILIA_PLUGIN_VERSION,
+            'order_sync_status' => ( isset( $order_sync_status ) && ! is_null( $order_sync_status ) ) ? sanitize_text_field( $order_sync_status ) : 'completed',
+            'rest_prefix'       => $rest_prefix, // Include the current REST API prefix,
+            'data_sync'         => $philia_data_sync,
+            'extra_field_1'     => $philia_phone_key
         ]);
 
@@ -643 +690 @@
             $response = wp_remote_post($philia_settings['api_url'].'/v1/api/integration/wordpress/connection-test', [
                 'method'    => 'GET',
-                'body'      => $body,
                 'headers'   => [
                     'Content-Type' => 'application/json',
@@ -808 +854 @@
     }
 
+    /**
+     * Get the order status that should trigger synchronization.
+     *
+     * @return string The order status slug (e.g., 'completed', 'processing')
+     */
+    public static function get_order_sync_status()
+    {
+        // Get the entire settings array from the database
+        $settings = get_option( 'philia_api_settings' );
+
+        // Return the saved status or default to 'completed'
+        return isset( $settings['order_sync_status'] ) ? $settings['order_sync_status'] : 'completed';
+    }
+
 }
 

philia-integration/trunk/includes/class-webhook-sender.php

@@ -89 +89 @@
         add_filter( 'woocommerce_rest_prepare_product_object', array( $this, 'add_philia_id_to_product_response' ), 10, 3 );
         add_filter( 'woocommerce_rest_prepare_product_variation_object', array( $this, 'add_philia_id_to_product_response' ), 10, 3 );
+        add_filter( 'woocommerce_rest_pre_insert_shop_coupon_object', array($this, 'map_coupons_product_ids_before_insert'), 10, 3 );
 
         // order status completed
@@ -203 +204 @@
             // Prepare event-specific data based on the triggered action, formatted as per WC REST API
             $event_data = $this->prepare_event_data($current_action, $args);
-            error_log("CURRENT ACTION: " . $current_action);
-            error_log("EVENT DATA: " . print_r($event_data, true ) );
 
             // If no relevant data could be prepared, log and exit
@@ -251 +250 @@
                 $response_code = wp_remote_retrieve_response_code($response);
                 $response_body = wp_remote_retrieve_body($response);
-                error_log("Philia_Webhook_Sender: RESPONSE for {$current_action} - Code: {$response_code}, Body: " . $response_body);
+                //error_log("Philia_Webhook_Sender: RESPONSE for {$current_action} - Code: {$response_code}, Body: " . $response_body);
 
                 // Log if the webhook did not return a successful 2xx status code
@@ -630 +629 @@
                     $order = wc_get_order($order_id);
                     if ($order) {
-                        // ONLY proceed if the order status is 'completed'
-                        if ($order->get_status() !== 'completed') {
-                            error_log("Philia_Webhook_Sender: Order ID {$order_id} status is '{$order->get_status()}', not 'completed'. Skipping webhook send.");
+                        // Get the configured order status for synchronization (default: 'completed')
+                        $sync_status = Philia_API_Settings::get_order_sync_status();
+                        
+                        // ONLY proceed if the order status matches the configured sync status
+                        if ($order->get_status() !== $sync_status) {
+                            error_log("Philia_Webhook_Sender: Order ID {$order_id} status is '{$order->get_status()}', not '{$sync_status}'. Skipping webhook send.");
                             return []; // Return empty data to prevent sending webhook
                         }
@@ -962 +964 @@
     }
 
-
     /**
      * Add Philia Product ID to product REST API responses
@@ -1166 +1167 @@
         return $coupon;
     }
+
+    /**
+     * Map coupon product IDs before inserting/updating via REST API.
+     * Supports mapping by product ID, SKU, or Philia Product ID (_philia_product_id).
+     *
+     * @param WC_Coupon $coupon The coupon object being created or updated.
+     * @param WP_REST_Request $request The REST API request object.
+     * @param bool $creating Whether this is a create operation (true) or update (false).
+     * @return WC_Coupon The modified coupon object.
+     */
+    public function map_coupons_product_ids_before_insert($coupon, $request, $creating)
+    {
+        // Check for custom REST parameter to enable product ID rewriting
+        $flag = $request->get_param( 'rewrite_product_ids' );
+        
+        if ( empty( $flag ) ) {
+            return $coupon;
+        }
+        
+        // Get existing product_ids from request
+        $product_ids = $request->get_param( 'product_ids' );
+        
+        if ( ! is_array( $product_ids ) ) {
+            return $coupon;
+        }
+        
+        /**
+         * Map incoming product IDs to actual WooCommerce product IDs
+         * Supports three methods:
+         * 1. Direct product ID (numeric)
+         * 2. SKU lookup
+         * 3. Philia Product ID (_philia_product_id meta field)
+         */
+        $mapped_ids = [];
+        
+        foreach ( $product_ids as $identifier )
+        {
+            $found_id = null;
+            
+            // Method 1: If input is numeric and a valid product, use it directly
+            if ( is_numeric( $identifier ) && get_post_type( $identifier ) === 'product' ) {
+                $found_id = (int) $identifier;
+            }
+
+            // Method 2: Try to find by SKU
+            elseif ( ! is_numeric( $identifier ) ) {
+                $product_id = wc_get_product_id_by_sku( $identifier );
+                if ( $product_id ) {
+                    $found_id = (int) $product_id;
+                }
+            }
+            
+            // Method 3: If not found yet, try to find by Philia Product ID
+            if ( ! $found_id ) {
+                $found_id = $this->get_product_id_by_philia_id( $identifier );
+            }
+            
+            // Add to mapped IDs if found
+            if ( $found_id ) {
+                $mapped_ids[] = $found_id;
+            }
+        }
+        
+        // Remove duplicates and invalid IDs
+        $mapped_ids = array_values( array_unique( array_filter( $mapped_ids ) ) );
+        
+        // Overwrite coupon product_ids with mapped values
+        $coupon->set_product_ids( $mapped_ids );
+        
+        return $coupon;
+    }
     
     /**

philia-integration/trunk/philia-integration.php

@@ -3 +3 @@
  * Plugin Name: Philia Integration with WooCommerce
  * Description: Sending Users, Products, Categories and invoices from WooCommerce to Philia and Receive Coupons and Cashback from Philia
- * Version: 1.12
+ * Version: 1.13
  * Author: Philia
  * Author URI: https://fa.philia.vip
@@ -17 +17 @@
 
 // Define constants for plugin directory, URL, and table prefix.
-define('PHILIA_PLUGIN_VERSION', '1.12');
+define('PHILIA_PLUGIN_VERSION', '1.13');
 define('PHILIA_PLUGIN_DIR', plugin_dir_path(__FILE__));
 define('PHILIA_PLUGIN_URL', plugin_dir_url(__FILE__));

philia-integration/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 6.0
 Tested up to: 6.9
-Stable tag: 1.12
+Stable tag: 1.13
 License: GPL-2.0+
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -45 +45 @@
 
 == Changelog ==
+
+= 1.13 =
+* Added Order Status for Synchronization
+
+= 1.12.1 =
+* Bugs fixes and improvements
 
 = 1.12 =