- Fix for...in loops on query results in getForBuilder.cfm (only iterated once) - Remove illegal var keyword from loop variables in saveWizard.cfm - Only create food running tasks for dine-in orders (skip takeaway/delivery) - Add image preview modal for modifier source images in wizard - Add data clearing utilities (clearAllData, clearOrders) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
167 lines
5.7 KiB
Text
167 lines
5.7 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 OrderID = val( structKeyExists(data,"OrderID") ? data.OrderID : 0 )>
|
|
<cfset NewStatusID = val( structKeyExists(data,"StatusID") ? data.StatusID : 0 )>
|
|
|
|
<cfif OrderID LTE 0 OR NewStatusID LTE 0>
|
|
<cfset apiAbort({ "OK": false, "ERROR": "missing_params", "MESSAGE": "OrderID and StatusID are required.", "DETAIL": "" })>
|
|
</cfif>
|
|
|
|
<cftry>
|
|
<!--- Verify order exists and get details --->
|
|
<cfset qOrder = queryExecute("
|
|
SELECT o.OrderID, o.OrderStatusID, o.OrderBusinessID, o.OrderServicePointID,
|
|
sp.ServicePointName
|
|
FROM Orders o
|
|
LEFT JOIN ServicePoints sp ON sp.ServicePointID = o.OrderServicePointID
|
|
WHERE o.OrderID = ?
|
|
LIMIT 1
|
|
", [ { value = OrderID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
|
|
|
|
<cfif qOrder.recordCount EQ 0>
|
|
<cfset apiAbort({ "OK": false, "ERROR": "not_found", "MESSAGE": "Order not found.", "DETAIL": "" })>
|
|
</cfif>
|
|
|
|
<cfset oldStatusID = qOrder.OrderStatusID>
|
|
|
|
<!--- Update status --->
|
|
<cfset queryExecute("
|
|
UPDATE Orders
|
|
SET OrderStatusID = ?,
|
|
OrderLastEditedOn = ?
|
|
WHERE OrderID = ?
|
|
", [
|
|
{ value = NewStatusID, cfsqltype = "cf_sql_integer" },
|
|
{ value = now(), cfsqltype = "cf_sql_timestamp" },
|
|
{ value = OrderID, cfsqltype = "cf_sql_integer" }
|
|
], { datasource = "payfrit" })>
|
|
|
|
<!---
|
|
Order Status Flow:
|
|
0 = Cart
|
|
1 = Submitted (paid via Stripe/other payment, or added to tab)
|
|
2 = In Progress (Kitchen preparing)
|
|
3 = Order Complete, Final Prep (Kitchen done, create delivery/pickup task)
|
|
4 = Claimed (Worker claimed task - delivering to table, out for delivery, or notifying customer for pickup)
|
|
5 = Delivered/Complete
|
|
6 = Cancelled
|
|
7 = Deleted (user abandoned cart and started new one)
|
|
|
|
Task Types (auto-created at status 3):
|
|
- Dine-in: "Deliver Order #X to <Service Point>"
|
|
- Takeaway: "Prepare Order #X for customer pickup"
|
|
- Delivery: "Prepare Order #X for delivery worker pickup"
|
|
|
|
Other system tasks (manually created or scheduled):
|
|
- "Go to <Service Point>" (customer call server)
|
|
- "Customer Chat"
|
|
- Scheduled: "Clean Men's Washroom", "Clean Women's Restroom", "Silverware roll-ups", "Check Floor", "Check garbage cans", etc.
|
|
--->
|
|
|
|
<!--- Create delivery/pickup task when order moves to status 3 (Final Prep) --->
|
|
<cfset taskCreated = false>
|
|
<cfif NewStatusID EQ 3 AND oldStatusID NEQ 3>
|
|
<cftry>
|
|
<!--- Check if task already exists for this order to prevent duplicates --->
|
|
<cfset qExisting = queryExecute("
|
|
SELECT TaskID FROM Tasks WHERE TaskOrderID = ? LIMIT 1
|
|
", [ { value = OrderID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
|
|
|
|
<cfif qExisting.recordCount EQ 0>
|
|
<!--- Get order type --->
|
|
<cfset qOrderDetails = queryExecute("
|
|
SELECT o.OrderTypeID
|
|
FROM Orders o
|
|
WHERE o.OrderID = ?
|
|
", [ { value = OrderID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
|
|
|
|
<cfset orderTypeID = qOrderDetails.recordCount GT 0 ? val(qOrderDetails.OrderTypeID) : 1>
|
|
|
|
<!--- OrderTypeID: 1=dine-in, 2=takeaway, 3=delivery --->
|
|
<!--- Only create food running tasks for dine-in orders for now --->
|
|
<!--- TODO: Takeaway will have optional pickup counter service point --->
|
|
<!--- TODO: Delivery will have GPS service point of delivery address --->
|
|
<cfif orderTypeID EQ 1>
|
|
<!--- Dine-in: Server delivers to service point --->
|
|
<cfset tableName = len(qOrder.ServicePointName) ? qOrder.ServicePointName : "Table">
|
|
<cfset taskTitle = "Deliver Order ###OrderID# to " & tableName>
|
|
<cfset taskCategoryID = 3>
|
|
|
|
<cfset queryExecute("
|
|
INSERT INTO Tasks (
|
|
TaskBusinessID,
|
|
TaskOrderID,
|
|
TaskTypeID,
|
|
TaskCategoryID,
|
|
TaskTitle,
|
|
TaskClaimedByUserID,
|
|
TaskAddedOn
|
|
) VALUES (
|
|
?,
|
|
?,
|
|
1,
|
|
?,
|
|
?,
|
|
0,
|
|
NOW()
|
|
)
|
|
", [
|
|
{ value = qOrder.OrderBusinessID, cfsqltype = "cf_sql_integer" },
|
|
{ value = OrderID, cfsqltype = "cf_sql_integer" },
|
|
{ value = taskCategoryID, cfsqltype = "cf_sql_integer" },
|
|
{ value = taskTitle, cfsqltype = "cf_sql_varchar" }
|
|
], { datasource = "payfrit" })>
|
|
<cfset taskCreated = true>
|
|
</cfif>
|
|
</cfif>
|
|
<cfcatch>
|
|
<!--- Task creation failed, but don't fail the status update --->
|
|
</cfcatch>
|
|
</cftry>
|
|
</cfif>
|
|
|
|
<cfset apiAbort({
|
|
"OK": true,
|
|
"ERROR": "",
|
|
"MESSAGE": "Order status updated successfully.",
|
|
"OrderID": OrderID,
|
|
"StatusID": NewStatusID,
|
|
"TaskCreated": taskCreated
|
|
})>
|
|
|
|
<cfcatch>
|
|
<cfset apiAbort({
|
|
"OK": false,
|
|
"ERROR": "server_error",
|
|
"MESSAGE": "DB error updating order status",
|
|
"DETAIL": cfcatch.message
|
|
})>
|
|
</cfcatch>
|
|
</cftry>
|