From fc310c35cf31296e35f3b5dba6e587cefb9ce76f Mon Sep 17 00:00:00 2001
From: John Mizerek <mizerek@gmail.com>
Date: Tue, 17 Feb 2026 11:11:37 -0800
Subject: [PATCH] Fix cancel task to not cancel order, standardize OTP messages

- Cancel Task now leaves order untouched (customer can pay another way)
- Standardized SMS text to "Your Payfrit code is:" across all endpoints

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 api/auth/loginOTP.cfm     |  2 +-
 api/auth/sendLoginOTP.cfm |  2 +-
 api/tasks/complete.cfm    | 11 ++---------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/api/auth/loginOTP.cfm b/api/auth/loginOTP.cfm
index 94ded05..0ddf529 100644
--- a/api/auth/loginOTP.cfm
+++ b/api/auth/loginOTP.cfm
@@ -99,7 +99,7 @@ try {
         try {
             smsResult = application.twilioObj.sendSMS(
                 recipientNumber: "+1" & phone,
-                messageBody: "Your Payfrit login code is: " & otp
+                messageBody: "Your Payfrit code is: " & otp
             );
             smsMessage = smsResult.success ? "Login code sent" : "SMS failed - please try again";
         } catch (any smsErr) {
diff --git a/api/auth/sendLoginOTP.cfm b/api/auth/sendLoginOTP.cfm
index bcb3fc3..15db679 100644
--- a/api/auth/sendLoginOTP.cfm
+++ b/api/auth/sendLoginOTP.cfm
@@ -136,7 +136,7 @@ try {
       // Send via SMS
       try {
         if (structKeyExists(application, "twilioObj")) {
-          smsMessage = "Your Payfrit login code is: " & code & ". It expires in 10 minutes.";
+          smsMessage = "Your Payfrit code is: " & code;
           application.twilioObj.sendSMS(to=qUser.ContactNumber, message=smsMessage);
         }
       } catch (any smsErr) {
diff --git a/api/tasks/complete.cfm b/api/tasks/complete.cfm
index 7a7fc61..c18e4ea 100644
--- a/api/tasks/complete.cfm
+++ b/api/tasks/complete.cfm
@@ -194,15 +194,8 @@
   <cfset orderUpdated = false>
   <cfif qTask.OrderID GT 0>
     <cfif CancelOrder>
-      <!--- Cancel order: Set status to 6 (Cancelled), no financial processing --->
-      <cfset queryTimed("
-        UPDATE Orders
-        SET StatusID = 6,
-            PaymentStatus = 'cancelled',
-            LastEditedOn = NOW()
-        WHERE ID = ?
-      ", [ { value = qTask.OrderID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
-      <cfset orderCancelled = true>
+      <!--- Cancel task only: leave order untouched so customer can pay another way --->
+      <cfset orderCancelled = false>
     <cfelseif 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) --->