Task System: - Tasks auto-created when KDS marks order Ready (status 3) - Duplicate task prevention via TaskOrderID check - Task completion now marks associated order as Completed (status 4) - Fixed isNull() check for TaskCompletedOn (use len() instead) - Added TaskOrderID to task queries for order linking Worker APIs: - api/workers/myBusinesses.cfm with GROUP BY to prevent duplicates - api/tasks/listMine.cfm for worker's claimed tasks with filters - api/tasks/complete.cfm updates both task and order status - api/tasks/accept.cfm for claiming tasks KDS/Portal: - KDS only shows orders with status < 4 - Portal dashboard improvements Admin/Debug: - Debug endpoints for tasks and businesses - Test data reset endpoint 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
81 lines
2.4 KiB
Text
81 lines
2.4 KiB
Text
<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>
|
|
|
|
<cffunction name="readJsonBody" access="public" returntype="struct" output="false">
|
|
<cfset var raw = getHttpRequestData().content>
|
|
<cfif isNull(raw) OR len(trim(raw)) EQ 0>
|
|
<cfreturn {}>
|
|
</cfif>
|
|
<cftry>
|
|
<cfset var data = deserializeJSON(raw)>
|
|
<cfif isStruct(data)>
|
|
<cfreturn data>
|
|
<cfelse>
|
|
<cfreturn {}>
|
|
</cfif>
|
|
<cfcatch>
|
|
<cfreturn {}>
|
|
</cfcatch>
|
|
</cftry>
|
|
</cffunction>
|
|
|
|
<cfset data = readJsonBody()>
|
|
<cfset UserID = val( structKeyExists(data,"UserID") ? data.UserID : 0 )>
|
|
|
|
<cfif UserID LTE 0>
|
|
<cfset apiAbort({ "OK": false, "ERROR": "missing_params", "MESSAGE": "UserID is required." })>
|
|
</cfif>
|
|
|
|
<cftry>
|
|
<cfset qBusinesses = queryExecute("
|
|
SELECT
|
|
MIN(e.EmployeeID) AS EmployeeID,
|
|
e.BusinessID,
|
|
MIN(e.EmployeeStatusID) AS EmployeeStatusID,
|
|
MAX(e.EmployeeIsActive) AS EmployeeIsActive,
|
|
b.BusinessName,
|
|
(SELECT COUNT(*) FROM Tasks t WHERE t.TaskBusinessID = e.BusinessID AND t.TaskClaimedByUserID = 0) AS PendingTaskCount
|
|
FROM lt_Users_Businesses_Employees e
|
|
INNER JOIN Businesses b ON b.BusinessID = e.BusinessID
|
|
WHERE e.UserID = ? AND e.EmployeeIsActive = b'1'
|
|
GROUP BY e.BusinessID, b.BusinessName
|
|
ORDER BY b.BusinessName ASC
|
|
", [ { value = UserID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
|
|
|
|
<cfset businesses = []>
|
|
|
|
<cfloop query="qBusinesses">
|
|
<cfset arrayAppend(businesses, {
|
|
"EmployeeID": qBusinesses.EmployeeID,
|
|
"BusinessID": qBusinesses.BusinessID,
|
|
"BusinessName": qBusinesses.BusinessName,
|
|
"BusinessAddress": "",
|
|
"BusinessCity": "",
|
|
"EmployeeStatusID": qBusinesses.EmployeeStatusID,
|
|
"PendingTaskCount": qBusinesses.PendingTaskCount
|
|
})>
|
|
</cfloop>
|
|
|
|
<cfset apiAbort({
|
|
"OK": true,
|
|
"ERROR": "",
|
|
"BUSINESSES": businesses,
|
|
"COUNT": arrayLen(businesses)
|
|
})>
|
|
|
|
<cfcatch>
|
|
<cfset apiAbort({
|
|
"OK": false,
|
|
"ERROR": "server_error",
|
|
"MESSAGE": "Error loading businesses",
|
|
"DETAIL": cfcatch.message
|
|
})>
|
|
</cfcatch>
|
|
</cftry>
|