Index: /traceify/trunk/admin/class-trcfy-admin.php =================================================================== --- /traceify/trunk/admin/class-trcfy-admin.php (revision 3758166) +++ /traceify/trunk/admin/class-trcfy-admin.php (revision 3758167) @@ -28,4 +28,9 @@ add_action( 'add_meta_boxes', array( $this, 'add_order_meta_box' ) ); + // Order detail page — Estimated Delivery override meta box. + // `woocommerce_process_shop_order_meta` fires for both HPOS and legacy order screens. + add_action( 'add_meta_boxes', array( $this, 'add_edd_meta_box' ) ); + add_action( 'woocommerce_process_shop_order_meta', array( $this, 'save_edd_override' ), 20, 2 ); + // Settings link on plugins page. add_filter( 'plugin_action_links_' . TRCFY_BASENAME, array( $this, 'add_plugin_action_links' ) ); @@ -37,5 +42,5 @@ // Show a red dot badge on the menu item until the user visits settings. $show_badge = ( '1' !== get_option( 'trcfy_settings_visited', '0' ) ); - $menu_label = __( 'Traceify', 'traceify' ); + $menu_label = __( 'Traceify', 'traceify-for-woocommerce' ); if ( $show_badge ) { $menu_label .= ' '; @@ -44,5 +49,5 @@ add_submenu_page( 'woocommerce', - __( 'Traceify Settings', 'traceify' ), + __( 'Traceify Settings', 'traceify-for-woocommerce' ), $menu_label, 'manage_woocommerce', @@ -69,5 +74,5 @@ public function render_settings_page() { if ( ! current_user_can( 'manage_woocommerce' ) ) { - wp_die( esc_html__( 'You do not have permission to access this page.', 'traceify' ) ); + wp_die( esc_html__( 'You do not have permission to access this page.', 'traceify-for-woocommerce' ) ); } require_once TRCFY_PATH . 'admin/views/settings-page.php'; @@ -97,4 +102,9 @@ 'trcfy_edd_max_ship_days', 'trcfy_edd_exclude_weekends', + // Shipment tracking. + 'trcfy_shipment_enabled', + 'trcfy_shipment_auto_shipped', + 'trcfy_custom_courier_name', + 'trcfy_custom_courier_url', // Email notifications. 'trcfy_email_enabled', @@ -130,4 +140,8 @@ 'trcfy_edd_enabled' => array( $this, 'sanitize_checkbox' ), 'trcfy_edd_exclude_weekends' => array( $this, 'sanitize_checkbox' ), + // Shipment tracking. + 'trcfy_shipment_enabled' => array( $this, 'sanitize_checkbox' ), + 'trcfy_shipment_auto_shipped' => array( $this, 'sanitize_checkbox' ), + 'trcfy_custom_courier_url' => array( 'TRCFY_Shipment_Tracking', 'sanitize_url_template' ), // Email toggles. 'trcfy_email_enabled' => array( $this, 'sanitize_checkbox' ), @@ -164,4 +178,10 @@ $this->get_badge_inline_css() ); + } + + // Order-screen meta box styles (tiny; only on order edit screens). + $screen = get_current_screen(); + if ( $screen && ( 'shop_order' === $screen->post_type || 'woocommerce_page_wc-orders' === $screen->id ) ) { + wp_add_inline_style( 'wp-admin', '.trcfy-edd-input{width:100%;margin-bottom:8px}' ); } @@ -221,5 +241,5 @@ if ( 'order_status' === $key ) { $new['trcfy_whatsapp'] = 'đŸ’Ŧ'; + esc_attr__( 'WhatsApp', 'traceify-for-woocommerce' ) . '">đŸ’Ŧ'; } } @@ -242,5 +262,5 @@ $wa_number = get_option( 'trcfy_wa_number', '' ); if ( ! $wa_number ) { - echo '—'; + echo '—'; return; } @@ -254,9 +274,9 @@ '📲', esc_url( $wa_link ), - esc_attr__( 'Send WhatsApp to', 'traceify' ), + esc_attr__( 'Send WhatsApp to', 'traceify-for-woocommerce' ), esc_attr( $customer_phone ) ); } else { - echo '—'; + echo '—'; } } @@ -269,5 +289,5 @@ add_meta_box( 'trcfy-whatsapp-box', - __( 'WhatsApp Update', 'traceify' ), + __( 'WhatsApp Update', 'traceify-for-woocommerce' ), array( $this, 'render_order_meta_box' ), $screen, @@ -303,7 +323,7 @@ printf( /* translators: %s = link to settings */ - esc_html__( 'Add your WhatsApp number in %s to enable this feature.', 'traceify' ), + esc_html__( 'Add your WhatsApp number in %s to enable this feature.', 'traceify-for-woocommerce' ), '' . - esc_html__( 'Traceify Settings', 'traceify' ) . + esc_html__( 'Traceify Settings', 'traceify-for-woocommerce' ) . '' ); @@ -311,10 +331,10 @@

-

+

-

+

-

+

- 📲 + 📲

- +

@@ -339,5 +359,5 @@ add_meta_box( 'trcfy-edd-box', - __( 'Estimated Delivery', 'traceify' ), + __( 'Estimated Delivery', 'traceify-for-woocommerce' ), array( $this, 'render_edd_meta_box' ), $screen, @@ -357,14 +377,14 @@ } - $min = esc_attr( $order->get_meta( '_trcfy_edd_min' ) ); - $max = esc_attr( $order->get_meta( '_trcfy_edd_max' ) ); + $min = $order->get_meta( '_trcfy_edd_min' ); + $max = $order->get_meta( '_trcfy_edd_max' ); wp_nonce_field( 'trcfy_edd_override', 'trcfy_edd_override_nonce' ); ?>
-

- -

- -

+

+ +

+ +

get_id(), $order ); - } - } - // ── Plugin action links ─────────────────────────────────────────────── public function add_plugin_action_links( $links ) { $settings_link = '' - . esc_html__( 'Settings', 'traceify' ) . ''; + . esc_html__( 'Settings', 'traceify-for-woocommerce' ) . ''; array_unshift( $links, $settings_link ); return $links; Index: /traceify/trunk/admin/views/settings-page.php =================================================================== --- /traceify/trunk/admin/views/settings-page.php (revision 3758166) +++ /traceify/trunk/admin/views/settings-page.php (revision 3758167) @@ -15,4 +15,5 @@ 'whatsapp' => array( 'label' => 'WhatsApp', 'group' => 'MESSAGING', 'desc' => 'WhatsApp number and message templates.', 'icon' => '' ), 'tracking' => array( 'label' => 'Tracking Page', 'group' => 'TRACKING', 'desc' => 'Configure the customer-facing tracking page.', 'icon' => '' ), + 'shipment' => array( 'label' => 'Shipment Tracking', 'group' => 'TRACKING', 'desc' => 'Courier and tracking number for each order.', 'icon' => '' ), 'delivery' => array( 'label' => 'Estimated Delivery', 'group' => 'TRACKING', 'desc' => 'Auto-calculate delivery date ranges.', 'icon' => '' ), 'emails' => array( 'label' => 'Email Notifications', 'group' => 'NOTIFICATIONS', 'desc' => 'Branded email alerts on order status changes.', 'icon' => '' ), @@ -70,5 +71,5 @@ @@ -80,5 +81,5 @@ @@ -94,10 +95,10 @@
-

-
-
-
- - +

+
+
+
+ +
@@ -108,6 +109,6 @@
- - + +
@@ -126,6 +127,6 @@
- - + +
@@ -143,13 +144,13 @@
-

+

- -
-
-
- - + +
+
+
+ +
@@ -161,6 +162,6 @@
- - + +
@@ -174,10 +175,10 @@
- - + +
+ value="">
@@ -187,18 +188,18 @@
-

+

- - {customer_name}   {order_number}   {order_status}   {order_total}   {store_name}   {tracking_url} + + {customer_name}   {order_number}   {order_status}   {order_total}   {store_name}   {tracking_url}   {tracking_number}   {tracking_link}   {courier_name}
__( 'Pending Payment', 'traceify' ), - 'processing' => __( 'Processing', 'traceify' ), - 'on-hold' => __( 'On Hold', 'traceify' ), - 'shipped' => __( 'Shipped', 'traceify' ), - 'completed' => __( 'Completed / Delivered', 'traceify' ), - 'cancelled' => __( 'Cancelled', 'traceify' ), + 'pending' => __( 'Pending Payment', 'traceify-for-woocommerce' ), + 'processing' => __( 'Processing', 'traceify-for-woocommerce' ), + 'on-hold' => __( 'On Hold', 'traceify-for-woocommerce' ), + 'shipped' => __( 'Shipped', 'traceify-for-woocommerce' ), + 'completed' => __( 'Completed / Delivered', 'traceify-for-woocommerce' ), + 'cancelled' => __( 'Cancelled', 'traceify-for-woocommerce' ), ); foreach ( $trcfy_wa_statuses as $trcfy_s_key => $trcfy_s_label ) : @@ -224,14 +225,14 @@
-

-
-
-
- - +

+
+
+
+ +
> + + +
+
+
+
+ + +
+
+ +
+
+
+
+
+
+

+
+
+ +
+
+
+ +
+
+ +
+
+
+
+ + +
+
+
@@ -271,10 +338,10 @@
-

-
-
-
- - +

+
+
+
+ +
@@ -288,6 +355,6 @@
- - + +
@@ -295,11 +362,11 @@ min="0" max="30" value=""> - -
-
-
-
- - + +
+
+
+
+ +
@@ -307,15 +374,15 @@ min="1" max="60" value=""> - + - -
-
-
-
- - + +
+
+
+
+ +
@@ -335,13 +402,13 @@
-

+

- -
-
-
- - + +
+
+
+ +
@@ -357,9 +424,9 @@ array( 'label' => 'Shipped', 'on' => 'yes', 'note' => __( 'Recommended ON — no WC default.', 'traceify' ) ), - 'processing' => array( 'label' => 'Processing', 'on' => 'no', 'note' => __( 'WC already sends this.', 'traceify' ) ), - 'completed' => array( 'label' => 'Completed', 'on' => 'no', 'note' => __( 'WC already sends this.', 'traceify' ) ), - 'on-hold' => array( 'label' => 'On Hold', 'on' => 'no', 'note' => __( 'WC already sends this.', 'traceify' ) ), - 'cancelled' => array( 'label' => 'Cancelled', 'on' => 'no', 'note' => __( 'WC already sends this.', 'traceify' ) ), + 'shipped' => array( 'label' => 'Shipped', 'on' => 'yes', 'note' => __( 'Recommended ON — no WC default.', 'traceify-for-woocommerce' ) ), + 'processing' => array( 'label' => 'Processing', 'on' => 'no', 'note' => __( 'WC already sends this.', 'traceify-for-woocommerce' ) ), + 'completed' => array( 'label' => 'Completed', 'on' => 'no', 'note' => __( 'WC already sends this.', 'traceify-for-woocommerce' ) ), + 'on-hold' => array( 'label' => 'On Hold', 'on' => 'no', 'note' => __( 'WC already sends this.', 'traceify-for-woocommerce' ) ), + 'cancelled' => array( 'label' => 'Cancelled', 'on' => 'no', 'note' => __( 'WC already sends this.', 'traceify-for-woocommerce' ) ), ); $trcfy_default_subjects = TRCFY_Email_Notifier::default_subjects(); @@ -378,10 +445,10 @@
- +
- +
@@ -396,5 +463,5 @@
- +
Index: /traceify/trunk/assets/css/public.css =================================================================== --- /traceify/trunk/assets/css/public.css (revision 3758166) +++ /traceify/trunk/assets/css/public.css (revision 3758167) @@ -1,3 +1,3 @@ -/* WC Order Tracker — Public Styles */ +/* Traceify — Public Styles */ :root { --trcfy-brand: #7C3AED; @@ -330,2 +330,11 @@ .trcfy-edd-date { font-size: 17px; font-weight: 700; color: var(--trcfy-text); } .trcfy-edd-remaining { font-size: 12px; color: var(--trcfy-brand); font-weight: 500; } + +/* ── Shipment tracking ── */ +.trcfy-ship-card { border-left: 4px solid var(--trcfy-brand); padding: 16px 20px; } +.trcfy-ship-card .trcfy-edd-inner { flex-wrap: wrap; } +.trcfy-ship-number { word-break: break-all; font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; } +.trcfy-ship-btn { margin-left: auto; text-decoration: none; } +@media (max-width: 520px) { + .trcfy-ship-btn { margin-left: 0; width: 100%; text-align: center; justify-content: center; } +} Index: /traceify/trunk/assets/js/public.js =================================================================== --- /traceify/trunk/assets/js/public.js (revision 3758166) +++ /traceify/trunk/assets/js/public.js (revision 3758167) @@ -1,3 +1,3 @@ -/* WC Order Tracker — Frontend JS (vanilla, no dependencies) */ +/* Traceify — Frontend JS (vanilla, no dependencies) */ (function () { 'use strict'; Index: /traceify/trunk/includes/class-trcfy-core.php =================================================================== --- /traceify/trunk/includes/class-trcfy-core.php (revision 3758166) +++ /traceify/trunk/includes/class-trcfy-core.php (revision 3758167) @@ -14,4 +14,6 @@ public function init() { // Init new feature classes (always, not just admin). + TRCFY_Order_Status::init(); + TRCFY_Shipment_Tracking::init(); TRCFY_Delivery_Estimator::init(); TRCFY_Email_Notifier::init(); Index: /traceify/trunk/includes/class-trcfy-delivery-estimator.php =================================================================== --- /traceify/trunk/includes/class-trcfy-delivery-estimator.php (revision 3758166) +++ /traceify/trunk/includes/class-trcfy-delivery-estimator.php (revision 3758167) @@ -156,9 +156,9 @@ if ( $diff > 0 ) { /* translators: %d = number of days */ - $days_remaining = sprintf( _n( '%d day remaining', '%d days remaining', $diff, 'traceify' ), $diff ); + $days_remaining = sprintf( _n( '%d day remaining', '%d days remaining', $diff, 'traceify-for-woocommerce' ), $diff ); } elseif ( 0 === $diff ) { - $days_remaining = __( 'Expected today!', 'traceify' ); + $days_remaining = __( 'Expected today!', 'traceify-for-woocommerce' ); } else { - $days_remaining = __( 'Expected to have arrived', 'traceify' ); + $days_remaining = __( 'Expected to have arrived', 'traceify-for-woocommerce' ); } } @@ -188,13 +188,21 @@ } - if ( isset( $_POST['trcfy_edd_min'] ) ) { - $min = sanitize_text_field( wp_unslash( $_POST['trcfy_edd_min'] ) ); - $order->update_meta_data( '_trcfy_edd_min', $min ); - } - if ( isset( $_POST['trcfy_edd_max'] ) ) { - $max = sanitize_text_field( wp_unslash( $_POST['trcfy_edd_max'] ) ); - $order->update_meta_data( '_trcfy_edd_max', $max ); - } - $order->save(); + // Accept only empty or a valid Y-m-d date; anything else is ignored. + $changed = false; + foreach ( array( 'min', 'max' ) as $bound ) { + $field = 'trcfy_edd_' . $bound; + if ( ! isset( $_POST[ $field ] ) ) { + continue; + } + $value = sanitize_text_field( wp_unslash( $_POST[ $field ] ) ); + if ( '' !== $value && ! preg_match( '/^\d{4}-\d{2}-\d{2}$/', $value ) ) { + continue; + } + $order->update_meta_data( '_trcfy_edd_' . $bound, $value ); + $changed = true; + } + if ( $changed ) { + $order->save(); + } } } Index: /traceify/trunk/includes/class-trcfy-email-notifier.php =================================================================== --- /traceify/trunk/includes/class-trcfy-email-notifier.php (revision 3758166) +++ /traceify/trunk/includes/class-trcfy-email-notifier.php (revision 3758167) @@ -89,13 +89,13 @@ private static function get_subject( WC_Order $order, $status ) { $defaults = array( - 'processing' => __( 'Your order #{order_number} is being processed', 'traceify' ), - 'on-hold' => __( 'Your order #{order_number} is on hold', 'traceify' ), - 'shipped' => __( 'Great news! Your order #{order_number} has been shipped 🚚', 'traceify' ), - 'completed' => __( 'Your order #{order_number} has been delivered ✅', 'traceify' ), - 'cancelled' => __( 'Your order #{order_number} has been cancelled', 'traceify' ), + 'processing' => __( 'Your order #{order_number} is being processed', 'traceify-for-woocommerce' ), + 'on-hold' => __( 'Your order #{order_number} is on hold', 'traceify-for-woocommerce' ), + 'shipped' => __( 'Great news! Your order #{order_number} has been shipped 🚚', 'traceify-for-woocommerce' ), + 'completed' => __( 'Your order #{order_number} has been delivered ✅', 'traceify-for-woocommerce' ), + 'cancelled' => __( 'Your order #{order_number} has been cancelled', 'traceify-for-woocommerce' ), ); $template = get_option( 'trcfy_email_subject_' . $status, - isset( $defaults[ $status ] ) ? $defaults[ $status ] : __( 'Your order has been updated', 'traceify' ) + isset( $defaults[ $status ] ) ? $defaults[ $status ] : __( 'Your order has been updated', 'traceify-for-woocommerce' ) ); return TRCFY_WhatsApp::replace_placeholders( $template, $order ); @@ -135,6 +135,19 @@ $edd = TRCFY_Delivery_Estimator::get_formatted( $order ); if ( $edd ) { - $edd_line = '

📅 ' . esc_html__( 'Estimated Delivery:', 'traceify' ) . ' ' . esc_html( $edd ) . '

'; + $edd_line = '

📅 ' . esc_html__( 'Estimated Delivery:', 'traceify-for-woocommerce' ) . ' ' . esc_html( $edd ) . '

'; } + } + + // Shipment tracking line. + $shipment_line = ''; + $shipment = TRCFY_Shipment_Tracking::get_data( $order ); + if ( $shipment['available'] ) { + $shipment_line = '

🚚 ' + . esc_html( $shipment['courier'] ? $shipment['courier'] : __( 'Tracking number', 'traceify-for-woocommerce' ) ) . ': ' + . esc_html( $shipment['number'] ); + if ( $shipment['url'] ) { + $shipment_line .= '  ' . esc_html__( 'Track shipment', 'traceify-for-woocommerce' ) . ' →'; + } + $shipment_line .= '

'; } @@ -167,9 +180,9 @@ public static function default_subjects() { return array( - 'processing' => __( 'Your order #{order_number} is being processed', 'traceify' ), - 'on-hold' => __( 'Your order #{order_number} is on hold', 'traceify' ), - 'shipped' => __( 'Great news! Your order #{order_number} has been shipped 🚚', 'traceify' ), - 'completed' => __( 'Your order #{order_number} has been delivered ✅', 'traceify' ), - 'cancelled' => __( 'Your order #{order_number} has been cancelled', 'traceify' ), + 'processing' => __( 'Your order #{order_number} is being processed', 'traceify-for-woocommerce' ), + 'on-hold' => __( 'Your order #{order_number} is on hold', 'traceify-for-woocommerce' ), + 'shipped' => __( 'Great news! Your order #{order_number} has been shipped 🚚', 'traceify-for-woocommerce' ), + 'completed' => __( 'Your order #{order_number} has been delivered ✅', 'traceify-for-woocommerce' ), + 'cancelled' => __( 'Your order #{order_number} has been cancelled', 'traceify-for-woocommerce' ), ); } Index: /traceify/trunk/includes/class-trcfy-installer.php =================================================================== --- /traceify/trunk/includes/class-trcfy-installer.php (revision 3758166) +++ /traceify/trunk/includes/class-trcfy-installer.php (revision 3758167) @@ -31,5 +31,5 @@ $page_id = wp_insert_post( array( - 'post_title' => __( 'Track Your Order', 'traceify' ), + 'post_title' => __( 'Track Your Order', 'traceify-for-woocommerce' ), 'post_content' => '[traceify_tracker]', 'post_status' => 'publish', @@ -59,11 +59,11 @@ 'trcfy_wa_number' => '', 'trcfy_wa_show_customer_btn' => 'yes', - 'trcfy_wa_customer_btn_label'=> __( 'Chat with us on WhatsApp', 'traceify' ), - 'trcfy_wa_msg_pending' => __( 'Hi {customer_name}, we received your order #{order_number}. We\'ll start processing it shortly. Thank you for shopping with {store_name}! 🛍ī¸', 'traceify' ), - 'trcfy_wa_msg_processing' => __( 'Hi {customer_name}, great news! Your order #{order_number} is now being processed and will be dispatched soon. — {store_name}', 'traceify' ), - 'trcfy_wa_msg_on-hold' => __( 'Hi {customer_name}, your order #{order_number} is on hold. Please contact us for more details. — {store_name}', 'traceify' ), - 'trcfy_wa_msg_shipped' => __( 'Hi {customer_name}, your order #{order_number} has been shipped and is on its way! 🚚 — {store_name}', 'traceify' ), - 'trcfy_wa_msg_completed' => __( 'Hi {customer_name}, your order #{order_number} has been delivered. We hope you love it! 💜 — {store_name}', 'traceify' ), - 'trcfy_wa_msg_cancelled' => __( 'Hi {customer_name}, your order #{order_number} has been cancelled. Contact us if this was a mistake. — {store_name}', 'traceify' ), + 'trcfy_wa_customer_btn_label'=> __( 'Chat with us on WhatsApp', 'traceify-for-woocommerce' ), + 'trcfy_wa_msg_pending' => __( 'Hi {customer_name}, we received your order #{order_number}. We\'ll start processing it shortly. Thank you for shopping with {store_name}! 🛍ī¸', 'traceify-for-woocommerce' ), + 'trcfy_wa_msg_processing' => __( 'Hi {customer_name}, great news! Your order #{order_number} is now being processed and will be dispatched soon. — {store_name}', 'traceify-for-woocommerce' ), + 'trcfy_wa_msg_on-hold' => __( 'Hi {customer_name}, your order #{order_number} is on hold. Please contact us for more details. — {store_name}', 'traceify-for-woocommerce' ), + 'trcfy_wa_msg_shipped' => __( 'Hi {customer_name}, your order #{order_number} has been shipped and is on its way! 🚚 — {store_name}', 'traceify-for-woocommerce' ), + 'trcfy_wa_msg_completed' => __( 'Hi {customer_name}, your order #{order_number} has been delivered. We hope you love it! 💜 — {store_name}', 'traceify-for-woocommerce' ), + 'trcfy_wa_msg_cancelled' => __( 'Hi {customer_name}, your order #{order_number} has been cancelled. Contact us if this was a mistake. — {store_name}', 'traceify-for-woocommerce' ), // Estimated Delivery Date. 'trcfy_edd_enabled' => 'yes', @@ -72,4 +72,9 @@ 'trcfy_edd_max_ship_days' => '5', 'trcfy_edd_exclude_weekends' => 'yes', + // Shipment tracking. + 'trcfy_shipment_enabled' => 'yes', + 'trcfy_shipment_auto_shipped' => 'no', + 'trcfy_custom_courier_name' => '', + 'trcfy_custom_courier_url' => '', // Email notifications. 'trcfy_email_enabled' => 'yes', Index: /traceify/trunk/includes/class-trcfy-order-status.php =================================================================== --- /traceify/trunk/includes/class-trcfy-order-status.php (revision 3758167) +++ /traceify/trunk/includes/class-trcfy-order-status.php (revision 3758167) @@ -0,0 +1,73 @@ + _x( 'Shipped', 'Order status', 'traceify-for-woocommerce' ), + 'public' => false, + 'exclude_from_search' => false, + 'show_in_admin_all_list' => true, + 'show_in_admin_status_list' => true, + /* translators: %s = number of orders */ + 'label_count' => _n_noop( + 'Shipped (%s)', + 'Shipped (%s)', + 'traceify-for-woocommerce' + ), + ) + ); + } + + /** + * Add "Shipped" to WooCommerce's status list, right after Processing. + * + * @param array $statuses Order statuses keyed by slug. + * @return array + */ + public static function add_to_status_list( $statuses ) { + if ( isset( $statuses['wc-shipped'] ) ) { + return $statuses; + } + + $new = array(); + foreach ( $statuses as $key => $label ) { + $new[ $key ] = $label; + if ( 'wc-processing' === $key ) { + $new['wc-shipped'] = _x( 'Shipped', 'Order status', 'traceify-for-woocommerce' ); + } + } + + // Processing missing for any reason — append instead of losing the status. + if ( ! isset( $new['wc-shipped'] ) ) { + $new['wc-shipped'] = _x( 'Shipped', 'Order status', 'traceify-for-woocommerce' ); + } + return $new; + } +} Index: /traceify/trunk/includes/class-trcfy-order-tracker.php =================================================================== --- /traceify/trunk/includes/class-trcfy-order-tracker.php (revision 3758166) +++ /traceify/trunk/includes/class-trcfy-order-tracker.php (revision 3758167) @@ -55,8 +55,8 @@ $steps = array( - array( 'key' => 'placed', 'label' => __( 'Order Placed', 'traceify' ), 'icon' => '🛍ī¸' ), - array( 'key' => 'processing', 'label' => __( 'Processing', 'traceify' ), 'icon' => '⚙ī¸' ), - array( 'key' => 'shipped', 'label' => __( 'Shipped', 'traceify' ), 'icon' => '🚚' ), - array( 'key' => 'delivered', 'label' => __( 'Delivered', 'traceify' ), 'icon' => '✅' ), + array( 'key' => 'placed', 'label' => __( 'Order Placed', 'traceify-for-woocommerce' ), 'icon' => '🛍ī¸' ), + array( 'key' => 'processing', 'label' => __( 'Processing', 'traceify-for-woocommerce' ), 'icon' => '⚙ī¸' ), + array( 'key' => 'shipped', 'label' => __( 'Shipped', 'traceify-for-woocommerce' ), 'icon' => '🚚' ), + array( 'key' => 'delivered', 'label' => __( 'Delivered', 'traceify-for-woocommerce' ), 'icon' => '✅' ), ); @@ -100,7 +100,7 @@ private static function get_special_status_timeline( $status ) { $labels = array( - 'cancelled' => array( 'label' => __( 'Order Cancelled', 'traceify' ), 'icon' => '❌' ), - 'refunded' => array( 'label' => __( 'Order Refunded', 'traceify' ), 'icon' => '↩ī¸' ), - 'failed' => array( 'label' => __( 'Payment Failed', 'traceify' ), 'icon' => '⚠ī¸' ), + 'cancelled' => array( 'label' => __( 'Order Cancelled', 'traceify-for-woocommerce' ), 'icon' => '❌' ), + 'refunded' => array( 'label' => __( 'Order Refunded', 'traceify-for-woocommerce' ), 'icon' => '↩ī¸' ), + 'failed' => array( 'label' => __( 'Payment Failed', 'traceify-for-woocommerce' ), 'icon' => '⚠ī¸' ), ); $info = $labels[ $status ]; @@ -152,4 +152,5 @@ 'timeline' => self::get_timeline( $order ), 'edd' => TRCFY_Delivery_Estimator::get_data( $order ), + 'shipment' => TRCFY_Shipment_Tracking::get_data( $order ), ); } Index: /traceify/trunk/includes/class-trcfy-shipment-tracking.php =================================================================== --- /traceify/trunk/includes/class-trcfy-shipment-tracking.php (revision 3758167) +++ /traceify/trunk/includes/class-trcfy-shipment-tracking.php (revision 3758167) @@ -0,0 +1,257 @@ + array( 'name' => string, 'url' => string ) + */ + public static function get_couriers() { + $couriers = array( + 'dhl' => array( 'name' => 'DHL', 'url' => 'https://www.dhl.com/en/express/tracking.html?AWB={tracking_number}&brand=DHL' ), + 'fedex' => array( 'name' => 'FedEx', 'url' => 'https://www.fedex.com/apps/fedextrack/?action=track&trackingnumber={tracking_number}' ), + 'ups' => array( 'name' => 'UPS', 'url' => 'https://www.ups.com/track?loc=en_US&tracknum={tracking_number}' ), + 'usps' => array( 'name' => 'USPS', 'url' => 'https://tools.usps.com/go/TrackConfirmAction_input?qtc_tLabels1={tracking_number}' ), + 'steadfast' => array( 'name' => 'Steadfast', 'url' => 'https://steadfast.com.bd/track/consignment' ), + ); + + $custom_name = sanitize_text_field( get_option( 'trcfy_custom_courier_name', '' ) ); + $custom_url = self::sanitize_url_template( get_option( 'trcfy_custom_courier_url', '' ) ); + if ( $custom_name && $custom_url ) { + $couriers['custom'] = array( 'name' => $custom_name, 'url' => $custom_url ); + } + + /** + * Filter the courier list. + * + * @param array $couriers key => array( 'name' => string, 'url' => string ) + */ + $couriers = apply_filters( 'trcfy_couriers', $couriers ); + + $clean = array(); + foreach ( (array) $couriers as $key => $courier ) { + if ( is_array( $courier ) && ! empty( $courier['name'] ) && ! empty( $courier['url'] ) ) { + $clean[ sanitize_key( $key ) ] = array( + 'name' => (string) $courier['name'], + 'url' => (string) $courier['url'], + ); + } + } + return $clean; + } + + /** + * Sanitizer for a URL template. esc_url_raw() would strip the { } characters, + * so only check the scheme and keep the placeholder. + * + * @param string $value + * @return string + */ + public static function sanitize_url_template( $value ) { + $value = trim( sanitize_text_field( (string) $value ) ); + return preg_match( '#^https?://#i', $value ) ? $value : ''; + } + + /** + * Build the tracking URL for a courier + number. + * + * @param string $courier_key + * @param string $number + * @return string Empty string if no valid URL can be built. + */ + public static function build_url( $courier_key, $number ) { + $couriers = self::get_couriers(); + if ( ! isset( $couriers[ $courier_key ] ) ) { + return ''; + } + $url = str_replace( '{tracking_number}', rawurlencode( $number ), $couriers[ $courier_key ]['url'] ); + return esc_url_raw( $url ); + } + + /** + * Shipment data for display (tracking page, email, WhatsApp). + * + * @param WC_Order $order + * @return array available, courier, number, url + */ + public static function get_data( WC_Order $order ) { + $empty = array( 'available' => false, 'courier' => '', 'number' => '', 'url' => '' ); + if ( ! self::is_enabled() ) { + return $empty; + } + + $number = trim( (string) $order->get_meta( self::META_NUMBER ) ); + if ( '' === $number ) { + return $empty; + } + + $key = (string) $order->get_meta( self::META_COURIER ); + $couriers = self::get_couriers(); + + return array( + 'available' => true, + 'courier' => isset( $couriers[ $key ] ) ? $couriers[ $key ]['name'] : '', + 'number' => $number, + 'url' => self::build_url( $key, $number ), + ); + } + + // ── Order edit screen ───────────────────────────────────────────────── + + public static function add_meta_box() { + foreach ( array( 'shop_order', 'woocommerce_page_wc-orders' ) as $screen ) { + add_meta_box( + 'trcfy-shipment-box', + __( 'Shipment Tracking', 'traceify-for-woocommerce' ), + array( __CLASS__, 'render_meta_box' ), + $screen, + 'side', + 'default' + ); + } + } + + public static function render_meta_box( $post_or_order ) { + $order = ( $post_or_order instanceof WC_Order ) + ? $post_or_order + : wc_get_order( absint( $post_or_order->ID ) ); + if ( ! $order ) { + return; + } + + $saved_courier = (string) $order->get_meta( self::META_COURIER ); + $data = self::get_data( $order ); + wp_nonce_field( 'trcfy_shipment', 'trcfy_shipment_nonce' ); + ?> +
+

+ +

+ + +

+ + + +

+ +

+
+ get_meta( self::META_NUMBER ) ); + + $order->update_meta_data( self::META_COURIER, $courier ); + $order->update_meta_data( self::META_NUMBER, $number ); + $order->save(); + + if ( '' === $previous && '' !== $number ) { + self::$just_added[ $order->get_id() ] = true; + } + } + + /** + * Optional: move a Processing order to Shipped when a tracking number is first added. + * + * @param int $order_id + * @param WP_Post|WC_Order $post_or_order + */ + public static function maybe_mark_shipped( $order_id, $post_or_order = null ) { + $order_id = absint( $order_id ); + if ( empty( self::$just_added[ $order_id ] ) ) { + return; + } + unset( self::$just_added[ $order_id ] ); + + if ( 'yes' !== get_option( 'trcfy_shipment_auto_shipped', 'no' ) ) { + return; + } + if ( ! isset( wc_get_order_statuses()['wc-shipped'] ) ) { + return; + } + + $order = wc_get_order( $order_id ); + if ( $order && 'processing' === $order->get_status() ) { + $order->update_status( 'shipped', __( 'Tracking number added — order marked as shipped by Traceify.', 'traceify-for-woocommerce' ) ); + } + } +} Index: /traceify/trunk/includes/class-trcfy-whatsapp.php =================================================================== --- /traceify/trunk/includes/class-trcfy-whatsapp.php (revision 3758166) +++ /traceify/trunk/includes/class-trcfy-whatsapp.php (revision 3758167) @@ -78,9 +78,9 @@ $message = sprintf( /* translators: %s = order number */ - __( 'Hi, I have a question about my order #%s', 'traceify' ), + __( 'Hi, I have a question about my order #%s', 'traceify-for-woocommerce' ), $order->get_order_number() ); } else { - $message = __( 'Hi, I need help with my order.', 'traceify' ); + $message = __( 'Hi, I need help with my order.', 'traceify-for-woocommerce' ); } @@ -93,4 +93,5 @@ * Supported tags: {customer_name} {order_number} {order_status} * {order_total} {store_name} {tracking_url} + * {tracking_number} {tracking_link} {courier_name} * * @param string $template @@ -102,5 +103,10 @@ $tracking_url = $tracking_page_id ? get_permalink( $tracking_page_id ) : site_url(); + $shipment = TRCFY_Shipment_Tracking::get_data( $order ); + $search = array( + '{tracking_number}', + '{tracking_link}', + '{courier_name}', '{customer_name}', '{order_number}', @@ -111,4 +117,7 @@ ); $replace = array( + sanitize_text_field( $shipment['number'] ), + $shipment['url'], + sanitize_text_field( $shipment['courier'] ), sanitize_text_field( $order->get_billing_first_name() ), sanitize_text_field( $order->get_order_number() ), Index: /traceify/trunk/public/class-trcfy-public.php =================================================================== --- /traceify/trunk/public/class-trcfy-public.php (revision 3758166) +++ /traceify/trunk/public/class-trcfy-public.php (revision 3758167) @@ -23,5 +23,5 @@ // Only load on the tracking page (or wherever the shortcode is used). - if ( ! is_page( $tracking_page_id ) && ! $this->current_page_has_shortcode() ) { + if ( ! ( $tracking_page_id && is_page( $tracking_page_id ) ) && ! $this->current_page_has_shortcode() ) { return; } @@ -70,18 +70,19 @@ $submitted = false; - // Process form submission (GET method, WooCommerce-style). - if ( isset( $_GET['trcfy_order_id'], $_GET['trcfy_billing_email'], $_GET['trcfy_nonce'] ) ) { + // Process lookup (GET, WooCommerce-style). This is a read-only lookup that + // requires order number + matching billing email, so no nonce is used — + // a nonce here would break on cached pages and adds no protection. + // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- read-only lookup, verified by order number + billing email. + if ( isset( $_GET['trcfy_order_id'], $_GET['trcfy_billing_email'] ) ) { $submitted = true; - if ( ! wp_verify_nonce( sanitize_text_field( wp_unslash( $_GET['trcfy_nonce'] ) ), 'trcfy_track_order' ) ) { - $error = __( 'Security check failed. Please try again.', 'traceify' ); - } else { - $order_id = sanitize_text_field( wp_unslash( $_GET['trcfy_order_id'] ) ); - $email = sanitize_email( wp_unslash( $_GET['trcfy_billing_email'] ) ); - $order = TRCFY_Order_Tracker::get_order( $order_id, $email ); + // phpcs:ignore WordPress.Security.NonceVerification.Recommended + $order_id = sanitize_text_field( wp_unslash( $_GET['trcfy_order_id'] ) ); + // phpcs:ignore WordPress.Security.NonceVerification.Recommended + $email = sanitize_email( wp_unslash( $_GET['trcfy_billing_email'] ) ); + $order = TRCFY_Order_Tracker::get_order( $order_id, $email ); - if ( ! $order ) { - $error = __( 'No order found. Please check your order number and billing email and try again.', 'traceify' ); - } + if ( ! $order ) { + $error = __( 'No order found. Please check your order number and billing email and try again.', 'traceify-for-woocommerce' ); } } @@ -92,10 +93,9 @@ 'error' => $error, 'submitted' => $submitted, - 'nonce' => wp_create_nonce( 'trcfy_track_order' ), 'logo_url' => esc_url( get_option( 'trcfy_brand_logo_url', '' ) ), 'store_name' => esc_html( get_option( 'trcfy_store_name', get_bloginfo( 'name' ) ) ), 'wa_number' => get_option( 'trcfy_wa_number', '' ), 'show_wa_btn'=> 'yes' === get_option( 'trcfy_wa_show_customer_btn', 'yes' ), - 'wa_btn_label'=> esc_html( get_option( 'trcfy_wa_customer_btn_label', __( 'Chat with us on WhatsApp', 'traceify' ) ) ), + 'wa_btn_label'=> esc_html( get_option( 'trcfy_wa_customer_btn_label', __( 'Chat with us on WhatsApp', 'traceify-for-woocommerce' ) ) ), ); Index: /traceify/trunk/public/views/tracking-page.php =================================================================== --- /traceify/trunk/public/views/tracking-page.php (revision 3758166) +++ /traceify/trunk/public/views/tracking-page.php (revision 3758167) @@ -6,6 +6,5 @@ * Receives $data array from TRCFY_Public::render_shortcode(). * All dynamic values are already sanitized — escape on output only. - * Nonce verification for the tracking form is handled in render_shortcode() - * before this template is loaded; $_GET access here is read-only prefill. + * $_GET access here is read-only prefill of the lookup form. */ if ( ! defined( 'ABSPATH' ) ) { exit; } @@ -21,5 +20,5 @@

- +

@@ -36,17 +35,16 @@

- +

-
@@ -56,5 +54,5 @@ class="trcfy-input" inputmode="numeric" - placeholder="" + placeholder="" value="" required @@ -64,9 +62,9 @@
@@ -75,5 +73,5 @@ name="trcfy_billing_email" class="trcfy-input" - placeholder="" + placeholder="" value="" required @@ -83,5 +81,5 @@ @@ -100,13 +98,13 @@
- + #
- +
- + @@ -162,5 +160,5 @@
- + @@ -172,7 +170,39 @@ + + +
+
+ +
+ + + + +
+ + + ↗ + + +
+
+ +
-

+

@@ -191,5 +221,5 @@ printf( /* translators: %d = quantity */ - esc_html__( 'Qty: %d', 'traceify' ), + esc_html__( 'Qty: %d', 'traceify-for-woocommerce' ), absint( $trcfy_item['qty'] ) ); @@ -204,10 +234,10 @@
- +
- +
@@ -218,5 +248,5 @@
-

+

@@ -231,5 +261,5 @@
-

+

@@ -251,7 +281,7 @@
- - ← + ←
Index: /traceify/trunk/readme.txt =================================================================== --- /traceify/trunk/readme.txt (revision 3758166) +++ /traceify/trunk/readme.txt (revision 3758167) @@ -1,17 +1,20 @@ === Traceify – Order Tracking for WooCommerce === Contributors: webtendhq,devhasib -Tags: woocommerce, order tracking, whatsapp, estimated delivery, order status +Tags: woocommerce, order tracking, shipment tracking, whatsapp, estimated delivery Requires at least: 6.0 Tested up to: 7.1 Requires PHP: 7.4 -Stable tag: 1.0.0 +Stable tag: 1.0.1 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html -Branded order tracking page for WooCommerce with WhatsApp updates, estimated delivery dates, and email notifications — no API or monthly fee. +Branded order tracking for WooCommerce with courier links, WhatsApp updates, delivery dates and email alerts — no API or monthly fee. == Description == **Traceify** gives your WooCommerce store a professional, branded order-tracking experience — and the tools to proactively keep customers updated via WhatsApp and email. + +📖 **[Documentation](https://webtend.net/docs/traceify-doc.html)** + = Customer-Facing Features = @@ -20,4 +23,5 @@ * **Visual progress timeline** — Order Placed → Processing → Shipped → Delivered * **Estimated Delivery Date** — auto-calculated date range shown prominently on the tracking page +* **Shipment tracking** — courier name, tracking number and a "Track shipment" button that opens the courier's site * **Order summary** — items with images, quantities, totals, and shipping address * **Customer order notes** — shows notes you have added to the order @@ -28,8 +32,13 @@ * **WhatsApp column** on the WooCommerce orders list — one click to send a status update to any customer * **WhatsApp meta box** on every order detail page — preview the message then send +* **Shipment Tracking meta box** — pick a courier and enter the tracking number on any order * **Estimated Delivery Date meta box** — manually override the auto-calculated delivery date per order * **Branded HTML email notifications** — send beautiful order-status emails on status change * **Per-status message templates** for both WhatsApp and email -* **Template placeholders**: `{customer_name}` `{order_number}` `{order_status}` `{order_total}` `{store_name}` `{tracking_url}` +* **Template placeholders**: `{customer_name}` `{order_number}` `{order_status}` `{order_total}` `{store_name}` `{tracking_url}` `{tracking_number}` `{tracking_link}` `{courier_name}` + += Shipment Tracking = + +Add a courier and tracking number to any order. Built-in couriers: DHL, FedEx, UPS, USPS and Steadfast. Add your own courier (for example Pathao or RedX) under Traceify → Shipment Tracking with a URL such as `https://example.com/track?id={tracking_number}`. The tracking number and link appear on the customer's tracking page, in Traceify emails and in WhatsApp messages. Optionally mark the order as Shipped automatically when a tracking number is first added. = Estimated Delivery Date = @@ -50,4 +59,5 @@ * **WhatsApp** — business number, show/hide customer contact button, per-status message templates * **Tracking Page** — page assignment, shortcode reference +* **Shipment Tracking** — enable/disable, auto-mark as Shipped, custom courier name and tracking URL * **Delivery EDD** — processing days, min/max shipping days, weekend exclusion toggle * **Email Notifications** — master toggle, per-status on/off, custom subject lines @@ -86,7 +96,15 @@ No. By default, only the "Shipped" status email is enabled — WooCommerce has no built-in email for that status. Processing, Completed, Cancelled, and On Hold emails are off by default. += Can I add a courier that is not in the list? = + +Yes. Go to Traceify → Shipment Tracking → Custom Courier and enter a name and a tracking URL containing `{tracking_number}`. Developers can also use the `trcfy_couriers` filter. + += Where does the "Shipped" status come from? = + +WooCommerce has no Shipped status. Traceify registers one (`wc-shipped`) only if no other plugin has already done so. + = Is customer data secure? = -Yes. Order lookup requires both the order number and the billing email address, preventing order enumeration. All inputs are sanitized, all outputs are escaped, and forms are nonce-protected. +Yes. Order lookup requires both the order number and the billing email address, preventing order enumeration. All inputs are sanitized and all outputs are escaped. Admin settings and order actions are capability-checked and nonce-protected. == Screenshots == @@ -104,4 +122,14 @@ == Changelog == += 1.0.1 = +* New: Shipment tracking — courier + tracking number per order with a "Track shipment" link. +* New: Built-in couriers (DHL, FedEx, UPS, USPS, Steadfast) plus a custom courier with your own tracking URL. +* New: Tracking details on the customer tracking page and in branded emails. +* New: WhatsApp placeholders `{tracking_number}`, `{tracking_link}` and `{courier_name}`. +* New: Optional "Auto-mark as Shipped" when a tracking number is first added. +* New: `trcfy_couriers` filter to add or change couriers in code. + + + = 1.0.0 — 2026-09-05 = * Initial release. @@ -116,4 +144,8 @@ == Upgrade Notice == += 1.0.1 = +Adds shipment tracking (courier + tracking number). Review Traceify → Shipment Tracking after updating. + + = 1.0.0 = Initial release. Index: /traceify/trunk/templates/email-notification.php =================================================================== --- /traceify/trunk/templates/email-notification.php (revision 3758166) +++ /traceify/trunk/templates/email-notification.php (revision 3758167) @@ -48,5 +48,5 @@ printf( /* translators: %s = order number */ - esc_html__( 'Order #%s Update', 'traceify' ), + esc_html__( 'Order #%s Update', 'traceify-for-woocommerce' ), esc_html( $order->get_order_number() ) ); @@ -57,5 +57,5 @@ printf( /* translators: %s = customer first name */ - esc_html__( 'Hi %s, here\'s the latest on your order.', 'traceify' ), + esc_html__( 'Hi %s, here\'s the latest on your order.', 'traceify-for-woocommerce' ), esc_html( $order->get_billing_first_name() ) ); @@ -85,16 +85,25 @@ + + + + + + + + +

- +

- - - + + + @@ -104,5 +113,5 @@ - + @@ -118,5 +127,5 @@ - + @@ -131,5 +140,5 @@ printf( /* translators: %s = store name */ - esc_html__( 'You received this email because you placed an order at %s.', 'traceify' ), + esc_html__( 'You received this email because you placed an order at %s.', 'traceify-for-woocommerce' ), esc_html( $store_name ) ); Index: /traceify/trunk/traceify-for-woocommerce.php =================================================================== --- /traceify/trunk/traceify-for-woocommerce.php (revision 3758166) +++ /traceify/trunk/traceify-for-woocommerce.php (revision 3758167) @@ -3,14 +3,14 @@ * Plugin Name: Traceify – Order Tracking for WooCommerce * Plugin URI: https://webtend.net/ - * Description: Replace WooCommerce's plain order tracking with a beautiful branded page. Send one-click WhatsApp status updates to customers — no API or monthly fee needed. - * Version: 1.0.0 + * Description: Branded order tracking and shipment tracking for WooCommerce. Add courier tracking numbers and send one-click WhatsApp status updates — no API or monthly fee needed. + * Version: 1.0.1 * Requires at least: 6.0 * Requires PHP: 7.4 + * Requires Plugins: woocommerce * Author: WebTend * Author URI: https://webtend.net/ * License: GPL v2 or later * License URI: https://www.gnu.org/licenses/gpl-2.0.html - * Text Domain: traceify - * Domain Path: /languages + * Text Domain: traceify-for-woocommerce * WC requires at least: 7.0 * WC tested up to: 9.9 @@ -26,5 +26,5 @@ // ── Constants ────────────────────────────────────────────────────────────── -define( 'TRCFY_VERSION', '1.0.0' ); +define( 'TRCFY_VERSION', '1.0.1' ); define( 'TRCFY_PATH', plugin_dir_path( __FILE__ ) ); define( 'TRCFY_URL', plugin_dir_url( __FILE__ ) ); @@ -42,5 +42,5 @@ function trcfy_woocommerce_missing_notice() { echo '

' . - esc_html__( 'WC Order Tracker requires WooCommerce to be installed and activated.', 'traceify' ) . + esc_html__( 'Traceify requires WooCommerce to be installed and activated.', 'traceify-for-woocommerce' ) . '

'; } @@ -48,6 +48,7 @@ function trcfy_check_woocommerce() { if ( ! class_exists( 'WooCommerce' ) ) { + // Only show a notice. deactivate_plugins() is not loaded on the front end + // and would cause a fatal error there. add_action( 'admin_notices', 'trcfy_woocommerce_missing_notice' ); - deactivate_plugins( TRCFY_BASENAME ); return false; } @@ -60,6 +61,6 @@ deactivate_plugins( TRCFY_BASENAME ); wp_die( - esc_html__( 'WC Order Tracker requires WooCommerce. Please install WooCommerce first.', 'traceify' ), - esc_html__( 'Plugin Activation Error', 'traceify' ), + esc_html__( 'Traceify requires WooCommerce. Please install WooCommerce first.', 'traceify-for-woocommerce' ), + esc_html__( 'Plugin Activation Error', 'traceify-for-woocommerce' ), array( 'back_link' => true ) ); @@ -83,4 +84,6 @@ require_once TRCFY_PATH . 'includes/class-trcfy-installer.php'; require_once TRCFY_PATH . 'includes/class-trcfy-order-tracker.php'; + require_once TRCFY_PATH . 'includes/class-trcfy-order-status.php'; + require_once TRCFY_PATH . 'includes/class-trcfy-shipment-tracking.php'; require_once TRCFY_PATH . 'includes/class-trcfy-whatsapp.php'; require_once TRCFY_PATH . 'includes/class-trcfy-delivery-estimator.php';
get_formatted_order_total() ); ?>