Fix task acceptance incorrectly marking orders as delivered
When accepting a task, the order status was being set to 4 (Delivery in progress), which caused the order to disappear from KDS and broke auto-complete functionality. The correct flow is: - Order at status 3 (Ready) → Worker accepts task → Order stays at 3 - Worker completes task → Order moves to status 5 (Delivered) Removed the order status update from accept.cfm so orders remain visible in KDS until the delivery task is actually completed. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
parent
ef6efa0762
commit
3384f128e1
2 changed files with 58 additions and 10 deletions
55
api/debug/checkTask.cfm
Normal file
55
api/debug/checkTask.cfm
Normal file
|
|
@ -0,0 +1,55 @@
|
||||||
|
<cfsetting showdebugoutput="false">
|
||||||
|
<cfsetting enablecfoutputonly="true">
|
||||||
|
|
||||||
|
<cffunction name="apiAbort" access="public" returntype="void" output="true">
|
||||||
|
<cfargument name="payload" type="struct" required="true">
|
||||||
|
<cfcontent type="application/json; charset=utf-8">
|
||||||
|
<cfoutput>#serializeJSON(arguments.payload)#</cfoutput>
|
||||||
|
<cfabort>
|
||||||
|
</cffunction>
|
||||||
|
|
||||||
|
<cfset TaskID = val(url.TaskID ?: 0)>
|
||||||
|
|
||||||
|
<cfif TaskID LTE 0>
|
||||||
|
<cfset apiAbort({ "OK": false, "ERROR": "missing_params", "MESSAGE": "TaskID required in URL" })>
|
||||||
|
</cfif>
|
||||||
|
|
||||||
|
<cftry>
|
||||||
|
<cfset qTask = queryExecute("
|
||||||
|
SELECT TaskID, TaskBusinessID, TaskCategoryID, TaskOrderID, TaskTypeID,
|
||||||
|
TaskClaimedByUserID, TaskClaimedOn, TaskCompletedOn,
|
||||||
|
TaskAddedOn, TaskSourceType, TaskSourceID
|
||||||
|
FROM Tasks
|
||||||
|
WHERE TaskID = ?
|
||||||
|
", [ { value = TaskID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
|
||||||
|
|
||||||
|
<cfif qTask.recordCount EQ 0>
|
||||||
|
<cfset apiAbort({ "OK": false, "ERROR": "not_found", "MESSAGE": "Task not found" })>
|
||||||
|
</cfif>
|
||||||
|
|
||||||
|
<cfset apiAbort({
|
||||||
|
"OK": true,
|
||||||
|
"TASK": {
|
||||||
|
"TaskID": qTask.TaskID,
|
||||||
|
"TaskBusinessID": qTask.TaskBusinessID,
|
||||||
|
"TaskCategoryID": qTask.TaskCategoryID,
|
||||||
|
"TaskOrderID": qTask.TaskOrderID,
|
||||||
|
"TaskTypeID": qTask.TaskTypeID,
|
||||||
|
"TaskClaimedByUserID": qTask.TaskClaimedByUserID,
|
||||||
|
"TaskClaimedOn": qTask.TaskClaimedOn,
|
||||||
|
"TaskCompletedOn": qTask.TaskCompletedOn,
|
||||||
|
"TaskAddedOn": qTask.TaskAddedOn,
|
||||||
|
"TaskSourceType": qTask.TaskSourceType,
|
||||||
|
"TaskSourceID": qTask.TaskSourceID,
|
||||||
|
"IS_COMPLETED": NOT (isNull(qTask.TaskCompletedOn) OR len(trim(qTask.TaskCompletedOn)) EQ 0)
|
||||||
|
}
|
||||||
|
})>
|
||||||
|
|
||||||
|
<cfcatch>
|
||||||
|
<cfset apiAbort({
|
||||||
|
"OK": false,
|
||||||
|
"ERROR": "server_error",
|
||||||
|
"MESSAGE": cfcatch.message
|
||||||
|
})>
|
||||||
|
</cfcatch>
|
||||||
|
</cftry>
|
||||||
|
|
@ -62,16 +62,9 @@
|
||||||
{ value = TaskID, cfsqltype = "cf_sql_integer" }
|
{ value = TaskID, cfsqltype = "cf_sql_integer" }
|
||||||
], { datasource = "payfrit" })>
|
], { datasource = "payfrit" })>
|
||||||
|
|
||||||
<!--- If task has an associated order, update order status to 4 (Claimed) --->
|
<!--- NOTE: Do NOT update order status when accepting/claiming task --->
|
||||||
<cfif val(qTask.TaskOrderID) GT 0>
|
<!--- Order should remain at status 3 (Order complete, final prep) until task is completed --->
|
||||||
<cfset queryExecute("
|
<!--- When task is completed, order status will be updated to 5 (Delivered) --->
|
||||||
UPDATE Orders
|
|
||||||
SET OrderStatusID = 4,
|
|
||||||
OrderLastEditedOn = NOW()
|
|
||||||
WHERE OrderID = ?
|
|
||||||
AND OrderStatusID = 3
|
|
||||||
", [ { value = qTask.TaskOrderID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
|
|
||||||
</cfif>
|
|
||||||
|
|
||||||
<cfset apiAbort({
|
<cfset apiAbort({
|
||||||
"OK": true,
|
"OK": true,
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue