payfrit/payfrit-biz
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix remaining old column names missed by initial batch rename

Browse source 
Second pass fixing 70+ references across 32 files:
- Orders: DeliveryMultiplier→BusinessDeliveryMultiplier, OrderTipAmount→TipAmount,
  OrderPaymentCompletedOn→PaymentCompletedOn, OrderPaymentError→PaymentError
- Orders PK: WHERE OrderID=? → WHERE ID=? on Orders table
- OrderLineItems PK: OrderLineItemID→ID in INSERT, WHERE, and query results
- Items: parent.ItemID→parent.ID in JOIN conditions
- Tasks: t.TaskID→t.ID in JOIN conditions
- Users PK: WHERE UserID=X → WHERE ID=X on Users table
- Addresses PK: A.AddressID→A.ID in JOIN conditions
- tt_States: tt_StateID→ID, remove nonexistent tt_StateCountryID/tt_StateSortOrder
- tt_OrderTypes: tt_OrderTypeID→ID, tt_OrderTypeName→Name
- tt_Days: D.tt_DayID→D.ID
- confirm_email.cfm: Add missing SELECT/FROM to queries
- setLineItem.cfm: Fix 13 old column references
- Stripe webhook/payment: Fix column names and PK references

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
John Mizerek 2026-01-30 22:58:46 -08:00
parent 712ec3b635
commit 8dff081407
32 changed files with 259 additions and 264 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/addresses/states.cfm
View file

@ -6,7 +6,7 @@
<cfscript>
try {
qStates = queryExecute("
SELECT tt_StateID as StateID, Abbreviation as StateAbbreviation, Name as StateName
SELECT ID as StateID, Abbreviation as StateAbbreviation, Name as StateName
FROM tt_States
ORDER BY Name
", {}, { datasource: "payfrit" });

4
api/admin/setupBigDeansInfo.cfm
View file

@ -13,8 +13,8 @@ try {
// Hours: Mon-Thu: 11am-10pm, Fri-Sat: 11am-11pm, Sun: 11am-10pm
// Get California StateID
qState = queryExecute("SELECT tt_StateID FROM tt_States WHERE Abbreviation = 'CA' LIMIT 1");
stateId = qState.recordCount > 0 ? qState.tt_StateID : 5; // Default to 5 if not found
qState = queryExecute("SELECT ID FROM tt_States WHERE Abbreviation = 'CA' LIMIT 1");
stateId = qState.recordCount > 0 ? qState.ID : 5; // Default to 5 if not found
// Check if Big Dean's already has an address
existingAddr = queryExecute("

177
api/beacons/lookup.cfm
View file

@ -2,112 +2,87 @@
<cfsetting enablecfoutputonly="true">
<cfcontent type="application/json; charset=utf-8" reset="true">
<cfscript>
/**
* Lookup beacons by UUID
*
* POST: {
* UUIDs: array of UUID strings (without dashes, uppercase)
* }
*
* Returns: {
* OK: true,
* BEACONS: [
* {
* UUID: "...",
* BeaconID: int,
* Name: string,
* BusinessID: int,
* Name: string,
* ServicePointID: int,
* Name: string,
* ParentBusinessID: int (if applicable),
* ParentName: string (if applicable),
* HasChildren: boolean
* }
* ]
* }
*/
<cftry>
response = { "OK": false };
<cfset requestData = deserializeJSON(toString(getHttpRequestData().content))>
try {
requestData = deserializeJSON(toString(getHttpRequestData().content));
<cfif NOT structKeyExists(requestData, "UUIDs") OR NOT isArray(requestData.UUIDs) OR arrayLen(requestData.UUIDs) EQ 0>
<cfoutput>#serializeJSON({
"OK" = true,
"ERROR" = "",
"BEACONS" = []
})#</cfoutput>
<cfabort>
</cfif>
uuids = requestData.UUIDs ?: [];
<!--- Clean and normalize UUIDs (remove dashes, uppercase) --->
<cfset cleanUUIDs = []>
<cfloop array="#requestData.UUIDs#" index="uuid">
<cfset cleanUUID = uCase(reReplace(uuid, "-", "", "all"))>
<cfif len(cleanUUID) EQ 32>
<cfset arrayAppend(cleanUUIDs, cleanUUID)>
</cfif>
</cfloop>
if (!isArray(uuids) || arrayLen(uuids) == 0) {
response["OK"] = true;
response["BEACONS"] = [];
writeOutput(serializeJSON(response));
abort;
}
<cfif arrayLen(cleanUUIDs) EQ 0>
<cfoutput>#serializeJSON({
"OK" = true,
"ERROR" = "",
"BEACONS" = []
})#</cfoutput>
<cfabort>
</cfif>
// Clean and normalize UUIDs (remove dashes, uppercase)
cleanUUIDs = [];
for (uuid in uuids) {
cleanUUID = uCase(reReplace(uuid, "-", "", "all"));
if (len(cleanUUID) == 32) {
arrayAppend(cleanUUIDs, cleanUUID);
}
}
<!--- Query for matching beacons with business info --->
<cfquery name="qBeacons" datasource="payfrit">
SELECT
b.ID AS BeaconID,
b.Name AS BeaconName,
b.UUID,
COALESCE(sp.ID, 0) AS ServicePointID,
COALESCE(sp.Name, '') AS ServicePointName,
COALESCE(sp.BusinessID, lt.BusinessID, b.BusinessID) AS BusinessID,
biz.Name AS BusinessName,
biz.ParentBusinessID,
COALESCE(parent.Name, '') AS ParentBusinessName,
(SELECT COUNT(*) FROM Businesses WHERE ParentBusinessID = biz.ID) AS ChildCount
FROM Beacons b
LEFT JOIN ServicePoints sp ON sp.BeaconID = b.ID
LEFT JOIN lt_BeaconsID_BusinessesID lt ON lt.BeaconID = b.ID
INNER JOIN Businesses biz ON COALESCE(sp.BusinessID, lt.BusinessID, b.BusinessID) = biz.ID
LEFT JOIN Businesses parent ON biz.ParentBusinessID = parent.ID
WHERE b.UUID IN (<cfqueryparam value="#arrayToList(cleanUUIDs)#" cfsqltype="cf_sql_varchar" list="true">)
AND b.IsActive = 1
AND biz.IsDemo = 0
AND biz.IsPrivate = 0
</cfquery>
if (arrayLen(cleanUUIDs) == 0) {
response["OK"] = true;
response["BEACONS"] = [];
writeOutput(serializeJSON(response));
abort;
}
<cfset beacons = []>
<cfloop query="qBeacons">
<cfset arrayAppend(beacons, {
"UUID" = qBeacons.UUID,
"BeaconID" = qBeacons.BeaconID,
"BeaconName" = qBeacons.BeaconName,
"BusinessID" = qBeacons.BusinessID,
"BusinessName" = qBeacons.BusinessName,
"ServicePointID" = qBeacons.ServicePointID,
"ServicePointName" = qBeacons.ServicePointName,
"ParentBusinessID" = val(qBeacons.ParentBusinessID),
"ParentBusinessName" = qBeacons.ParentBusinessName,
"HasChildren" = qBeacons.ChildCount GT 0
})>
</cfloop>
// Query for matching beacons with business info
// Beacons resolve to businesses via: ServicePoints, join table, or owner
qBeacons = queryExecute("
SELECT
b.ID,
b.Name,
b.UUID,
COALESCE(sp.ID, 0) AS ServicePointID,
COALESCE(sp.Name, '') AS Name,
COALESCE(sp.BusinessID, lt.BusinessID, b.BusinessID) AS BusinessID,
biz.Name,
biz.ParentBusinessID,
parent.Name AS ParentName,
(SELECT COUNT(*) FROM Businesses WHERE ParentBusinessID = biz.ID) AS ChildCount
FROM Beacons b
LEFT JOIN ServicePoints sp ON sp.BeaconID = b.ID
LEFT JOIN lt_BeaconsID_BusinessesID lt ON lt.BeaconID = b.ID
INNER JOIN Businesses biz ON COALESCE(sp.BusinessID, lt.BusinessID, b.BusinessID) = biz.ID
LEFT JOIN Businesses parent ON biz.ParentBusinessID = parent.ID
WHERE b.UUID IN (:uuids)
AND b.IsActive = 1
AND biz.IsDemo = 0
AND biz.IsPrivate = 0
", {
uuids: { value: arrayToList(cleanUUIDs), cfsqltype: "cf_sql_varchar", list: true }
}, { datasource: "payfrit" });
<cfoutput>#serializeJSON({
"OK" = true,
"ERROR" = "",
"BEACONS" = beacons
})#</cfoutput>
beacons = [];
for (row in qBeacons) {
arrayAppend(beacons, {
"UUID": row.UUID,
"BeaconID": row.ID,
"Name": row.Name,
"BusinessID": row.BusinessID,
"Name": row.Name,
"ServicePointID": row.ServicePointID,
"Name": row.Name,
"ParentBusinessID": val(row.ParentBusinessID),
"ParentName": row.ParentName ?: "",
"HasChildren": row.ChildCount > 0
});
}
response["OK"] = true;
response["BEACONS"] = beacons;
} catch (any e) {
response["ERROR"] = e.message;
}
writeOutput(serializeJSON(response));
</cfscript>
<cfcatch type="any">
<cfoutput>#serializeJSON({
"OK" = false,
"ERROR" = cfcatch.message
})#</cfoutput>
</cfcatch>
</cftry>

4
api/businesses/update.cfm
View file

@ -81,10 +81,10 @@ try {
stateID = 0;
if (len(state)) {
qState = queryExecute("
SELECT tt_StateID FROM tt_States WHERE Abbreviation = :abbr
SELECT ID FROM tt_States WHERE Abbreviation = :abbr
", { abbr: uCase(state) }, { datasource: "payfrit" });
if (qState.recordCount > 0) {
stateID = qState.tt_StateID;
stateID = qState.ID;
}
}

2
api/chat/getActiveChat.cfm
View file

@ -66,7 +66,7 @@ try {
apiAbort({
"OK": true,
"HAS_ACTIVE_CHAT": true,
"TASK_ID": qChat.TaskID,
"TASK_ID": qChat.ID,
"TASK_TITLE": qChat.Title
});
} else {

34
api/menu/items.cfm
View file

@ -183,8 +183,8 @@
SELECT
i.ID,
i.CategoryID,
c.Name,
i.Name,
c.Name AS CategoryName,
i.Name AS ItemName,
i.Description,
i.ParentItemID,
i.Price,
@ -195,8 +195,9 @@
i.IsCollapsible,
i.SortOrder,
i.StationID,
s.Name,
s.Color
s.Name AS StationName,
s.Color,
c.MenuID
FROM Items i
LEFT JOIN Categories c ON c.ID = i.CategoryID
LEFT JOIN Stations s ON s.ID = i.StationID
@ -317,7 +318,6 @@
"ItemID": qCategories.ID,
"CategoryID": qCategories.ID,
"Name": qCategories.Name,
"Name": qCategories.Name,
"Description": "",
"ParentItemID": 0,
"Price": 0,
@ -327,6 +327,7 @@
"MaxNumSelectionReq": 0,
"IsCollapsible": 0,
"SortOrder": qCategories.SortOrder,
"MenuID": isNull(qCategories.MenuID) ? 0 : val(qCategories.MenuID),
"StationID": "",
"ItemName": "",
"ItemColor": ""
@ -360,11 +361,27 @@
</cfif>
</cfif>
<cfset itemMenuID = 0>
<cftry>
<cfset itemMenuID = isNull(q.MenuID) ? 0 : val(q.MenuID)>
<cfcatch><cfset itemMenuID = 0></cfcatch>
</cftry>
<!--- Use aliased columns if available, fall back to generic Name --->
<cfset itemName = "">
<cfset catName = "">
<cftry>
<cfset itemName = q.ItemName>
<cfset catName = q.CategoryName>
<cfcatch>
<!--- Fallback for old schema queries without aliases --->
<cfset itemName = q.Name>
<cfset catName = q.Name>
</cfcatch>
</cftry>
<cfset arrayAppend(rows, {
"ItemID": q.ID,
"CategoryID": q.CategoryID,
"Name": len(trim(q.Name)) ? q.Name : "",
"Name": q.Name,
"Name": len(trim(itemName)) ? itemName : catName,
"Description": q.Description,
"ParentItemID": effectiveParentID,
"Price": q.Price,
@ -374,8 +391,9 @@
"MaxNumSelectionReq": q.MaxNumSelectionReq,
"IsCollapsible": q.IsCollapsible,
"SortOrder": q.SortOrder,
"MenuID": itemMenuID,
"StationID": len(trim(q.StationID)) ? q.StationID : "",
"ItemName": len(trim(q.Name)) ? q.Name : "",
"ItemName": len(trim(catName)) ? catName : "",
"ItemColor": len(trim(q.Color)) ? q.Color : ""
})>
</cfloop>

4
api/orders/abandonOrder.cfm
View file

@ -52,14 +52,14 @@
<!--- Delete line items --->
<cfset queryExecute(
"DELETE FROM OrderLineItems WHERE OrderID = ?",
"DELETE FROM OrderLineItems WHERE ID = ?",
[{ value = OrderID, cfsqltype = "cf_sql_integer" }],
{ datasource = "payfrit" }
)>
<!--- Mark order with status 7 (Deleted and started new cart) --->
<cfset queryExecute(
"UPDATE Orders SET StatusID = 7, LastEditedOn = NOW() WHERE OrderID = ?",
"UPDATE Orders SET StatusID = 7, LastEditedOn = NOW() WHERE ID = ?",
[{ value = OrderID, cfsqltype = "cf_sql_integer" }],
{ datasource = "payfrit" }
)>

2
api/orders/debugLineItems.cfm
View file

@ -32,7 +32,7 @@
<cfset lineItems = []>
<cfloop query="qLineItems">
<cfset arrayAppend(lineItems, {
"OrderLineItemID": qLineItems.OrderLineItemID,
"OrderLineItemID": qLineItems.ID,
"ParentOrderLineItemID": qLineItems.ParentOrderLineItemID,
"ItemID": qLineItems.ID,
"Price": qLineItems.Price,

8
api/orders/getCart.cfm
View file

@ -41,7 +41,7 @@
UUID,
UserID,
BusinessID,
DeliveryMultiplier,
BusinessDeliveryMultiplier,
OrderTypeID,
DeliveryFee,
StatusID,
@ -94,7 +94,7 @@
parent.Name AS ItemParentName
FROM OrderLineItems oli
INNER JOIN Items i ON i.ID = oli.ItemID
LEFT JOIN Items parent ON parent.ItemID = i.ParentItemID
LEFT JOIN Items parent ON parent.ID = i.ParentItemID
WHERE oli.OrderID = ?
ORDER BY oli.ID
",
@ -105,7 +105,7 @@
<cfset rows = []>
<cfloop query="qLI">
<cfset arrayAppend(rows, {
"OrderLineItemID": val(qLI.OrderLineItemID),
"OrderLineItemID": val(qLI.ID),
"ParentOrderLineItemID": val(qLI.ParentOrderLineItemID),
"OrderID": val(qLI.OrderID),
"ItemID": val(qLI.ItemID),
@ -130,7 +130,7 @@
"UUID": qOrder.UUID ?: "",
"UserID": val(qOrder.UserID),
"BusinessID": val(qOrder.BusinessID),
"DeliveryMultiplier": val(qOrder.DeliveryMultiplier),
"DeliveryMultiplier": val(qOrder.BusinessDeliveryMultiplier),
"OrderTypeID": val(qOrder.OrderTypeID),
"DeliveryFee": val(qOrder.DeliveryFee),
"BusinessDeliveryFee": val(businessDeliveryFee),

4
api/orders/getDetail.cfm
View file

@ -54,7 +54,7 @@ try {
o.AddedOn,
o.LastEditedOn,
o.SubmittedOn,
o.OrderTipAmount,
o.TipAmount,
u.FirstName,
u.LastName,
u.ContactNumber,
@ -145,7 +145,7 @@ try {
tax = subtotal * taxRate;
// Get tip from order
tip = isNumeric(qOrder.OrderTipAmount) ? qOrder.OrderTipAmount : 0;
tip = isNumeric(qOrder.TipAmount) ? qOrder.TipAmount : 0;
// Calculate total
total = subtotal + tax + tip;

6
api/orders/getOrCreateCart.cfm
View file

@ -37,7 +37,7 @@
UUID,
UserID,
BusinessID,
DeliveryMultiplier,
BusinessDeliveryMultiplier,
OrderTypeID,
DeliveryFee,
StatusID,
@ -73,7 +73,7 @@
"UUID": qOrder.UUID ?: "",
"UserID": val(qOrder.UserID),
"BusinessID": val(qOrder.BusinessID),
"DeliveryMultiplier": val(qOrder.DeliveryMultiplier),
"DeliveryMultiplier": val(qOrder.BusinessDeliveryMultiplier),
"OrderTypeID": val(qOrder.OrderTypeID),
"DeliveryFee": val(qOrder.DeliveryFee),
"BusinessDeliveryFee": val(businessDeliveryFee),
@ -266,7 +266,7 @@
UUID,
UserID,
BusinessID,
DeliveryMultiplier,
BusinessDeliveryMultiplier,
OrderTypeID,
DeliveryFee,
StatusID,

6
api/orders/listForKDS.cfm
View file

@ -129,7 +129,7 @@
parent.Name AS ItemParentName
FROM OrderLineItems oli
INNER JOIN Items i ON i.ID = oli.ItemID
LEFT JOIN Items parent ON parent.ItemID = i.ParentItemID
LEFT JOIN Items parent ON parent.ID = i.ParentItemID
WHERE oli.OrderID = ?
AND oli.IsDeleted = b'0'
AND (i.StationID = ? OR i.StationID = 0 OR i.StationID IS NULL OR oli.ParentOrderLineItemID > 0)
@ -155,7 +155,7 @@
parent.Name AS ItemParentName
FROM OrderLineItems oli
INNER JOIN Items i ON i.ID = oli.ItemID
LEFT JOIN Items parent ON parent.ItemID = i.ParentItemID
LEFT JOIN Items parent ON parent.ID = i.ParentItemID
WHERE oli.OrderID = ?
AND oli.IsDeleted = b'0'
ORDER BY oli.ID
@ -165,7 +165,7 @@
<cfset lineItems = []>
<cfloop query="qLineItems">
<cfset arrayAppend(lineItems, {
"OrderLineItemID": qLineItems.OrderLineItemID,
"OrderLineItemID": qLineItems.ID,
"ParentOrderLineItemID": qLineItems.ParentOrderLineItemID,
"ItemID": qLineItems.ID,
"Price": qLineItems.Price,

52
api/orders/setLineItem.cfm
View file

@ -51,7 +51,7 @@
WHERE ParentItemID = ?
AND IsCheckedByDefault = 1
AND IsActive = 1
ORDER BY SortOrder, ItemID
ORDER BY SortOrder, ID
",
[ { value = arguments.ParentItemID, cfsqltype = "cf_sql_integer" } ],
{ datasource = "payfrit" }
@ -81,13 +81,13 @@
<!--- Process direct children --->
<cfloop query="qKids">
<cfset arrayAppend(request.attachDebug, " -> direct child: ItemID=#qKids.ItemID#")>
<cfset arrayAppend(request.attachDebug, " -> direct child: ItemID=#qKids.ID#")>
<cfset processDefaultChild(arguments.OrderID, arguments.ParentLineItemID, qKids.ItemID, qKids.Price)>
</cfloop>
<!--- Process template children --->
<cfloop query="qTemplateKids">
<cfset arrayAppend(request.attachDebug, " -> template child: ItemID=#qTemplateKids.ItemID#")>
<cfset arrayAppend(request.attachDebug, " -> template child: ItemID=#qTemplateKids.ID#")>
<cfset processDefaultChild(arguments.OrderID, arguments.ParentLineItemID, qTemplateKids.ItemID, qTemplateKids.Price)>
</cfloop>
</cffunction>
@ -103,7 +103,7 @@
"
SELECT ID
FROM OrderLineItems
WHERE OrderID = ?
WHERE ID = ?
AND ParentOrderLineItemID = ?
AND ItemID = ?
LIMIT 1
@ -121,18 +121,18 @@
"
UPDATE OrderLineItems
SET IsDeleted = b'0'
WHERE OrderLineItemID = ?
WHERE ID = ?
",
[ { value = qExisting.OrderLineItemID, cfsqltype = "cf_sql_integer" } ],
[ { value = qExisting.ID, cfsqltype = "cf_sql_integer" } ],
{ datasource = "payfrit" }
)>
<cfset attachDefaultChildren(arguments.OrderID, qExisting.OrderLineItemID, arguments.ItemID)>
<cfset attachDefaultChildren(arguments.OrderID, qExisting.ID, arguments.ItemID)>
<cfelse>
<cfset var NewLIID = nextId("OrderLineItems","OrderLineItemID")>
<cfset var NewLIID = nextId("OrderLineItems","ID")>
<cfset queryExecute(
"
INSERT INTO OrderLineItems (
OrderLineItemID,
ID,
ParentOrderLineItemID,
OrderID,
ItemID,
@ -180,7 +180,7 @@
o.UUID,
o.UserID,
o.BusinessID,
o.DeliveryMultiplier,
o.BusinessDeliveryMultiplier,
o.OrderTypeID,
o.DeliveryFee,
o.StatusID,
@ -210,7 +210,7 @@
"UUID": qOrder.UUID ?: "",
"UserID": val(qOrder.UserID),
"BusinessID": val(qOrder.BusinessID),
"DeliveryMultiplier": val(qOrder.DeliveryMultiplier),
"DeliveryMultiplier": val(qOrder.BusinessDeliveryMultiplier),
"OrderTypeID": val(qOrder.OrderTypeID),
"DeliveryFee": val(qOrder.DeliveryFee),
"StatusID": val(qOrder.StatusID),
@ -243,7 +243,7 @@
parent.Name AS ItemParentName
FROM OrderLineItems oli
INNER JOIN Items i ON i.ID = oli.ItemID
LEFT JOIN Items parent ON parent.ItemID = i.ParentItemID
LEFT JOIN Items parent ON parent.ID = i.ParentItemID
WHERE oli.OrderID = ?
ORDER BY oli.ID
",
@ -254,7 +254,7 @@
<cfset var rows = []>
<cfloop query="qLI">
<cfset arrayAppend(rows, {
"OrderLineItemID": val(qLI.OrderLineItemID),
"OrderLineItemID": val(qLI.ID),
"ParentOrderLineItemID": val(qLI.ParentOrderLineItemID),
"OrderID": val(qLI.OrderID),
"ItemID": val(qLI.ItemID),
@ -356,7 +356,7 @@
<cfif IsSelected>
<!--- Get the parent line item's ItemID to check maxSel --->
<cfset qParentLI = queryExecute(
"SELECT ItemID FROM OrderLineItems WHERE OrderLineItemID = ? LIMIT 1",
"SELECT ItemID FROM OrderLineItems WHERE ID = ? LIMIT 1",
[ { value = ParentLineItemID, cfsqltype = "cf_sql_integer" } ],
{ datasource = "payfrit" }
)>
@ -375,7 +375,7 @@
"
UPDATE OrderLineItems
SET IsDeleted = b'1'
WHERE OrderID = ?
WHERE ID = ?
AND ParentOrderLineItemID = ?
AND ItemID != ?
AND IsDeleted = b'0'
@ -395,13 +395,13 @@
<!--- Find existing line item (by order, parent LI, item) - unless ForceNew is set --->
<cfif ForceNew>
<!--- ForceNew: Skip existing lookup, will always create new line item --->
<cfset qExisting = queryNew("OrderLineItemID", "integer")>
<cfset qExisting = queryNew("ID", "integer")>
<cfelse>
<cfset qExisting = queryExecute(
"
SELECT ID
FROM OrderLineItems
WHERE OrderID = ?
WHERE ID = ?
AND ParentOrderLineItemID = ?
AND ItemID = ?
LIMIT 1
@ -431,13 +431,13 @@
Price = ?,
Remark = ?,
StatusID = 0
WHERE OrderLineItemID = ?
WHERE ID = ?
",
[
{ value = Quantity, cfsqltype = "cf_sql_integer" },
{ value = qItem.Price, cfsqltype = "cf_sql_decimal" },
{ value = Remark, cfsqltype = "cf_sql_varchar", null = (len(trim(Remark)) EQ 0) },
{ value = qExisting.OrderLineItemID, cfsqltype = "cf_sql_integer" }
{ value = qExisting.ID, cfsqltype = "cf_sql_integer" }
],
{ datasource = "payfrit" }
)>
@ -446,29 +446,29 @@
<cfif NOT structKeyExists(request, "attachDebug")>
<cfset request.attachDebug = []>
</cfif>
<cfset arrayAppend(request.attachDebug, "BEFORE attachDefaultChildren call: OrderID=#OrderID#, LIID=#qExisting.OrderLineItemID#, ItemID=#ItemID#")>
<cfset attachDefaultChildren(OrderID, qExisting.OrderLineItemID, ItemID)>
<cfset arrayAppend(request.attachDebug, "BEFORE attachDefaultChildren call: OrderID=#OrderID#, LIID=#qExisting.ID#, ItemID=#ItemID#")>
<cfset attachDefaultChildren(OrderID, qExisting.ID, ItemID)>
<cfset arrayAppend(request.attachDebug, "AFTER attachDefaultChildren call")>
<cfelse>
<cfset queryExecute(
"
UPDATE OrderLineItems
SET IsDeleted = b'1'
WHERE OrderLineItemID = ?
WHERE ID = ?
",
[ { value = qExisting.OrderLineItemID, cfsqltype = "cf_sql_integer" } ],
[ { value = qExisting.ID, cfsqltype = "cf_sql_integer" } ],
{ datasource = "payfrit" }
)>
</cfif>
<cfelse>
<!--- Insert new if selecting, otherwise no-op --->
<cfif IsSelected>
<cfset NewLIID = nextId("OrderLineItems","OrderLineItemID")>
<cfset NewLIID = nextId("OrderLineItems","ID")>
<cfset queryExecute(
"
INSERT INTO OrderLineItems (
OrderLineItemID,
ID,
ParentOrderLineItemID,
OrderID,
ItemID,
@ -511,7 +511,7 @@
<!--- Touch order last edited --->
<cftry>
<cfset queryExecute(
"UPDATE Orders SET LastEditedOn = ? WHERE OrderID = ?",
"UPDATE Orders SET LastEditedOn = ? WHERE ID = ?",
[
{ value = now(), cfsqltype = "cf_sql_timestamp" },
{ value = OrderID, cfsqltype = "cf_sql_integer" }

12
api/orders/setOrderType.cfm
View file

@ -37,7 +37,7 @@
UUID,
UserID,
BusinessID,
DeliveryMultiplier,
BusinessDeliveryMultiplier,
OrderTypeID,
DeliveryFee,
StatusID,
@ -73,7 +73,7 @@
"UUID": qOrder.UUID ?: "",
"UserID": val(qOrder.UserID),
"BusinessID": val(qOrder.BusinessID),
"DeliveryMultiplier": val(qOrder.DeliveryMultiplier),
"DeliveryMultiplier": val(qOrder.BusinessDeliveryMultiplier),
"OrderTypeID": val(qOrder.OrderTypeID),
"DeliveryFee": val(qOrder.DeliveryFee),
"BusinessDeliveryFee": val(businessDeliveryFee),
@ -106,7 +106,7 @@
parent.Name AS ItemParentName
FROM OrderLineItems oli
INNER JOIN Items i ON i.ID = oli.ItemID
LEFT JOIN Items parent ON parent.ItemID = i.ParentItemID
LEFT JOIN Items parent ON parent.ID = i.ParentItemID
WHERE oli.OrderID = ?
ORDER BY oli.ID
",
@ -117,7 +117,7 @@
<cfset var rows = []>
<cfloop query="qLI">
<cfset arrayAppend(rows, {
"OrderLineItemID": val(qLI.OrderLineItemID),
"OrderLineItemID": val(qLI.ID),
"ParentOrderLineItemID": val(qLI.ParentOrderLineItemID),
"OrderID": val(qLI.OrderID),
"ItemID": val(qLI.ItemID),
@ -221,7 +221,7 @@
AddressID = ?,
DeliveryFee = ?,
LastEditedOn = ?
WHERE OrderID = ?
WHERE ID = ?
",
[
{ value = OrderTypeID, cfsqltype = "cf_sql_integer" },
@ -241,7 +241,7 @@
AddressID = NULL,
DeliveryFee = 0,
LastEditedOn = ?
WHERE OrderID = ?
WHERE ID = ?
",
[
{ value = OrderTypeID, cfsqltype = "cf_sql_integer" },

14
api/orders/submit.cfm
View file

@ -42,8 +42,8 @@
ItemID,
IsDeleted
FROM OrderLineItems
WHERE OrderID = ?
ORDER BY OrderLineItemID
WHERE ID = ?
ORDER BY ID
",
[ { value = arguments.OrderID, cfsqltype = "cf_sql_integer" } ],
{ datasource = "payfrit" }
@ -55,8 +55,8 @@
<cfset var itemIds = []>
<cfloop query="qLI">
<cfset out.items[qLI.OrderLineItemID] = {
"id": qLI.OrderLineItemID,
<cfset out.items[qLI.ID] = {
"id": qLI.ID,
"parentId": qLI.ParentOrderLineItemID,
"itemId": qLI.ItemID,
"isDeleted": (qLI.IsDeleted EQ true)
@ -64,7 +64,7 @@
<cfif NOT structKeyExists(out.children, qLI.ParentOrderLineItemID)>
<cfset out.children[qLI.ParentOrderLineItemID] = []>
</cfif>
<cfset arrayAppend(out.children[qLI.ParentOrderLineItemID], qLI.OrderLineItemID)>
<cfset arrayAppend(out.children[qLI.ParentOrderLineItemID], qLI.ID)>
<cfset arrayAppend(itemIds, qLI.ItemID)>
</cfloop>
@ -181,7 +181,7 @@
"
SELECT COUNT(*) AS Cnt
FROM OrderLineItems
WHERE OrderID = ?
WHERE ID = ?
AND ParentOrderLineItemID = 0
AND IsDeleted = b'0'
",
@ -253,7 +253,7 @@
StatusID = 1,
SubmittedOn = ?,
LastEditedOn = ?
WHERE OrderID = ?
WHERE ID = ?
",
[
{ value = now(), cfsqltype = "cf_sql_timestamp" },

4
api/orders/updateStatus.cfm
View file

@ -56,7 +56,7 @@
UPDATE Orders
SET StatusID = ?,
LastEditedOn = ?
WHERE OrderID = ?
WHERE ID = ?
", [
{ value = NewStatusID, cfsqltype = "cf_sql_integer" },
{ value = now(), cfsqltype = "cf_sql_timestamp" },
@ -91,7 +91,7 @@
<cftry>
<!--- Check if task already exists for this order to prevent duplicates --->
<cfset qExisting = queryExecute("
SELECT ID FROM Tasks WHERE OrderID = ? LIMIT 1
SELECT ID FROM Tasks WHERE ID = ? LIMIT 1
", [ { value = OrderID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
<cfif qExisting.recordCount EQ 0>

4
api/setup/saveWizard.cfm
View file

@ -71,12 +71,12 @@ try {
response.steps.append("State value received: '" & state & "' (len: " & len(state) & ")");
if (len(state)) {
qState = queryExecute("
SELECT tt_StateID FROM tt_States WHERE Abbreviation = :abbr
SELECT ID FROM tt_States WHERE Abbreviation = :abbr
", { abbr: uCase(state) }, { datasource: "payfrit" });
response.steps.append("State lookup for '" & uCase(state) & "' found " & qState.recordCount & " records");
if (qState.recordCount > 0) {
stateID = qState.tt_StateID;
stateID = qState.ID;
response.steps.append("Using stateID: " & stateID);
}
}

2
api/stripe/createPaymentIntent.cfm
View file

@ -145,7 +145,7 @@ try {
try {
queryExecute("
UPDATE WorkPayoutLedgers wpl
INNER JOIN Tasks t ON t.TaskID = wpl.TaskID AND t.OrderID = :orderID
INNER JOIN Tasks t ON t.ID = wpl.TaskID AND t.OrderID = :orderID
SET wpl.StripePaymentIntentID = :piID
WHERE wpl.Status = 'pending_charge'
AND wpl.StripePaymentIntentID IS NULL

8
api/stripe/webhook.cfm
View file

@ -53,9 +53,9 @@ try {
queryExecute("
UPDATE Orders
SET PaymentStatus = 'paid',
OrderPaymentCompletedOn = NOW(),
PaymentCompletedOn = NOW(),
StatusID = CASE WHEN StatusID = 0 THEN 1 ELSE StatusID END
WHERE OrderID = :orderID
WHERE ID = :orderID
", { orderID: orderID });
writeLog(file="stripe_webhooks", text="Order #orderID# marked as paid");
@ -141,8 +141,8 @@ try {
queryExecute("
UPDATE Orders
SET PaymentStatus = 'failed',
OrderPaymentError = :failureMessage
WHERE OrderID = :orderID
PaymentError = :failureMessage
WHERE ID = :orderID
", {
orderID: orderID,
failureMessage: failureMessage

2
api/tasks/complete.cfm
View file

@ -115,7 +115,7 @@
UPDATE Orders
SET StatusID = 5,
LastEditedOn = NOW()
WHERE OrderID = ?
WHERE ID = ?
", [ { value = qTask.OrderID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
<cfset orderUpdated = true>
</cfif>

66
api/tasks/getDetails.cfm
View file

@ -37,26 +37,26 @@
<!--- Get the task and linked order details --->
<cfset qTask = queryExecute("
SELECT
t.ID,
t.ID AS TaskID,
t.BusinessID,
t.CategoryID,
t.OrderID,
t.TaskTypeID,
t.CreatedOn,
t.ClaimedByUserID,
tc.Name,
tc.Color,
o.ID,
o.UUID,
tc.Name AS CategoryName,
tc.Color AS CategoryColor,
o.ID AS OID,
o.UUID AS OrderUUID,
o.UserID,
o.OrderTypeID,
o.StatusID,
o.StatusID AS OrderStatusID,
o.ServicePointID,
o.Remarks,
o.SubmittedOn,
sp.Name,
sp.TypeID,
u.ID as CustomerUserID,
sp.Name AS ServicePointName,
sp.TypeID AS ServicePointTypeID,
u.ID AS CustomerUserID,
u.FirstName,
u.LastName,
u.ContactNumber
@ -73,7 +73,7 @@
</cfif>
<!--- Build basic task info --->
<cfset taskTitle = "Task ##" & qTask.ID>
<cfset taskTitle = "Task ##" & qTask.TaskID>
<cfif qTask.OrderID GT 0>
<cfset taskTitle = "Order ##" & qTask.OrderID>
</cfif>
@ -95,20 +95,21 @@
</cfif>
<cfset result = {
"TaskID": qTask.ID,
"BusinessID": qTask.BusinessID,
"TaskID": qTask.TaskID,
"TaskBusinessID": qTask.BusinessID,
"TaskCategoryID": qTask.CategoryID,
"Title": taskTitle,
"CreatedOn": dateFormat(qTask.CreatedOn, "yyyy-mm-dd") & "T" & timeFormat(qTask.CreatedOn, "HH:mm:ss"),
"StatusID": qTask.ClaimedByUserID GT 0 ? 1 : 0,
"Name": len(trim(qTask.Name)) ? qTask.Name : "General",
"Color": len(trim(qTask.Color)) ? qTask.Color : "##888888",
"TaskTypeID": qTask.TaskTypeID ?: 1,
"TaskTitle": taskTitle,
"TaskCreatedOn": dateFormat(qTask.CreatedOn, "yyyy-mm-dd") & "T" & timeFormat(qTask.CreatedOn, "HH:mm:ss"),
"TaskStatusID": qTask.ClaimedByUserID GT 0 ? 1 : 0,
"TaskCategoryName": len(trim(qTask.CategoryName)) ? qTask.CategoryName : "General",
"TaskCategoryColor": len(trim(qTask.CategoryColor)) ? qTask.CategoryColor : "##888888",
"OrderID": qTask.OrderID ?: 0,
"Remarks": qTask.Remarks ?: "",
"SubmittedOn": isDate(qTask.SubmittedOn) ? (dateFormat(qTask.SubmittedOn, "yyyy-mm-dd") & "T" & timeFormat(qTask.SubmittedOn, "HH:mm:ss")) : "",
"OrderRemarks": qTask.Remarks ?: "",
"OrderSubmittedOn": isDate(qTask.SubmittedOn) ? (dateFormat(qTask.SubmittedOn, "yyyy-mm-dd") & "T" & timeFormat(qTask.SubmittedOn, "HH:mm:ss")) : "",
"ServicePointID": qTask.ServicePointID ?: 0,
"Name": qTask.Name ?: "",
"TypeID": qTask.TypeID ?: 0,
"ServicePointName": qTask.ServicePointName ?: "",
"ServicePointTypeID": qTask.ServicePointTypeID ?: 0,
"DeliveryAddress": "",
"DeliveryLat": 0,
"DeliveryLng": 0,
@ -117,8 +118,9 @@
"CustomerLastName": qTask.LastName ?: "",
"CustomerPhone": qTask.ContactNumber ?: "",
"CustomerPhotoUrl": customerPhotoUrl,
"UUID": "",
"LineItems": []
"BeaconUUID": "",
"LineItems": [],
"TableMembers": []
}>
<!--- Get beacon UUID for the service point (for auto-completion on Works app) --->
@ -132,7 +134,7 @@
LIMIT 1
", [ { value = qTask.ServicePointID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
<cfif qBeacon.recordCount GT 0>
<cfset result.UUID = qBeacon.UUID>
<cfset result.BeaconUUID = qBeacon.UUID>
</cfif>
</cfif>
@ -140,16 +142,16 @@
<cfif qTask.OrderID GT 0>
<cfset qLineItems = queryExecute("
SELECT
oli.ID,
oli.ID AS OrderLineItemID,
oli.ParentOrderLineItemID,
oli.ItemID,
oli.Price,
oli.Price AS LineItemPrice,
oli.Quantity,
oli.Remark,
i.ID,
i.Name,
i.ID AS IID,
i.Name AS ItemName,
i.ParentItemID,
i.Price,
i.Price AS ItemPrice,
i.IsCheckedByDefault
FROM OrderLineItems oli
INNER JOIN Items i ON i.ID = oli.ItemID
@ -162,9 +164,9 @@
<cfset arrayAppend(result.LineItems, {
"LineItemID": qLineItems.OrderLineItemID,
"ParentLineItemID": qLineItems.ParentOrderLineItemID,
"ItemID": qLineItems.ID,
"Name": qLineItems.Name,
"Price": qLineItems.Price,
"ItemID": qLineItems.ItemID,
"ItemName": qLineItems.ItemName,
"ItemPrice": qLineItems.LineItemPrice,
"Quantity": qLineItems.Quantity,
"Remark": qLineItems.Remark,
"IsModifier": qLineItems.ParentOrderLineItemID GT 0

12
api/tasks/listMine.cfm
View file

@ -77,12 +77,12 @@
t.ClaimedByUserID,
t.ClaimedOn,
t.CompletedOn,
tc.Name,
tc.Color,
tc.Name AS CategoryName,
tc.Color AS CategoryColor,
tt.Name AS TaskTypeName,
tt.Icon AS TaskTypeIcon,
tt.Color AS TaskTypeColor,
b.Name
b.Name AS BusinessName
FROM Tasks t
LEFT JOIN TaskCategories tc ON tc.ID = t.CategoryID
LEFT JOIN tt_TaskTypes tt ON tt.ID = t.TaskTypeID
@ -112,7 +112,7 @@
<cfset arrayAppend(tasks, {
"TaskID": qTasks.ID,
"BusinessID": qTasks.BusinessID,
"Name": qTasks.Name,
"BusinessName": qTasks.BusinessName ?: "",
"TaskCategoryID": qTasks.CategoryID,
"TaskTypeID": qTasks.TaskTypeID,
"Title": taskTitle,
@ -123,8 +123,8 @@
"StatusID": (isNull(qTasks.CompletedOn) OR len(trim(qTasks.CompletedOn)) EQ 0) ? 1 : 3,
"SourceType": "order",
"SourceID": qTasks.OrderID,
"Name": len(trim(qTasks.Name)) ? qTasks.Name : "General",
"Color": len(trim(qTasks.Color)) ? qTasks.Color : "##888888",
"CategoryName": len(trim(qTasks.CategoryName)) ? qTasks.CategoryName : "General",
"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"

8
api/tasks/listPending.cfm
View file

@ -65,8 +65,8 @@
t.Details,
t.CreatedOn,
t.ClaimedByUserID,
tc.Name,
tc.Color,
tc.Name AS CategoryName,
tc.Color AS CategoryColor,
tt.Name AS TaskTypeName,
tt.Icon AS TaskTypeIcon,
tt.Color AS TaskTypeColor
@ -103,8 +103,8 @@
"StatusID": qTasks.ClaimedByUserID GT 0 ? 1 : 0,
"SourceType": "order",
"SourceID": qTasks.OrderID,
"Name": len(trim(qTasks.Name)) ? qTasks.Name : "General",
"Color": len(trim(qTasks.Color)) ? qTasks.Color : "##888888",
"CategoryName": len(trim(qTasks.CategoryName)) ? qTasks.CategoryName : "General",
"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"

4
api/tasks/listTypes.cfm
View file

@ -46,7 +46,7 @@ try {
// Get task types for this business
q = queryExecute("
SELECT
tt_TaskTypeID as TaskTypeID,
ID as TaskTypeID,
Name as TaskTypeName,
Description as TaskTypeDescription,
Icon as TaskTypeIcon,
@ -54,7 +54,7 @@ try {
SortOrder as SortOrder
FROM tt_TaskTypes
WHERE BusinessID = :businessID
ORDER BY SortOrder, tt_TaskTypeID
ORDER BY SortOrder, ID
", {
businessID: { value: businessID, cfsqltype: "cf_sql_integer" }
}, { datasource: "payfrit" });

3
api/workers/ledger.cfm
View file

@ -26,7 +26,7 @@ try {
// Get ledger entries (most recent first)
qLedger = queryExecute("
SELECT TaskID, GrossEarningsCents, ActivationWithheldCents,
SELECT ID, TaskID, GrossEarningsCents, ActivationWithheldCents,
NetTransferCents, Status, CreatedAt
FROM WorkPayoutLedgers
WHERE UserID = :userID
@ -47,6 +47,7 @@ try {
ledgerEntries = [];
for (row in qLedger) {
arrayAppend(ledgerEntries, {
"ID": row.ID,
"TaskID": row.TaskID,
"GrossEarningsCents": row.GrossEarningsCents,
"ActivationWithheldCents": row.ActivationWithheldCents,

2
api/workers/myBusinesses.cfm
View file

@ -54,7 +54,7 @@
<cfloop query="qBusinesses">
<cfset arrayAppend(businesses, {
"EmployeeID": qBusinesses.EmployeeID,
"BusinessID": qBusinesses.ID,
"BusinessID": qBusinesses.BusinessID,
"Name": qBusinesses.Name,
"Address": "",
"City": "",

2
confirm.cfm
View file

@ -18,7 +18,7 @@
<cfquery name="update_Uer" datasource="#application.datasource#" dbtype="ODBC">
UPDATE Users
SET IsEmailVerified = 1
WHERE UserID = '#get_user.ID#'
WHERE ID = #get_user.ID#
</cfquery>
<!--- might as well log them in since they confirmed successfully --->

12
confirm_email.cfm
View file

@ -6,7 +6,8 @@
<cfset request.Userid = 0>
<cfquery name="get_user" datasource="#application.datasource#">
ID AS UserID
SELECT ID AS UserID, EmailAddress
FROM Users
WHERE UUID = '#url.UUID#'
AND
IsEmailVerified = 0
@ -19,7 +20,7 @@
<cfquery name="update_User" datasource="#application.datasource#">
UPDATE Users
SET IsEmailVerified = 1
WHERE UserID = '#get_user.ID#'
WHERE ID = '#get_user.ID#'
</cfquery>
<!--- might as well log them in since they confirmed successfully, probably a bad idea but not worried about it for now --->
@ -48,7 +49,8 @@
<cfelse>
<cfquery name="get_confirmed_customer" datasource="#application.datasource#">
ID AS UserID
SELECT ID AS UserID, ContactNumber
FROM Users
WHERE UUID = '#url.UUID#'
AND
IsEmailVerified = 0
@ -61,7 +63,7 @@
<cfquery name="update_User" datasource="#application.datasource#">
UPDATE Users
SET IsEmailVerified = 1
WHERE UserID = '#get_confirmed_customer.UserID#'
WHERE ID = '#get_confirmed_customer.UserID#'
</cfquery>
your email was confirmed but we still need to verify your mobile number!<br><br>
@ -71,7 +73,7 @@
<cfquery name="update_OPT_confirm" datasource="#application.datasource#">
UPDATE Users
SET MobileVerifyCode = '#customer_OPT_confirm#'
WHERE UserID = #get_confirmed_customer.UserID#
WHERE ID = #get_confirmed_customer.UserID#
</cfquery>
we sent a six-digit code to <cfoutput>#get_confirmed_customer.ContactNumber#</cfoutput>, please input that code here:<br><br>

8
confirm_mobile.cfm
View file

@ -22,7 +22,7 @@
<cfquery name="confirm_mobile" datasource="#application.datasource#" dbtype="ODBC">
UPDATE Users
SET IsContactVerified = 1
WHERE UserID = #check_valid.UserID#
WHERE ID = #check_valid.ID#
</cfquery>
<cfif check_valid.IsEmailVerified eq 1>
@ -58,14 +58,14 @@
<cfquery name="confirm_mobile" datasource="#application.datasource#" dbtype="ODBC">
UPDATE Users
SET IsContactVerified = 1
WHERE UserID = #check_valid_with_email_confirmed.UserID#
WHERE ID = #check_valid_with_email_confirmed.ID#
</cfquery>
<!--- might as well log them in since they confirmed successfully, probably a bad idea but not worried about it for now --->
<!--- Update the session variables and request variables --->
<cflock timeout="60" throwontimeout="Yes" type="EXCLUSIVE" scope="SESSION">
<cfset session.UserID = #check_valid_with_email_confirmed.UserID#>
<cfset session.UserID = #check_valid_with_email_confirmed.ID#>
<!--- Re-duplicate them --->
<cfset request.UserID = Duplicate(session.UserID)>
</cflock>
@ -73,7 +73,7 @@
<cfmodule template="#application.wwwrootprefix#modules/notifier.cfm"
domain="box.payfrit.com"
from_email="admin@payfrit.com"
to_email="#check_valid_with_email_confirmed.UserEmail#"
to_email="#check_valid_with_email_confirmed.EmailAddress#"
subject="Welcome to Payfrit!"
email_body="Thanks for confirming your Payfrit account! Go order food!"
>

43
index.cfm
View file

@ -21,7 +21,7 @@
<cfquery name="ack_order" datasource="#application.datasource#">
UPDATE Orders
SET StatusID = 2
WHERE OrderID = #form.OrderID#
WHERE ID = #form.OrderID#
</cfquery>
<cfquery name="ack_order_lineitems" datasource="#application.datasource#">
@ -45,7 +45,7 @@
<cfquery name="ack_order_lineitem" datasource="#application.datasource#">
UPDATE OrderLineItems
SET StatusID = 2
WHERE OrderID = #form.OrderLineItemID#
WHERE ID = #form.OrderLineItemID#
</cfquery>
<cfoutput>
@ -68,7 +68,7 @@
<cfquery name="ready_order" datasource="#application.datasource#">
UPDATE Orders
SET StatusID = 3
WHERE OrderID = #form.OrderID#
WHERE ID = #form.OrderID#
</cfquery>
<cfquery name="ready_order_lineitems" datasource="#application.datasource#">
@ -92,7 +92,7 @@
<cfquery name="ready_order_lineitem" datasource="#application.datasource#">
UPDATE OrderLineItems
SET StatusID = 3
WHERE OrderLineItemID = #form.OrderLineItemID#
WHERE ID = #form.OrderLineItemID#
</cfquery>
<cfoutput>
@ -626,10 +626,9 @@
</TD>
</TR>
<CFQUERY name="get_States" datasource="#application.datasource#">
SELECT tt_StateID, Name
SELECT ID, Name
FROM tt_States
WHERE tt_StateCountryID = 1 <!--- only USA --->
ORDER BY tt_StateSortOrder
ORDER BY Name
</CFQUERY>
<TR>
<TD>
@ -639,7 +638,7 @@
<select name="StateID">
<option value="0">Please Select</option>
<cfoutput query=#get_States#>
<option value="#tt_StateID#" <cfif #values.StateID# EQ #get_States.tt_StateID#>Selected</cfif>>#Name#</option>
<option value="#ID#" <cfif #values.StateID# EQ #get_States.ID#>Selected</cfif>>#Name#</option>
</cfoutput>
</select>
</TD>
@ -661,17 +660,16 @@
</TD>
</TR>
<CFQUERY name="get_OrderTypes" datasource="#application.datasource#">
SELECT tt_OrderTypeID, tt_OrderTypeName
SELECT ID, Name
FROM tt_OrderTypes
WHERE tt_OrderTypeSortOrder IS NOT NULL
ORDER BY tt_OrderTypeSortOrder
ORDER BY ID
</CFQUERY>
<TR>
<TD valign="top">
Select Order Types:
</TD>
<TD>
<cfoutput query="get_OrderTypes"><input type="CHECKBOX" name="BusinessOrdertypes" value="#get_OrderTypes.tt_OrderTypeID#"<cfif find(get_OrderTypes.tt_OrderTypeID, values.BusinessOrdertypes) GT 0> CHECKED</cfif>>#get_OrderTypes.tt_OrderTypeName#<br></cfoutput>
<cfoutput query="get_OrderTypes"><input type="CHECKBOX" name="BusinessOrdertypes" value="#get_OrderTypes.ID#"<cfif find(get_OrderTypes.ID, values.BusinessOrdertypes) GT 0> CHECKED</cfif>>#get_OrderTypes.Name#<br></cfoutput>
</TD>
</TR>
<TR>
@ -825,7 +823,7 @@
FROM Hours H, tt_Days D
WHERE BusinessID = #request.BusinessID#
AND
H.DayID = D.tt_DayID
H.DayID = D.ID
ORDER BY DayID
</CFQUERY>
@ -1197,7 +1195,7 @@
FROM Hours H, tt_Days D
WHERE BusinessID = #request.BusinessID#
AND
H.DayID = D.tt_DayID
H.DayID = D.ID
ORDER BY DayID
</CFQUERY>
@ -1238,7 +1236,7 @@
FROM Hours H, tt_Days D
WHERE BusinessID = #request.BusinessID#
AND
H.DayID = D.tt_DayID
H.DayID = D.ID
ORDER BY DayID
</CFQUERY>
@ -3436,10 +3434,9 @@
</TD>
</TR>
<CFQUERY name="get_States" datasource="#application.datasource#">
SELECT tt_StateID, Name
SELECT ID, Name
FROM tt_States
WHERE tt_StateCountryID = 1 <!--- only USA --->
ORDER BY tt_StateSortOrder
ORDER BY Name
</CFQUERY>
<TR>
<TD>
@ -3449,7 +3446,7 @@
<select name="StateID">
<option value="0">Please Select</option>
<cfoutput query=#get_States#>
<option value="#tt_StateID#" <cfif #values.StateID# EQ #get_States.tt_StateID#>Selected</cfif>>#Name#</option>
<option value="#ID#" <cfif #values.StateID# EQ #get_States.ID#>Selected</cfif>>#Name#</option>
</cfoutput>
</select>
</TD>
@ -3564,7 +3561,7 @@
<CFQUERY name="update_item" datasource="#application.datasource#">
UPDATE Users
SET ImageExtension = '#cffile.ClientFileExt#'
WHERE UserID = #request.UserID#
WHERE ID = #request.UserID#
</CFQUERY>
</cfif>
@ -3618,7 +3615,7 @@
<CFQUERY name="update_item" datasource="#application.datasource#">
UPDATE Users
SET ImageExtension = null
WHERE UserID = #request.UserID#
WHERE ID = #request.UserID#
</CFQUERY>
<cfoutput>
@ -3638,7 +3635,7 @@
UPDATE Users
SET FirstName = '#values.FirstName#',
LastName = '#values.LastName#'
WHERE UserID = #request.UserID#
WHERE ID = #request.UserID#
</CFQUERY>
<CFQUERY name="update_user_address" datasource="#application.datasource#">
@ -3648,7 +3645,7 @@
City = '#values.City#',
StateID = #values.StateID#,
ZIPCode = '#values.ZIPCode#'
WHERE UserID = #request.UserID#
WHERE ID = #request.UserID#
AND
AddressTypeID = 1
</CFQUERY>

8
receipt/index.cfm
View file

@ -43,9 +43,9 @@
</cfquery>
<cfquery name="get_order_type">
SELECT tt_OrderTypeName
SELECT Name AS tt_OrderTypeName
FROM tt_OrderTypes
WHERE tt_OrderTypeID = <cfqueryparam value="#get_order_info.OrderTypeID#" cfsqltype="cf_sql_integer">
WHERE ID =<cfqueryparam value="#get_order_info.OrderTypeID#" cfsqltype="cf_sql_integer">
</cfquery>
<cfif get_order_info.OrderTypeID EQ 3>
@ -53,7 +53,7 @@
SELECT A.Line1
FROM Addresses A, Orders O
WHERE O.UUID = <cfqueryparam value="#url.UUID#" cfsqltype="cf_sql_varchar">
AND A.AddressID = O.AddressID
AND A.ID = O.AddressID
</cfquery>
</cfif>
@ -257,7 +257,7 @@
SELECT I.Name, I.Price, I.ParentItemID
FROM OrderLineItems OL
JOIN Items I ON I.ID = OL.ItemID
WHERE OL.ParentOrderLineItemID = <cfqueryparam value="#get_parent_items.OrderLineItemID#" cfsqltype="cf_sql_integer">
WHERE OL.ParentOrderLineItemID = <cfqueryparam value="#get_parent_items.ID#" cfsqltype="cf_sql_integer">
ORDER BY OL.AddedOn DESC
</cfquery>

4
show_order.cfm
View file

@ -24,9 +24,9 @@ WHERE O.UUID = '#form.UUID#'
AND
<cfif url.is_admin_view EQ 0>O.ID = T.OrderID
AND</cfif>
<cfif get_order_info.OrderTypeID eq 3>A.AddressID = O.AddressID
<cfif get_order_info.OrderTypeID eq 3>A.ID = O.AddressID
AND </cfif>
ttO.tt_OrderTypeID = O.OrderTypeID
ttO.ID = O.OrderTypeID
ORDER BY AddedOn DESC
</cfquery>