From 01cb11dad373050bbfcda6a3714ff2442ef10eb7 Mon Sep 17 00:00:00 2001
From: John Mizerek <mizerek@gmail.com>
Date: Mon, 16 Feb 2026 18:22:14 -0800
Subject: [PATCH] fix: Cash task completion now triggers kitchen flow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When a cash task is completed, the order now goes to status 1 (submitted)
instead of directly to status 5 (complete). This allows the normal kitchen
flow to proceed: kitchen sees order → prepares → marks status 3 → delivery
task is auto-created.

Also sets PaymentStatus, PaymentCompletedOn, and SubmittedOn to match the
Stripe webhook behavior for paid orders.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 api/tasks/complete.cfm | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/api/tasks/complete.cfm b/api/tasks/complete.cfm
index 9a724b2..a13d1ac 100644
--- a/api/tasks/complete.cfm
+++ b/api/tasks/complete.cfm
@@ -187,15 +187,30 @@
     WHERE ID = ?
   ", [ { value = TaskID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
 
-  <!--- If task has an associated order, mark it as Delivered/Complete (status 5) --->
+  <!--- Update order status based on task type --->
   <cfset orderUpdated = false>
   <cfif qTask.OrderID GT 0>
-    <cfset queryTimed("
-      UPDATE Orders
-      SET StatusID = 5,
-          LastEditedOn = NOW()
-      WHERE ID = ?
-    ", [ { value = qTask.OrderID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
+    <cfif isCashTask>
+      <!--- Cash task: Set to status 1 (Submitted/Paid) to trigger kitchen flow --->
+      <!--- Kitchen will then move to 2, then 3 (which creates delivery task) --->
+      <cfset queryTimed("
+        UPDATE Orders
+        SET StatusID = CASE WHEN StatusID = 0 THEN 1 ELSE StatusID END,
+            PaymentStatus = 'paid',
+            PaymentCompletedOn = NOW(),
+            SubmittedOn = CASE WHEN SubmittedOn IS NULL THEN NOW() ELSE SubmittedOn END,
+            LastEditedOn = NOW()
+        WHERE ID = ?
+      ", [ { value = qTask.OrderID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
+    <cfelse>
+      <!--- Regular task (delivery, pickup, etc.): Mark order as Delivered/Complete (status 5) --->
+      <cfset queryTimed("
+        UPDATE Orders
+        SET StatusID = 5,
+            LastEditedOn = NOW()
+        WHERE ID = ?
+      ", [ { value = qTask.OrderID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
+    </cfif>
     <cfset orderUpdated = true>
   </cfif>