Add ServicePointName to task list endpoints
Returns service point name in listMine and listPending responses. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
parent
5e9be8c2ca
commit
d8333b3747
2 changed files with 12 additions and 4 deletions
|
|
@ -82,11 +82,14 @@
|
||||||
tt.Name AS TaskTypeName,
|
tt.Name AS TaskTypeName,
|
||||||
tt.Icon AS TaskTypeIcon,
|
tt.Icon AS TaskTypeIcon,
|
||||||
tt.Color AS TaskTypeColor,
|
tt.Color AS TaskTypeColor,
|
||||||
b.Name AS BusinessName
|
b.Name AS BusinessName,
|
||||||
|
sp.Name AS ServicePointName
|
||||||
FROM Tasks t
|
FROM Tasks t
|
||||||
LEFT JOIN TaskCategories tc ON tc.ID = t.CategoryID
|
LEFT JOIN TaskCategories tc ON tc.ID = t.CategoryID
|
||||||
LEFT JOIN tt_TaskTypes tt ON tt.ID = t.TaskTypeID
|
LEFT JOIN tt_TaskTypes tt ON tt.ID = t.TaskTypeID
|
||||||
LEFT JOIN Businesses b ON b.ID = t.BusinessID
|
LEFT JOIN Businesses b ON b.ID = t.BusinessID
|
||||||
|
LEFT JOIN Orders o ON o.ID = t.OrderID
|
||||||
|
LEFT JOIN ServicePoints sp ON sp.ID = o.ServicePointID
|
||||||
WHERE #whereSQL#
|
WHERE #whereSQL#
|
||||||
ORDER BY t.ClaimedOn DESC
|
ORDER BY t.ClaimedOn DESC
|
||||||
", params, { datasource = "payfrit" })>
|
", params, { datasource = "payfrit" })>
|
||||||
|
|
@ -127,7 +130,8 @@
|
||||||
"CategoryColor": len(trim(qTasks.CategoryColor)) ? qTasks.CategoryColor : "##888888",
|
"CategoryColor": len(trim(qTasks.CategoryColor)) ? qTasks.CategoryColor : "##888888",
|
||||||
"TaskTypeName": len(trim(qTasks.TaskTypeName)) ? qTasks.TaskTypeName : "",
|
"TaskTypeName": len(trim(qTasks.TaskTypeName)) ? qTasks.TaskTypeName : "",
|
||||||
"TaskTypeIcon": len(trim(qTasks.TaskTypeIcon)) ? qTasks.TaskTypeIcon : "notifications",
|
"TaskTypeIcon": len(trim(qTasks.TaskTypeIcon)) ? qTasks.TaskTypeIcon : "notifications",
|
||||||
"TaskTypeColor": len(trim(qTasks.TaskTypeColor)) ? qTasks.TaskTypeColor : "##9C27B0"
|
"TaskTypeColor": len(trim(qTasks.TaskTypeColor)) ? qTasks.TaskTypeColor : "##9C27B0",
|
||||||
|
"ServicePointName": isNull(qTasks.ServicePointName) ? "" : qTasks.ServicePointName
|
||||||
})>
|
})>
|
||||||
</cfloop>
|
</cfloop>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -69,10 +69,13 @@
|
||||||
tc.Color AS CategoryColor,
|
tc.Color AS CategoryColor,
|
||||||
tt.Name AS TaskTypeName,
|
tt.Name AS TaskTypeName,
|
||||||
tt.Icon AS TaskTypeIcon,
|
tt.Icon AS TaskTypeIcon,
|
||||||
tt.Color AS TaskTypeColor
|
tt.Color AS TaskTypeColor,
|
||||||
|
sp.Name AS ServicePointName
|
||||||
FROM Tasks t
|
FROM Tasks t
|
||||||
LEFT JOIN TaskCategories tc ON tc.ID = t.CategoryID
|
LEFT JOIN TaskCategories tc ON tc.ID = t.CategoryID
|
||||||
LEFT JOIN tt_TaskTypes tt ON tt.ID = t.TaskTypeID
|
LEFT JOIN tt_TaskTypes tt ON tt.ID = t.TaskTypeID
|
||||||
|
LEFT JOIN Orders o ON o.ID = t.OrderID
|
||||||
|
LEFT JOIN ServicePoints sp ON sp.ID = o.ServicePointID
|
||||||
WHERE #whereSQL#
|
WHERE #whereSQL#
|
||||||
ORDER BY t.CreatedOn ASC
|
ORDER BY t.CreatedOn ASC
|
||||||
", params, { datasource = "payfrit" })>
|
", params, { datasource = "payfrit" })>
|
||||||
|
|
@ -107,7 +110,8 @@
|
||||||
"CategoryColor": len(trim(qTasks.CategoryColor)) ? qTasks.CategoryColor : "##888888",
|
"CategoryColor": len(trim(qTasks.CategoryColor)) ? qTasks.CategoryColor : "##888888",
|
||||||
"TaskTypeName": len(trim(qTasks.TaskTypeName)) ? qTasks.TaskTypeName : "",
|
"TaskTypeName": len(trim(qTasks.TaskTypeName)) ? qTasks.TaskTypeName : "",
|
||||||
"TaskTypeIcon": len(trim(qTasks.TaskTypeIcon)) ? qTasks.TaskTypeIcon : "notifications",
|
"TaskTypeIcon": len(trim(qTasks.TaskTypeIcon)) ? qTasks.TaskTypeIcon : "notifications",
|
||||||
"TaskTypeColor": len(trim(qTasks.TaskTypeColor)) ? qTasks.TaskTypeColor : "##9C27B0"
|
"TaskTypeColor": len(trim(qTasks.TaskTypeColor)) ? qTasks.TaskTypeColor : "##9C27B0",
|
||||||
|
"ServicePointName": isNull(qTasks.ServicePointName) ? "" : qTasks.ServicePointName
|
||||||
})>
|
})>
|
||||||
</cfloop>
|
</cfloop>
|
||||||
|
|
||||||
|
|
|
||||||
Reference in a new issue