Changeset 3507036

Timestamp:

04/15/2026 11:45:17 AM (6 months ago)

Author:

shop123nettbutikker

Message:

Auto send issue fixed

Location:

sendo

Files:

• tags/5.1.6 (added)
• tags/5.1.6/assets (added)
• tags/5.1.6/assets/css (added)
• tags/5.1.6/assets/css/sendoasp-shipping.css (added)
• tags/5.1.6/assets/js (added)
• tags/5.1.6/assets/js/sendo-admin-order.js (added)
• tags/5.1.6/assets/js/sendoasp-shipping.js (added)
• tags/5.1.6/includes (added)
• tags/5.1.6/includes/class-wc-shipping-sendoasp.php (added)
• tags/5.1.6/languages (added)
• tags/5.1.6/readme.txt (added)
• tags/5.1.6/sendo.php (added)
• trunk/includes/class-wc-shipping-sendoasp.php (modified) (1 diff)
• trunk/readme.txt (modified) (4 diffs)
• trunk/sendo.php (modified) (9 diffs)

sendo/trunk/includes/class-wc-shipping-sendoasp.php

@@ -13 +13 @@
 
 if (!defined('SENDOASP_VERSION')) {
-    define('SENDOASP_VERSION', '5.1.5');
+    define('SENDOASP_VERSION', '5.1.6');
 }
 

sendo/trunk/readme.txt

@@ -1 +1 @@
 === Sendo ===
-Contributors: shop123nettbutikker, phpwebdeveloper900
+Contributors: shop123nettbutikker
 Tags: woocommerce, shipping, logistics
 Requires at least: 5.8
 Tested up to: 6.9
 Requires PHP: 7.4
-Stable tag: 5.1.5
+Stable tag: 5.1.6
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -51 +51 @@
 * Pickup point auto-selection
 * Pickup preference memory per postcode
+* Automatic order transfer to Sendo on status change (configurable)
+* Shipping method exclusion filter for auto-transfer
 * Manual "Send to Sendo" button on admin order pages
 * Re-send orders to Sendo with one click
@@ -76 +78 @@
 
 == Changelog ==
+
+= 5.1.6 =
+* Automatic order transfer to Sendo when order status changes (completed, partial-shipped, or custom status)
+* Configurable shipping method exclusion — skip auto-transfer for specific shipping methods
+* Duplicate-send prevention — orders already sent to Sendo are not re-sent automatically
+* Refactored order-send logic into shared sendoaspSendOrderToSendo() function (used by both manual and auto-transfer)
+* Debug logging for auto-transfer success and failure events
 
 = 5.1.5 =
@@ -117 +126 @@
 == Upgrade Notice ==
 
+= 5.1.6 =
+Adds automatic order transfer to Sendo on status change (completed, partial-shipped, or custom). Configure in Sendo shipping method settings. Existing manual send button continues to work.
+
 = 5.1.5 =
 Real-time shipping rates are now off by default — enable per shipping zone if needed. Adds manual "Send to Sendo" button on admin order pages.

sendo/trunk/sendo.php

@@ -4 +4 @@
  * Plugin URI: https://sendo.no
  * Description: Real-time shipping rates and pickup point selection from Sendo logistics platform.
- * Version: 5.1.5
+ * Version: 5.1.6
  * Author: Sendo AS
  * Text Domain: sendo
@@ -19 +19 @@
 
 // Plugin constants
-define('SENDOASP_VERSION', '5.1.5');
+define('SENDOASP_VERSION', '5.1.6');
 define('SENDOASP_PLUGIN_FILE', __FILE__);
 define('SENDOASP_PLUGIN_DIR', plugin_dir_path(__FILE__));
@@ -93 +93 @@
     add_action('wp_ajax_sendo_get_session_address', 'sendoaspGetSessionAddress');
     add_action('wp_ajax_nopriv_sendo_get_session_address', 'sendoaspGetSessionAddress');
+
+    // ── Auto-transfer: hook into order status changes based on instance settings ──
+    sendoaspRegisterAutoTransferHooks();
 }
 add_action('plugins_loaded', 'sendoaspInit', 20);
@@ -641 +644 @@
     }
 
-    $creds = sendoaspGetApiCredentials();
+    // Delegate to the shared send function
+    $result = sendoaspSendOrderToSendo($order);
+
+    if ($result['success']) {
+        wp_send_json_success(array(
+            'message'       => sprintf(__('Ordren er sendt til Sendo (ID: %s)', 'sendo'), $result['tracking_id']),
+            'tracking_id'   => $result['tracking_id'],
+            'tracking_link' => $result['tracking_link'],
+        ));
+    } else {
+        wp_send_json_error(array('message' => $result['message']));
+    }
+}
+
+/**
+ * Retrieve the full settings array from the first enabled sendoasp shipping method instance.
+ * Used by auto-transfer to read auto_send, order_status, and exclude_shipping_method.
+ *
+ * @return array|false  Settings array or false if no instance found.
+ */
+function sendoaspGetInstanceSettings() {
+    global $wpdb;
+
+    $rows = $wpdb->get_results(
+        "SELECT instance_id FROM {$wpdb->prefix}woocommerce_shipping_zone_methods
+         WHERE method_id = 'sendoasp' AND is_enabled = 1
+         ORDER BY method_order ASC LIMIT 1"
+    );
+
+    if (empty($rows)) {
+        return false;
+    }
+
+    $instance_id = (int) $rows[0]->instance_id;
+    $option_key  = 'woocommerce_sendoasp_' . $instance_id . '_settings';
+    $settings    = get_option($option_key, array());
+
+    return is_array($settings) ? $settings : false;
+}
+
+/**
+ * Register auto-transfer hooks based on the Sendo shipping method instance settings.
+ *
+ * Reads the auto_send and order_status settings from the first enabled Sendo instance.
+ * When auto_send is 'yes', hooks into woocommerce_order_status_completed and
+ * woocommerce_order_status_partial-shipped. Additionally hooks into whatever custom
+ * status is selected in the order_status setting (e.g. processing, on-hold).
+ */
+function sendoaspRegisterAutoTransferHooks() {
+    $settings = sendoaspGetInstanceSettings();
+    if (!$settings) {
+        return;
+    }
+
+    $auto_send = isset($settings['auto_send']) ? $settings['auto_send'] : 'no';
+
+    // Hook into completed and partial-shipped when auto_send is enabled
+    if ($auto_send === 'yes') {
+        add_action('woocommerce_order_status_completed', 'sendoaspAutoTransferOrder');
+        add_action('woocommerce_order_status_partial-shipped', 'sendoaspAutoTransferOrder');
+    }
+
+    // Hook into the custom-configured status (e.g. processing, on-hold)
+    $order_status = isset($settings['order_status']) ? $settings['order_status'] : '';
+    if (!empty($order_status)) {
+        // Strip 'wc-' prefix if present (WooCommerce stores statuses as 'wc-processing' etc.)
+        $status_slug = str_replace('wc-', '', $order_status);
+        add_action('woocommerce_order_status_' . $status_slug, 'sendoaspAutoTransferOrder');
+    }
+}
+
+/**
+ * Auto-transfer callback: sends an order to Sendo when its status changes.
+ *
+ * Checks the exclude_shipping_method setting — if the order's shipping method matches
+ * the excluded method, the transfer is skipped. Also skips if the order was already
+ * sent (has a _sendo_tracking_id). Reuses sendoaspSendOrderToSendo() for the actual POST.
+ *
+ * @param int $order_id WooCommerce order ID.
+ */
+function sendoaspAutoTransferOrder($order_id) {
+    $order = wc_get_order($order_id);
+    if (!$order) {
+        return;
+    }
+
+    // Skip if already sent to Sendo
+    $existing_id = $order->get_meta('_sendo_tracking_id');
+    if (!empty($existing_id)) {
+        return;
+    }
+
+    // Check shipping method exclusion filter
+    $settings = sendoaspGetInstanceSettings();
+    if ($settings) {
+        $exclude_method = isset($settings['exclude_shipping_method']) ? $settings['exclude_shipping_method'] : '';
+        if (!empty($exclude_method)) {
+            $shipping_methods = $order->get_shipping_methods();
+            $first_method = reset($shipping_methods);
+            if ($first_method) {
+                $method_id = $first_method->get_method_id();
+                if ($method_id === $exclude_method) {
+                    return;
+                }
+            }
+        }
+    }
+
+    // Send the order to Sendo
+    $result = sendoaspSendOrderToSendo($order);
+
+    // Log the result if debug mode is enabled
+    if (get_option('sendo_debug_mode', 'no') === 'yes') {
+        $logger = wc_get_logger();
+        if ($result['success']) {
+            $logger->info(
+                sprintf('Auto-transfer: Order #%d sent to Sendo (ID: %s)', $order_id, $result['tracking_id']),
+                array('source' => 'sendo')
+            );
+        } else {
+            $logger->error(
+                sprintf('Auto-transfer: Order #%d failed — %s', $order_id, $result['message']),
+                array('source' => 'sendo')
+            );
+        }
+    }
+}
+
+/**
+ * Send an order to the Sendo API and store tracking data on success.
+ *
+ * This is the shared core logic used by both the manual AJAX send and the auto-transfer hook.
+ * Collects order/recipient/item data, POSTs to Sendo, and writes tracking meta on success.
+ *
+ * @param WC_Order $order The WooCommerce order object.
+ * @return array  ['success' => bool, 'message' => string, 'tracking_id' => string|null, 'tracking_link' => string|null]
+ */
+function sendoaspSendOrderToSendo($order) {
+    $order_id = $order->get_id();
+    $creds    = sendoaspGetApiCredentials();
+
     if (!$creds) {
-        wp_send_json_error(array('message' => __('Sendo API-nøkler er ikke konfigurert. Gå til WooCommerce → Innstillinger → Frakt → Sendo.', 'sendo')));
-    }
-
-    // ── Gather order data (same format as the old frakt123 plugin) ──
-
+        return array('success' => false, 'message' => 'Sendo API credentials not configured.', 'tracking_id' => null, 'tracking_link' => null);
+    }
+
+    // Gather shipping method names
     $shipping_list = '';
     foreach ($order->get_shipping_methods() as $sm) {
@@ -654 +796 @@
     $shipping_list = trim($shipping_list);
 
+    // Recipient data — prefer shipping address, fall back to billing
     $firstname = trim($order->get_shipping_first_name()) !== '' ? $order->get_shipping_first_name() : $order->get_billing_first_name();
     $lastname  = trim($order->get_shipping_last_name())  !== '' ? $order->get_shipping_last_name()  : $order->get_billing_last_name();
@@ -665 +808 @@
     $billcomp  = $order->get_billing_company();
 
+    // Collect line items with product data
     $ship_items = array();
     foreach ($order->get_items() as $item) {
@@ -689 +833 @@
             'H'               => $product->get_height(),
             'SHIPMENT_METHOD' => $shipping_list,
-            'HTTP_REFERER'    => wp_get_referer(),
         );
     }
 
     if (empty($ship_items)) {
-        wp_send_json_error(array('message' => __('Ingen produkter i ordren, eller produktdata mangler.', 'sendo')));
-    }
-
-    // ── POST to Sendo API ──
-
+        return array('success' => false, 'message' => 'No products in order or product data missing.', 'tracking_id' => null, 'tracking_link' => null);
+    }
+
+    // POST to Sendo API
     $url = 'https://www.frakt123.no/public/api/woo/index.php';
 
     $post_param = array(
-        'wp_key'        => $creds['api_key'],
-        'wp_secret'     => $creds['api_secret'],
-        'oid'           => $order_id,
-        'wp_site'       => $creds['shop_url'],
-        'ship_items'    => wp_json_encode($ship_items),
-        'ship_clientnr' => $order->get_user_id(),
-        'ship_firstname'=> $firstname !== '' ? $firstname : ($company !== '' ? $company : $billcomp),
-        'ship_lastname' => $lastname,
-        'ship_adr1'     => $address1,
-        'ship_adr2'     => $address2,
-        'ship_postnr'   => $postcode,
-        'ship_city'     => $city,
-        'ship_phone'    => $phone,
-        'ship_email'    => $email,
-        'order_date'    => strtotime($order->get_date_created()),
+        'wp_key'         => $creds['api_key'],
+        'wp_secret'      => $creds['api_secret'],
+        'oid'            => $order_id,
+        'wp_site'        => $creds['shop_url'],
+        'ship_items'     => wp_json_encode($ship_items),
+        'ship_clientnr'  => $order->get_user_id(),
+        'ship_firstname' => $firstname !== '' ? $firstname : ($company !== '' ? $company : $billcomp),
+        'ship_lastname'  => $lastname,
+        'ship_adr1'      => $address1,
+        'ship_adr2'      => $address2,
+        'ship_postnr'    => $postcode,
+        'ship_city'      => $city,
+        'ship_phone'     => $phone,
+        'ship_email'     => $email,
+        'order_date'     => strtotime($order->get_date_created()),
     );
 
@@ -728 +870 @@
 
     if (is_wp_error($response)) {
-        wp_send_json_error(array('message' => $response->get_error_message()));
+        return array('success' => false, 'message' => $response->get_error_message(), 'tracking_id' => null, 'tracking_link' => null);
     }
 
@@ -735 +877 @@
 
     if (isset($res->error) && (int) $res->error === 0) {
-        // Store tracking data (HPOS-compatible)
+        // Store tracking data (HPOS-compatible + legacy keys)
         $order->update_meta_data('_sendo_tracking_id', $res->tracking_id);
         $order->update_meta_data('_sendo_tracking_link', $res->tracking_link ?? '');
-
-        // Also write legacy keys for backward compatibility
         $order->update_meta_data('frakt_track_id', $res->tracking_id);
         $order->update_meta_data('frakt_track_link', $res->tracking_link ?? '');
         $order->save();
 
-        wp_send_json_success(array(
-            'message'      => sprintf(__('Ordren er sendt til Sendo (ID: %s)', 'sendo'), $res->tracking_id),
-            'tracking_id'  => $res->tracking_id,
-            'tracking_link'=> $res->tracking_link ?? '',
-        ));
-    } else {
-        $error_msg = isset($res->msg) ? $res->msg : __('Ukjent feil fra Sendo. Prøv igjen.', 'sendo');
-        wp_send_json_error(array('message' => $error_msg));
-    }
+        return array('success' => true, 'message' => 'OK', 'tracking_id' => $res->tracking_id, 'tracking_link' => $res->tracking_link ?? '');
+    }
+
+    $error_msg = isset($res->msg) ? $res->msg : 'Unknown error from Sendo.';
+    return array('success' => false, 'message' => $error_msg, 'tracking_id' => null, 'tracking_link' => null);
 }