ShipStation tracking pull, status tracking, dashboard rework

app/ui/main_window.py

@@ -5,10 +5,10 @@ Deliberately thin: it wires the toolbar, tabs, and dialogs together,
 and delegates real work to app.services (fetching), app.workers
 (saving/loading/stats), and app.services.odoo_export (file export).
 
-JIRA and ShipStation are pulled independently (separate buttons,
-separate workers) per how the business actually operates - they are
-correlated afterwards for the dashboard via ticket_number, not forced
-into one pipeline.
+JIRA import creates/updates ticket rows. "Pull Tracking Numbers"
+(ShipStation) doesn't create anything of its own - it merges tracking
+numbers onto the matching JIRA row by ticket number, since ShipStation
+here is purely a label-generation step for JIRA tickets.
 """
 from __future__ import annotations
 
@@ -25,8 +25,10 @@ from PyQt6.QtWidgets import (
     QFileDialog,
 )
 
+from app import config
 from app.services import SERVICE_REGISTRY
 from app.services.odoo_export import export_orders_to_csv
+from app.status_rules import parse_status_list, find_new_cancellations
 from app.ui.settings_dialog import SettingsDialog
 from app.ui.widgets.orders_table import OrdersTableView
 from app.ui.widgets.dashboard import DashboardWidget
@@ -71,7 +73,7 @@ class MainWindow(QMainWindow):
         toolbar.addAction(jira_action)
         self._import_actions["jira"] = jira_action
 
-        shipstation_action = QAction("Import from ShipStation", self)
+        shipstation_action = QAction("Pull Tracking Numbers (ShipStation)", self)
         shipstation_action.triggered.connect(lambda: self._on_import_clicked("shipstation"))
         toolbar.addAction(shipstation_action)
         self._import_actions["shipstation"] = shipstation_action
@@ -121,25 +123,71 @@ class MainWindow(QMainWindow):
 
         action = self._import_actions[service_name]
         action.setEnabled(False)
-        self.status_label.setText(f"Importing orders from {service_name.title()}...")
+        if service_name == "jira":
+            self.status_label.setText("Importing orders from JIRA...")
+        else:
+            self.status_label.setText("Pulling tracking numbers from ShipStation...")
 
         worker = FetchOrdersWorker(service)
         worker.finished_ok.connect(
-            lambda new_count, updated_count: self._on_import_finished(
-                service_name, new_count, updated_count
-            )
+            lambda result: self._on_import_finished(service_name, result)
         )
         worker.failed.connect(lambda message: self._on_import_failed(service_name, message))
         self._workers[service_name] = worker  # keep a reference so it isn't garbage collected
         worker.start()
 
-    def _on_import_finished(self, service_name: str, new_count: int, updated_count: int) -> None:
+    def _on_import_finished(self, service_name: str, result: dict) -> None:
         self._import_actions[service_name].setEnabled(True)
-        self.status_label.setText(
-            f"{service_name.title()} import complete: {new_count} new, {updated_count} updated."
-        )
         self._refresh_everything()
 
+        if service_name == "jira":
+            self.status_label.setText(
+                f"JIRA import complete: {result['new_count']} new, "
+                f"{result['updated_count']} updated."
+            )
+            self._notify_new_cancellations(result["status_changes"])
+        else:
+            self.status_label.setText(
+                f"Tracking pull complete: {result['enriched_count']} ticket(s) updated with "
+                f"tracking numbers."
+            )
+            self._notify_unmatched_tracking(result["unmatched_tracking_tickets"])
+
+    def _notify_unmatched_tracking(self, unmatched_tickets: list) -> None:
+        if not unmatched_tickets:
+            return
+        lines = unmatched_tickets[:15]
+        if len(unmatched_tickets) > 15:
+            lines.append(f"...and {len(unmatched_tickets) - 15} more")
+        QMessageBox.information(
+            self,
+            "Some tracking numbers didn't match a known ticket",
+            "ShipStation had tracking numbers for these ticket numbers, but no matching "
+            "JIRA ticket was found locally (maybe it hasn't been imported yet):\n\n"
+            + "\n".join(lines),
+        )
+
+    def _notify_new_cancellations(self, status_changes: list) -> None:
+        cancelled_statuses = parse_status_list(
+            config.get("CANCELLED_STATUSES", config.DEFAULT_CANCELLED_STATUSES)
+        )
+        newly_cancelled = find_new_cancellations(status_changes, cancelled_statuses)
+        if not newly_cancelled:
+            return
+
+        lines = [
+            f"{c['ticket_number']}: {c['old_status']} -> {c['new_status']}"
+            for c in newly_cancelled[:15]
+        ]
+        if len(newly_cancelled) > 15:
+            lines.append(f"...and {len(newly_cancelled) - 15} more")
+
+        QMessageBox.warning(
+            self,
+            "Ticket(s) cancelled",
+            f"{len(newly_cancelled)} ticket(s) were just cancelled:\n\n" + "\n".join(lines),
+        )
+
     def _on_import_failed(self, service_name: str, message: str) -> None:
         self._import_actions[service_name].setEnabled(True)
         self.status_label.setText(f"{service_name.title()} import failed.")
@@ -181,10 +229,10 @@ class MainWindow(QMainWindow):
 # - Odoo push API (once ready): add app/services/odoo_service.py with a
 #   push_orders(orders) method, wire a new toolbar action similarly to
 #   _on_import_clicked, and it can eventually replace/augment odoo_export.py.
-# - Order detail view: connect a table double-click to a dialog showing
-#   selected_order().raw_data (full JIRA/ShipStation payload) for debugging
-#   ticket-number/SKU extraction as real data comes in.
-# - Pipeline actions ("mark fulfilled", "create ShipStation label"): add
+# - Emailed-label SKU: these tickets won't get tracking numbers pulled via
+#   the normal ShipStation flow - once its handling is defined, it likely
+#   needs its own terminal status and its own "mark as sent" action here.
+# - Pipeline actions ("mark fulfilled manually", "void a label"): add
 #   toolbar actions gated on table selection.
 # - If the window grows too much, split each tab's toolbar into its own
 #   QToolBar shown only while that tab is active.