Fix order history and active cart API response keys
- Replace tt_OrderTypes JOIN with CASE statement (table casing on Linux) - Fix key mismatches: Name->BusinessName, UUID->OrderUUID, StatusID->OrderStatusID Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
parent
4dfd0db833
commit
89f339a9fd
2 changed files with 12 additions and 7 deletions
|
|
@ -72,9 +72,9 @@ try {
|
||||||
response["HAS_CART"] = true;
|
response["HAS_CART"] = true;
|
||||||
response["CART"] = {
|
response["CART"] = {
|
||||||
"OrderID": val(qCart.ID),
|
"OrderID": val(qCart.ID),
|
||||||
"UUID": qCart.UUID ?: "",
|
"OrderUUID": qCart.UUID ?: "",
|
||||||
"BusinessID": val(qCart.BusinessID),
|
"BusinessID": val(qCart.BusinessID),
|
||||||
"Name": len(trim(qCart.BusinessName)) ? qCart.BusinessName : "",
|
"BusinessName": len(trim(qCart.BusinessName)) ? qCart.BusinessName : "",
|
||||||
"OrderTypes": orderTypesArray,
|
"OrderTypes": orderTypesArray,
|
||||||
"OrderTypeID": val(qCart.OrderTypeID),
|
"OrderTypeID": val(qCart.OrderTypeID),
|
||||||
"OrderTypeName": orderTypeName,
|
"OrderTypeName": orderTypeName,
|
||||||
|
|
|
||||||
|
|
@ -73,10 +73,15 @@ try {
|
||||||
o.AddedOn,
|
o.AddedOn,
|
||||||
o.LastEditedOn,
|
o.LastEditedOn,
|
||||||
b.Name AS BusinessName,
|
b.Name AS BusinessName,
|
||||||
COALESCE(ot.tt_OrderTypeName, 'Unknown') as OrderTypeName
|
CASE o.OrderTypeID
|
||||||
|
WHEN 0 THEN 'Undecided'
|
||||||
|
WHEN 1 THEN 'Dine-In'
|
||||||
|
WHEN 2 THEN 'Takeaway'
|
||||||
|
WHEN 3 THEN 'Delivery'
|
||||||
|
ELSE 'Unknown'
|
||||||
|
END AS OrderTypeName
|
||||||
FROM Orders o
|
FROM Orders o
|
||||||
LEFT JOIN Businesses b ON b.ID = o.BusinessID
|
LEFT JOIN Businesses b ON b.ID = o.BusinessID
|
||||||
LEFT JOIN tt_OrderTypes ot ON ot.tt_OrderTypeID = o.OrderTypeID
|
|
||||||
WHERE o.UserID = :userId
|
WHERE o.UserID = :userId
|
||||||
AND o.StatusID > 0
|
AND o.StatusID > 0
|
||||||
ORDER BY o.AddedOn DESC
|
ORDER BY o.AddedOn DESC
|
||||||
|
|
@ -142,11 +147,11 @@ try {
|
||||||
|
|
||||||
arrayAppend(orders, {
|
arrayAppend(orders, {
|
||||||
"OrderID": val(row.ID),
|
"OrderID": val(row.ID),
|
||||||
"UUID": row.UUID ?: "",
|
"OrderUUID": row.UUID ?: "",
|
||||||
"BusinessID": val(row.BusinessID),
|
"BusinessID": val(row.BusinessID),
|
||||||
"Name": row.BusinessName ?: "Unknown",
|
"BusinessName": row.BusinessName ?: "Unknown",
|
||||||
"OrderTotal": round(val(total) * 100) / 100,
|
"OrderTotal": round(val(total) * 100) / 100,
|
||||||
"StatusID": val(row.StatusID),
|
"OrderStatusID": val(row.StatusID),
|
||||||
"StatusName": statusText,
|
"StatusName": statusText,
|
||||||
"OrderTypeID": val(row.OrderTypeID),
|
"OrderTypeID": val(row.OrderTypeID),
|
||||||
"TypeName": row.OrderTypeName ?: "Unknown",
|
"TypeName": row.OrderTypeName ?: "Unknown",
|
||||||
|
|
|
||||||
Reference in a new issue