diff --git a/api/tasks/listMine.cfm b/api/tasks/listMine.cfm index 7beb444..344d29b 100644 --- a/api/tasks/listMine.cfm +++ b/api/tasks/listMine.cfm @@ -82,11 +82,14 @@ tt.Name AS TaskTypeName, tt.Icon AS TaskTypeIcon, tt.Color AS TaskTypeColor, - b.Name AS BusinessName + b.Name AS BusinessName, + sp.Name AS ServicePointName FROM Tasks t LEFT JOIN TaskCategories tc ON tc.ID = t.CategoryID LEFT JOIN tt_TaskTypes tt ON tt.ID = t.TaskTypeID 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# ORDER BY t.ClaimedOn DESC ", params, { datasource = "payfrit" })> @@ -127,7 +130,8 @@ "CategoryColor": len(trim(qTasks.CategoryColor)) ? qTasks.CategoryColor : "##888888", "TaskTypeName": len(trim(qTasks.TaskTypeName)) ? qTasks.TaskTypeName : "", "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 })> diff --git a/api/tasks/listPending.cfm b/api/tasks/listPending.cfm index 1ed91b1..e74861b 100644 --- a/api/tasks/listPending.cfm +++ b/api/tasks/listPending.cfm @@ -69,10 +69,13 @@ tc.Color AS CategoryColor, tt.Name AS TaskTypeName, tt.Icon AS TaskTypeIcon, - tt.Color AS TaskTypeColor + tt.Color AS TaskTypeColor, + sp.Name AS ServicePointName FROM Tasks t LEFT JOIN TaskCategories tc ON tc.ID = t.CategoryID 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# ORDER BY t.CreatedOn ASC ", params, { datasource = "payfrit" })> @@ -107,7 +110,8 @@ "CategoryColor": len(trim(qTasks.CategoryColor)) ? qTasks.CategoryColor : "##888888", "TaskTypeName": len(trim(qTasks.TaskTypeName)) ? qTasks.TaskTypeName : "", "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 })>