From 8acf2f32490f29cd91a07d538f0ab8cb6967428d Mon Sep 17 00:00:00 2001 From: John Mizerek Date: Sat, 31 Jan 2026 20:03:15 -0800 Subject: [PATCH] Complete DB column normalization: strip redundant table-name prefixes from all SQL queries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updated 70 files to match the payfrit_dev schema where columns like BusinessName→Name, UserFirstName→FirstName, AddressCity→City, etc. PKs renamed to ID, FKs keep referenced table name (e.g. BusinessID). SQL aliases preserve original JSON response keys for API compatibility. Co-Authored-By: Claude Opus 4.5 --- api/addresses/add.cfm | 12 +++---- api/addresses/list.cfm | 28 +++++++-------- api/addresses/setDefault.cfm | 4 +-- api/addresses/states.cfm | 4 +-- api/admin/addDrinkModifiers.cfm | 16 ++++----- api/admin/beaconStatus.cfm | 18 +++++----- api/admin/checkBigDeans.cfm | 4 +-- api/admin/cleanupBeacons.cfm | 12 +++---- api/admin/cleanupDuplicateEmployees.cfm | 4 +-- api/admin/cleanupForLazyDaisy.cfm | 10 +++--- api/admin/copyDrinksToBigDeans.cfm | 14 ++++---- api/admin/createBeacons.cfm | 16 ++++----- api/admin/createMenusTable.cfm | 2 +- api/admin/debugBusinesses.cfm | 10 +++--- api/admin/debugUserByPhone.cfm | 4 +-- api/admin/geocode.cfm | 44 +++++++++++------------ api/admin/migrateToCategories.cfm | 14 ++++---- api/admin/quickTasks/delete.cfm | 2 +- api/admin/quickTasks/save.cfm | 2 +- api/admin/scheduledTasks/delete.cfm | 2 +- api/admin/scheduledTasks/runDue.cfm | 2 +- api/admin/scheduledTasks/save.cfm | 2 +- api/admin/scheduledTasks/toggle.cfm | 2 +- api/admin/setEmployeeActive.cfm | 6 ++-- api/admin/setupBeaconTables.cfm | 20 +++++------ api/admin/setupBigDeansInfo.cfm | 28 +++++++-------- api/admin/setupLazyDaisyBeacons.cfm | 16 ++++----- api/admin/setupStations.cfm | 6 ++-- api/admin/switchBeacons.cfm | 6 ++-- api/admin/updateBeaconMapping.cfm | 6 ++-- api/assignments/list.cfm | 10 +++--- api/assignments/save.cfm | 18 +++++----- api/auth/validateToken.cfm | 4 +-- api/beacons/getBusinessFromBeacon.cfm | 40 ++++++++++----------- api/beacons/lookup.cfm | 22 ++++++------ api/businesses/get.cfm | 46 ++++++++++++------------- api/businesses/getChildren.cfm | 10 +++--- api/businesses/list.cfm | 24 ++++++------- api/businesses/saveBrandColor.cfm | 4 +-- api/businesses/setHiring.cfm | 4 +-- api/businesses/update.cfm | 28 +++++++-------- api/chat/getMessages.cfm | 8 ++--- api/menu/getForBuilder.cfm | 2 +- api/menu/items.cfm | 2 +- api/menu/uploadHeader.cfm | 4 +-- api/orders/getActiveCart.cfm | 12 +++---- api/orders/getCart.cfm | 6 ++-- api/orders/getDetail.cfm | 28 +++++++-------- api/orders/getOrCreateCart.cfm | 12 +++---- api/orders/getPendingForUser.cfm | 8 ++--- api/orders/history.cfm | 4 +-- api/orders/listForKDS.cfm | 20 +++++------ api/orders/setLineItem.cfm | 4 +-- api/orders/setOrderType.cfm | 8 ++--- api/portal/getSettings.cfm | 20 +++++------ api/portal/myBusinesses.cfm | 10 +++--- api/portal/team.cfm | 12 +++---- api/portal/updateSettings.cfm | 36 +++++++++---------- api/ratings/createAdminRating.cfm | 2 +- api/ratings/listForAdmin.cfm | 12 +++---- api/setup/checkDuplicate.cfm | 28 +++++++-------- api/setup/saveWizard.cfm | 16 ++++----- api/stripe/createPaymentIntent.cfm | 2 +- api/stripe/onboard.cfm | 4 +-- api/stripe/status.cfm | 8 ++--- api/tasks/getDetails.cfm | 18 +++++----- api/tasks/listMine.cfm | 4 +-- api/users/search.cfm | 30 ++++++++-------- api/workers/myBusinesses.cfm | 8 ++--- confirm_email.cfm | 8 ++--- 70 files changed, 431 insertions(+), 431 deletions(-) diff --git a/api/addresses/add.cfm b/api/addresses/add.cfm index 30fdf59..247daf7 100644 --- a/api/addresses/add.cfm +++ b/api/addresses/add.cfm @@ -57,7 +57,7 @@ try { if (setAsDefault) { queryExecute(" UPDATE Addresses - SET AddressIsDefaultDelivery = 0 + SET IsDefaultDelivery = 0 WHERE UserID = :userId AND (BusinessID = 0 OR BusinessID IS NULL) AND AddressTypeID = :typeId @@ -68,18 +68,18 @@ try { } // Get next AddressID - qNext = queryExecute("SELECT IFNULL(MAX(AddressID), 0) + 1 AS NextID FROM Addresses", {}, { datasource: "payfrit" }); + qNext = queryExecute("SELECT IFNULL(MAX(ID), 0) + 1 AS NextID FROM Addresses", {}, { datasource: "payfrit" }); newAddressId = qNext.NextID; // Insert new address queryExecute(" INSERT INTO Addresses ( - AddressID, + ID, UserID, BusinessID, AddressTypeID, - AddressLabel, - AddressIsDefaultDelivery, + Label, + IsDefaultDelivery, Line1, Line2, City, @@ -117,7 +117,7 @@ try { }, { datasource: "payfrit" }); // Get state info for response - qState = queryExecute("SELECT tt_StateAbbreviation as StateAbbreviation, tt_StateName as StateName FROM tt_States WHERE tt_StateID = :stateId", { + qState = queryExecute("SELECT Abbreviation as StateAbbreviation, Name as StateName FROM tt_States WHERE ID = :stateId", { stateId: { value: stateId, cfsqltype: "cf_sql_integer" } }, { datasource: "payfrit" }); diff --git a/api/addresses/list.cfm b/api/addresses/list.cfm index d80fe0b..4a91b9b 100644 --- a/api/addresses/list.cfm +++ b/api/addresses/list.cfm @@ -49,22 +49,22 @@ try { // Get user's delivery addresses qAddresses = queryExecute(" SELECT - a.AddressID AS ID, - a.AddressIsDefaultDelivery AS IsDefaultDelivery, - a.AddressLine1 AS Line1, - a.AddressLine2 AS Line2, - a.AddressCity AS City, - a.AddressStateID AS StateID, - s.tt_StateAbbreviation as StateAbbreviation, - s.tt_StateName as StateName, - a.AddressZIPCode AS ZIPCode + a.ID, + a.IsDefaultDelivery, + a.Line1, + a.Line2, + a.City, + a.StateID, + s.Abbreviation as StateAbbreviation, + s.Name as StateName, + a.ZIPCode FROM Addresses a - LEFT JOIN tt_States s ON a.AddressStateID = s.tt_StateID - WHERE a.AddressUserID = :userId - AND (a.AddressBusinessID = 0 OR a.AddressBusinessID IS NULL) + LEFT JOIN tt_States s ON a.StateID = s.ID + WHERE a.UserID = :userId + AND (a.BusinessID = 0 OR a.BusinessID IS NULL) AND a.AddressTypeID = 2 - AND a.AddressIsDeleted = 0 - ORDER BY a.AddressIsDefaultDelivery DESC, a.AddressID DESC + AND a.IsDeleted = 0 + ORDER BY a.IsDefaultDelivery DESC, a.ID DESC ", { userId: { value = userId, cfsqltype = "cf_sql_integer" } }); diff --git a/api/addresses/setDefault.cfm b/api/addresses/setDefault.cfm index b41700f..ac4bae0 100644 --- a/api/addresses/setDefault.cfm +++ b/api/addresses/setDefault.cfm @@ -63,7 +63,7 @@ try { // Clear all defaults for this user queryExecute(" UPDATE Addresses - SET AddressIsDefaultDelivery = 0 + SET IsDefaultDelivery = 0 WHERE UserID = :userId AND (BusinessID = 0 OR BusinessID IS NULL) AND AddressTypeID LIKE '%2%' @@ -74,7 +74,7 @@ try { // Set this one as default queryExecute(" UPDATE Addresses - SET AddressIsDefaultDelivery = 1 + SET IsDefaultDelivery = 1 WHERE ID = :addressId ", { addressId: { value: addressId, cfsqltype: "cf_sql_integer" } diff --git a/api/addresses/states.cfm b/api/addresses/states.cfm index a065293..ed81780 100644 --- a/api/addresses/states.cfm +++ b/api/addresses/states.cfm @@ -6,9 +6,9 @@ try { qStates = queryExecute(" - SELECT tt_StateID as StateID, tt_StateAbbreviation as StateAbbreviation, tt_StateName as StateName + SELECT ID as StateID, Abbreviation as StateAbbreviation, Name as StateName FROM tt_States - ORDER BY tt_StateName + ORDER BY Name ", {}, { datasource: "payfrit" }); states = []; diff --git a/api/admin/addDrinkModifiers.cfm b/api/admin/addDrinkModifiers.cfm index 81b24d6..7d62e40 100644 --- a/api/admin/addDrinkModifiers.cfm +++ b/api/admin/addDrinkModifiers.cfm @@ -25,14 +25,14 @@ try { abort; } - fountainId = qFountain.ItemID; + fountainId = qFountain.ID; response["FountainSodaID"] = fountainId; // Update Fountain Soda to require child selection and be collapsible queryExecute(" UPDATE Items SET RequiresChildSelection = 1, IsCollapsible = 1 - WHERE ItemID = :itemId + WHERE ID = :itemId ", { itemId: fountainId }, { datasource: "payfrit" }); // Check if modifiers already exist @@ -48,12 +48,12 @@ try { } // Add Size group - qMaxItem = queryExecute("SELECT COALESCE(MAX(ItemID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" }); + qMaxItem = queryExecute("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" }); sizeGroupId = qMaxItem.nextId; queryExecute(" INSERT INTO Items ( - ItemID, BusinessID, CategoryID, ParentItemID, + ID, BusinessID, CategoryID, ParentItemID, Name, Description, Price, IsActive, SortOrder, IsCollapsible, RequiresChildSelection, MaxNumSelectionReq, AddedOn @@ -77,7 +77,7 @@ try { sizesAdded = 0; for (size in sizes) { - qMaxItem = queryExecute("SELECT COALESCE(MAX(ItemID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" }); + qMaxItem = queryExecute("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" }); queryExecute(" INSERT INTO Items ( ItemID, BusinessID, CategoryID, ParentItemID, @@ -103,12 +103,12 @@ try { } // Add Type/Flavor group - qMaxItem = queryExecute("SELECT COALESCE(MAX(ItemID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" }); + qMaxItem = queryExecute("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" }); typeGroupId = qMaxItem.nextId; queryExecute(" INSERT INTO Items ( - ItemID, BusinessID, CategoryID, ParentItemID, + ID, BusinessID, CategoryID, ParentItemID, Name, Description, Price, IsActive, SortOrder, IsCollapsible, RequiresChildSelection, MaxNumSelectionReq, AddedOn @@ -136,7 +136,7 @@ try { typesAdded = 0; for (type in types) { - qMaxItem = queryExecute("SELECT COALESCE(MAX(ItemID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" }); + qMaxItem = queryExecute("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" }); queryExecute(" INSERT INTO Items ( ItemID, BusinessID, CategoryID, ParentItemID, diff --git a/api/admin/beaconStatus.cfm b/api/admin/beaconStatus.cfm index c21e3b1..a34a137 100644 --- a/api/admin/beaconStatus.cfm +++ b/api/admin/beaconStatus.cfm @@ -9,14 +9,14 @@ q = queryExecute(" b.ID, b.UUID, b.Name, - sp_link.ServicePointBusinessID AS BusinessID, - sp_link.ServicePointID, - biz.BusinessName, - sp.ServicePointName AS Name + sp_link.BusinessID AS BusinessID, + sp_link.ID AS ServicePointID, + biz.Name, + sp.Name AS Name FROM Beacons b LEFT JOIN ServicePoints sp_link ON sp_link.BeaconID = b.ID - LEFT JOIN Businesses biz ON biz.BusinessID = sp_link.ServicePointBusinessID - LEFT JOIN ServicePoints sp ON sp.ServicePointID = sp_link.ServicePointID + LEFT JOIN Businesses biz ON biz.ID = sp_link.BusinessID + LEFT JOIN ServicePoints sp ON sp.ID = sp_link.ID WHERE b.IsActive = 1 ORDER BY b.ID ", {}, { datasource: "payfrit" }); @@ -36,10 +36,10 @@ for (row in q) { // Also get service points for reference spQuery = queryExecute(" - SELECT sp.ServicePointID AS ID, sp.ServicePointName AS Name, sp.ServicePointBusinessID AS BusinessID, b.BusinessName AS Name + SELECT sp.ID, sp.Name AS Name, sp.BusinessID AS BusinessID, b.Name AS Name FROM ServicePoints sp - JOIN Businesses b ON b.BusinessID = sp.ServicePointBusinessID - ORDER BY sp.ServicePointBusinessID, sp.ServicePointID + JOIN Businesses b ON b.ID = sp.BusinessID + ORDER BY sp.BusinessID, sp.ID ", {}, { datasource: "payfrit" }); servicePoints = []; diff --git a/api/admin/checkBigDeans.cfm b/api/admin/checkBigDeans.cfm index 250f8f1..ef674a7 100644 --- a/api/admin/checkBigDeans.cfm +++ b/api/admin/checkBigDeans.cfm @@ -5,9 +5,9 @@ // Check Big Dean's owner q = queryExecute(" - SELECT b.BusinessID AS ID, b.BusinessName AS Name, b.BusinessUserID AS UserID + SELECT b.ID, b.Name, b.UserID FROM Businesses b - WHERE b.BusinessID = 27 + WHERE b.ID = 27 ", {}, { datasource: "payfrit" }); // Get users diff --git a/api/admin/cleanupBeacons.cfm b/api/admin/cleanupBeacons.cfm index 73fcfeb..ddb1319 100644 --- a/api/admin/cleanupBeacons.cfm +++ b/api/admin/cleanupBeacons.cfm @@ -18,7 +18,7 @@ try { queryExecute(" UPDATE ServicePoints SET BeaconID = NULL, AssignedByUserID = NULL - WHERE BeaconID IN (7, 8, 9) AND ServicePointBusinessID = :bizId + WHERE BeaconID IN (7, 8, 9) AND BusinessID = :bizId ", { bizId: lazyDaisyID }, { datasource: "payfrit" }); response.steps.append("Unassigned beacons 7, 8, 9 from service points"); @@ -50,13 +50,13 @@ try { // Get final status qFinal = queryExecute(" - SELECT sp.ServicePointID AS ServicePointID, sp.BeaconID, sp.ServicePointBusinessID AS BusinessID, - b.Name AS BeaconName, b.UUID, sp.ServicePointName AS ServicePointName, - biz.BusinessName AS BusinessName + SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.BusinessID AS BusinessID, + b.Name AS BeaconName, b.UUID, sp.Name AS ServicePointName, + biz.Name AS BusinessName FROM ServicePoints sp JOIN Beacons b ON b.ID = sp.BeaconID - JOIN Businesses biz ON biz.BusinessID = sp.ServicePointBusinessID - WHERE sp.ServicePointBusinessID = :bizId AND sp.BeaconID IS NOT NULL + JOIN Businesses biz ON biz.ID = sp.BusinessID + WHERE sp.BusinessID = :bizId AND sp.BeaconID IS NOT NULL ORDER BY sp.BeaconID ", { bizId: lazyDaisyID }, { datasource: "payfrit" }); diff --git a/api/admin/cleanupDuplicateEmployees.cfm b/api/admin/cleanupDuplicateEmployees.cfm index 3158da0..40e76d8 100644 --- a/api/admin/cleanupDuplicateEmployees.cfm +++ b/api/admin/cleanupDuplicateEmployees.cfm @@ -57,9 +57,9 @@ try { // Get remaining employees qRemaining = queryExecute(" - SELECT e.ID, e.UserID, u.UserFirstName AS FirstName, u.UserLastName AS LastName + SELECT e.ID, e.UserID, u.FirstName, u.LastName FROM Employees e - JOIN Users u ON e.UserID = u.UserID + JOIN Users u ON e.UserID = u.ID WHERE e.BusinessID = ? ORDER BY e.ID ", [{ value: businessId, cfsqltype: "cf_sql_integer" }], { datasource: "payfrit" }); diff --git a/api/admin/cleanupForLazyDaisy.cfm b/api/admin/cleanupForLazyDaisy.cfm index c7b515b..d13e03b 100644 --- a/api/admin/cleanupForLazyDaisy.cfm +++ b/api/admin/cleanupForLazyDaisy.cfm @@ -19,7 +19,7 @@ try { // Get list of businesses to delete qBiz = queryExecute(" - SELECT BusinessID AS ID, BusinessName AS Name FROM Businesses WHERE BusinessID != :keepID + SELECT ID, Name FROM Businesses WHERE ID != :keepID ", { keepID: keepBusinessID }, { datasource: "payfrit" }); deletedBusinesses = []; @@ -100,17 +100,17 @@ try { // Finally delete the businesses themselves queryExecute(" - DELETE FROM Businesses WHERE BusinessID != :keepID + DELETE FROM Businesses WHERE ID != :keepID ", { keepID: keepBusinessID }, { datasource: "payfrit" }); response.steps.append("Deleted " & arrayLen(deletedBusinesses) & " businesses"); // Get beacon status qBeacons = queryExecute(" - SELECT sp.ServicePointID AS ServicePointID, sp.BeaconID, sp.ServicePointBusinessID AS BusinessID, - b.UUID, biz.BusinessName AS BusinessName, sp.ServicePointName AS ServicePointName + SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.ServicePointBusinessID AS BusinessID, + b.UUID, biz.Name AS BusinessName, sp.ServicePointName AS ServicePointName FROM ServicePoints sp JOIN Beacons b ON b.ID = sp.BeaconID - JOIN Businesses biz ON biz.BusinessID = sp.ServicePointBusinessID + JOIN Businesses biz ON biz.ID = sp.ServicePointBusinessID WHERE sp.BeaconID IS NOT NULL ", {}, { datasource: "payfrit" }); diff --git a/api/admin/copyDrinksToBigDeans.cfm b/api/admin/copyDrinksToBigDeans.cfm index 091d1ff..0e4c9ba 100644 --- a/api/admin/copyDrinksToBigDeans.cfm +++ b/api/admin/copyDrinksToBigDeans.cfm @@ -20,11 +20,11 @@ try { ", { bizId: bigDeansBusinessId }, { datasource: "payfrit" }); if (qExistingCat.recordCount > 0) { - drinksCategoryId = qExistingCat.CategoryID; + drinksCategoryId = qExistingCat.ID; response["CategoryNote"] = "Using existing category: " & qExistingCat.Name; } else { // Create a new Beverages category for Big Dean's - qMaxCat = queryExecute("SELECT COALESCE(MAX(CategoryID), 0) + 1 as nextId FROM Categories", {}, { datasource: "payfrit" }); + qMaxCat = queryExecute("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Categories", {}, { datasource: "payfrit" }); drinksCategoryId = qMaxCat.nextId; qMaxSort = queryExecute(" @@ -32,7 +32,7 @@ try { ", { bizId: bigDeansBusinessId }, { datasource: "payfrit" }); queryExecute(" - INSERT INTO Categories (CategoryID, BusinessID, ParentCategoryID, Name, SortOrder, AddedOn) + INSERT INTO Categories (ID, BusinessID, ParentCategoryID, Name, SortOrder, AddedOn) VALUES (:catId, :bizId, 0, 'Beverages', :sortOrder, NOW()) ", { catId: drinksCategoryId, @@ -67,12 +67,12 @@ try { if (qExists.recordCount == 0) { // Get next ItemID - qMaxItem = queryExecute("SELECT COALESCE(MAX(ItemID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" }); + qMaxItem = queryExecute("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" }); newItemId = qMaxItem.nextId; queryExecute(" INSERT INTO Items ( - ItemID, BusinessID, CategoryID, ParentItemID, + ID, BusinessID, CategoryID, ParentItemID, Name, Description, Price, IsActive, SortOrder, IsCollapsible, RequiresChildSelection, AddedOn @@ -100,10 +100,10 @@ try { flavors = ["Chocolate", "Vanilla", "Strawberry"]; flavorSort = 0; for (flavor in flavors) { - qMaxOpt = queryExecute("SELECT COALESCE(MAX(ItemID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" }); + qMaxOpt = queryExecute("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" }); queryExecute(" INSERT INTO Items ( - ItemID, BusinessID, CategoryID, ParentItemID, + ID, BusinessID, CategoryID, ParentItemID, Name, Description, Price, IsActive, SortOrder, IsCollapsible, IsCheckedByDefault, AddedOn diff --git a/api/admin/createBeacons.cfm b/api/admin/createBeacons.cfm index 5308793..d7cca75 100644 --- a/api/admin/createBeacons.cfm +++ b/api/admin/createBeacons.cfm @@ -35,13 +35,13 @@ try { // Get service point Table 1 qSP = queryExecute(" - SELECT ServicePointID AS ID FROM ServicePoints - WHERE ServicePointBusinessID = :bizID AND ServicePointName = 'Table 1' + SELECT ID FROM ServicePoints + WHERE BusinessID = :bizID AND Name = 'Table 1' ", { bizID: lazyDaisyID }, { datasource: "payfrit" }); if (qSP.recordCount == 0) { queryExecute(" - INSERT INTO ServicePoints (ServicePointBusinessID, ServicePointName) + INSERT INTO ServicePoints (BusinessID, Name) VALUES (:bizID, 'Table 1') ", { bizID: lazyDaisyID }, { datasource: "payfrit" }); qSP = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" }); @@ -68,19 +68,19 @@ try { // Assign beacon to Table 1 service point queryExecute(" UPDATE ServicePoints SET BeaconID = :beaconID, AssignedByUserID = 1 - WHERE ServicePointID = :spID AND ServicePointBusinessID = :bizID + WHERE ID = :spID AND BusinessID = :bizID ", { beaconID: beaconID, bizID: lazyDaisyID, spID: servicePointID }, { datasource: "payfrit" }); response.steps.append("Assigned beacon " & beaconID & " to Table 1"); } // Get final status qFinal = queryExecute(" - SELECT sp.ServicePointID AS ServicePointID, sp.BeaconID, sp.ServicePointBusinessID AS BusinessID, - b.Name AS BeaconName, b.UUID, sp.ServicePointName AS ServicePointName, - biz.BusinessName AS BusinessName + SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.BusinessID AS BusinessID, + b.Name AS BeaconName, b.UUID, sp.Name AS ServicePointName, + biz.Name AS BusinessName FROM ServicePoints sp JOIN Beacons b ON b.ID = sp.BeaconID - JOIN Businesses biz ON biz.BusinessID = sp.ServicePointBusinessID + JOIN Businesses biz ON biz.ID = sp.BusinessID WHERE sp.BeaconID IS NOT NULL ", {}, { datasource: "payfrit" }); diff --git a/api/admin/createMenusTable.cfm b/api/admin/createMenusTable.cfm index 129302c..38f22be 100644 --- a/api/admin/createMenusTable.cfm +++ b/api/admin/createMenusTable.cfm @@ -31,7 +31,7 @@ try { // Create Menus table queryExecute(" CREATE TABLE Menus ( - MenuID INT AUTO_INCREMENT PRIMARY KEY, + ID INT AUTO_INCREMENT PRIMARY KEY, BusinessID INT NOT NULL, Name VARCHAR(100) NOT NULL, Description VARCHAR(500) NULL, diff --git a/api/admin/debugBusinesses.cfm b/api/admin/debugBusinesses.cfm index 47ad646..51dd741 100644 --- a/api/admin/debugBusinesses.cfm +++ b/api/admin/debugBusinesses.cfm @@ -26,11 +26,11 @@ @@ -39,7 +39,7 @@ diff --git a/api/admin/switchBeacons.cfm b/api/admin/switchBeacons.cfm index dbee05b..52462a1 100644 --- a/api/admin/switchBeacons.cfm +++ b/api/admin/switchBeacons.cfm @@ -30,12 +30,12 @@ queryExecute(" // Get current state q = queryExecute(" - SELECT sp.ServicePointID AS ServicePointID, sp.BeaconID, sp.ServicePointBusinessID AS BusinessID, - b.Name AS BeaconName, biz.BusinessName AS BusinessName, + SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.ServicePointBusinessID AS BusinessID, + b.Name AS BeaconName, biz.Name AS BusinessName, sp.ServicePointName AS ServicePointName FROM ServicePoints sp JOIN Beacons b ON b.ID = sp.BeaconID - JOIN Businesses biz ON biz.BusinessID = sp.ServicePointBusinessID + JOIN Businesses biz ON biz.ID = sp.ServicePointBusinessID WHERE sp.BeaconID IS NOT NULL ", {}, { datasource: "payfrit" }); diff --git a/api/admin/updateBeaconMapping.cfm b/api/admin/updateBeaconMapping.cfm index 6de50b9..7950506 100644 --- a/api/admin/updateBeaconMapping.cfm +++ b/api/admin/updateBeaconMapping.cfm @@ -35,13 +35,13 @@ q = queryExecute(" b.UUID, b.Name AS BeaconName, b.BusinessID AS BeaconBusinessID, - sp.ServicePointID AS ServicePointID, + sp.ID AS ServicePointID, sp.ServicePointName AS ServicePointName, sp.ServicePointBusinessID AS ServicePointBusinessID, - biz.BusinessName AS BusinessName + biz.Name AS BusinessName FROM Beacons b LEFT JOIN ServicePoints sp ON sp.BeaconID = b.ID - LEFT JOIN Businesses biz ON biz.BusinessID = b.BusinessID + LEFT JOIN Businesses biz ON biz.ID = b.BusinessID WHERE b.IsActive = 1 ORDER BY b.ID ", {}, { datasource: "payfrit" }); diff --git a/api/assignments/list.cfm b/api/assignments/list.cfm index 3ed43db..c3176e9 100644 --- a/api/assignments/list.cfm +++ b/api/assignments/list.cfm @@ -17,18 +17,18 @@ if (!structKeyExists(request, "BusinessID") || !isNumeric(request.BusinessID) || SELECT - sp.ServicePointID AS ServicePointID, + sp.ID AS ServicePointID, sp.BeaconID, - sp.ServicePointBusinessID AS BusinessID, + sp.BusinessID AS BusinessID, sp.AssignedByUserID, b.Name AS BeaconName, b.UUID, - sp.ServicePointName AS ServicePointName + sp.Name AS ServicePointName FROM ServicePoints sp JOIN Beacons b ON b.ID = sp.BeaconID - WHERE sp.ServicePointBusinessID = + WHERE sp.BusinessID = AND sp.BeaconID IS NOT NULL - ORDER BY b.Name, sp.ServicePointName + ORDER BY b.Name, sp.Name diff --git a/api/assignments/save.cfm b/api/assignments/save.cfm index 85cf0c2..4b06c1e 100644 --- a/api/assignments/save.cfm +++ b/api/assignments/save.cfm @@ -48,9 +48,9 @@ ServicePointID = int(data.ServicePointID); - SELECT BusinessID, BusinessParentBusinessID AS ParentBusinessID + SELECT ID, BusinessParentBusinessID AS ParentBusinessID FROM Businesses - WHERE BusinessID = + WHERE ID = LIMIT 1 @@ -78,10 +78,10 @@ ServicePointID = int(data.ServicePointID); - SELECT ServicePointID + SELECT ID FROM ServicePoints - WHERE ServicePointID = - AND ServicePointBusinessID = + WHERE ID = + AND BusinessID = LIMIT 1 @@ -91,9 +91,9 @@ ServicePointID = int(data.ServicePointID); - SELECT ServicePointID + SELECT ID FROM ServicePoints - WHERE ServicePointID = + WHERE ID = AND BeaconID = LIMIT 1 @@ -107,8 +107,8 @@ ServicePointID = int(data.ServicePointID); UPDATE ServicePoints SET BeaconID = , AssignedByUserID = - WHERE ServicePointID = - AND ServicePointBusinessID = + WHERE ID = + AND BusinessID = #serializeJSON({ diff --git a/api/auth/validateToken.cfm b/api/auth/validateToken.cfm index cb883dd..ca668a7 100644 --- a/api/auth/validateToken.cfm +++ b/api/auth/validateToken.cfm @@ -33,9 +33,9 @@ try { // Look up the token qToken = queryExecute(" - SELECT ut.UserID, u.UserFirstName AS FirstName, u.UserLastName AS LastName + SELECT ut.UserID, u.FirstName, u.LastName FROM UserTokens ut - JOIN Users u ON u.UserID = ut.UserID + JOIN Users u ON u.ID = ut.UserID WHERE ut.Token = :token LIMIT 1 ", { token: { value: token, cfsqltype: "cf_sql_varchar" } }, { datasource: "payfrit" }); diff --git a/api/beacons/getBusinessFromBeacon.cfm b/api/beacons/getBusinessFromBeacon.cfm index 7d060ca..90c7991 100644 --- a/api/beacons/getBusinessFromBeacon.cfm +++ b/api/beacons/getBusinessFromBeacon.cfm @@ -48,13 +48,13 @@ beaconId = int(data.BeaconID); SELECT - sp.ServicePointBusinessID AS BusinessID, - sp.ServicePointID AS ServicePointID, - biz.BusinessName AS BusinessName, - biz.BusinessParentBusinessID, - sp.ServicePointName AS ServicePointName + sp.BusinessID AS BusinessID, + sp.ID AS ServicePointID, + biz.Name AS BusinessName, + biz.ParentBusinessID AS BusinessParentBusinessID, + sp.Name AS ServicePointName FROM ServicePoints sp - INNER JOIN Businesses biz ON biz.BusinessID = sp.ServicePointBusinessID + INNER JOIN Businesses biz ON biz.ID = sp.BusinessID WHERE sp.BeaconID = AND sp.IsActive = 1 @@ -63,14 +63,14 @@ beaconId = int(data.BeaconID); SELECT lt.BusinessID, 0 AS ServicePointID, - biz.BusinessName AS BusinessName, - biz.BusinessParentBusinessID, + biz.Name AS BusinessName, + biz.ParentBusinessID AS BusinessParentBusinessID, '' AS ServicePointName FROM lt_BeaconsID_BusinessesID lt - INNER JOIN Businesses biz ON biz.BusinessID = lt.BusinessID + INNER JOIN Businesses biz ON biz.ID = lt.BusinessID WHERE lt.BeaconID = AND lt.BusinessID NOT IN ( - SELECT sp2.ServicePointBusinessID FROM ServicePoints sp2 + SELECT sp2.BusinessID FROM ServicePoints sp2 WHERE sp2.BeaconID = AND sp2.IsActive = 1 ) @@ -83,7 +83,7 @@ beaconId = int(data.BeaconID); SELECT COUNT(*) as cnt FROM Businesses - WHERE BusinessParentBusinessID = + WHERE ParentBusinessID = @@ -98,23 +98,23 @@ beaconId = int(data.BeaconID); - SELECT BusinessName, BusinessHeaderImageExtension + SELECT Name AS BusinessName, HeaderImageExtension AS BusinessHeaderImageExtension FROM Businesses - WHERE BusinessID = + WHERE ID = SELECT - BusinessID, - BusinessName, - BusinessParentBusinessID, - BusinessHeaderImageExtension + ID, + Name AS BusinessName, + ParentBusinessID AS BusinessParentBusinessID, + HeaderImageExtension AS BusinessHeaderImageExtension FROM Businesses - WHERE BusinessParentBusinessID = - ORDER BY BusinessName ASC + WHERE ParentBusinessID = + ORDER BY Name ASC ) AND b.IsActive = 1 - AND biz.BusinessIsDemo = 0 - AND biz.BusinessIsPrivate = 0 + AND biz.IsDemo = 0 + AND biz.IsPrivate = 0 diff --git a/api/businesses/get.cfm b/api/businesses/get.cfm index 6427b7d..d4c0f26 100644 --- a/api/businesses/get.cfm +++ b/api/businesses/get.cfm @@ -35,17 +35,17 @@ try { // Get business details q = queryExecute(" SELECT - BusinessID, - BusinessName, - BusinessPhone, - BusinessStripeAccountID, - BusinessStripeOnboardingComplete, - BusinessIsHiring, - BusinessHeaderImageExtension, - BusinessTaxRate, - BusinessBrandColor + ID, + Name, + Phone, + StripeAccountID, + StripeOnboardingComplete, + IsHiring, + HeaderImageExtension, + TaxRate, + BrandColor FROM Businesses - WHERE BusinessID = :businessID + WHERE ID = :businessID ", { businessID: businessID }, { datasource: "payfrit" }); if (q.recordCount == 0) { @@ -56,11 +56,11 @@ try { // Get address from Addresses table (either linked via AddressBusinessID or via Businesses.BusinessAddressID) qAddr = queryExecute(" - SELECT a.AddressLine1, a.AddressLine2, a.AddressCity, a.AddressZIPCode, s.tt_StateAbbreviation AS Abbreviation + SELECT a.Line1 AS AddressLine1, a.Line2 AS AddressLine2, a.City AS AddressCity, a.ZIPCode AS AddressZIPCode, s.Abbreviation FROM Addresses a - LEFT JOIN tt_States s ON s.tt_StateID = a.AddressStateID - WHERE (a.AddressBusinessID = :businessID OR a.AddressID = (SELECT BusinessAddressID FROM Businesses WHERE BusinessID = :businessID)) - AND a.AddressIsDeleted = 0 + LEFT JOIN tt_States s ON s.ID = a.StateID + WHERE (a.BusinessID = :businessID OR a.ID = (SELECT AddressID FROM Businesses WHERE ID = :businessID)) + AND a.IsDeleted = 0 LIMIT 1 ", { businessID: businessID }, { datasource: "payfrit" }); @@ -124,28 +124,28 @@ try { } // Build business object - taxRate = isNumeric(q.BusinessTaxRate) ? q.BusinessTaxRate : 0; + taxRate = isNumeric(q.TaxRate) ? q.TaxRate : 0; business = { - "BusinessID": q.BusinessID, - "Name": q.BusinessName, + "BusinessID": q.ID, + "Name": q.Name, "Address": addressStr, "Line1": addressLine1, "City": addressCity, "AddressState": addressState, "AddressZip": addressZip, - "Phone": q.BusinessPhone, + "Phone": q.Phone, "Hours": hoursStr, "HoursDetail": hoursArr, - "StripeConnected": (len(q.BusinessStripeAccountID) > 0 && q.BusinessStripeOnboardingComplete == 1), - "IsHiring": q.BusinessIsHiring == 1, + "StripeConnected": (len(q.StripeAccountID) > 0 && q.StripeOnboardingComplete == 1), + "IsHiring": q.IsHiring == 1, "TaxRate": taxRate, "TaxRatePercent": taxRate * 100, - "BrandColor": len(q.BusinessBrandColor) ? (left(q.BusinessBrandColor, 1) == chr(35) ? q.BusinessBrandColor : chr(35) & q.BusinessBrandColor) : "" + "BrandColor": len(q.BrandColor) ? (left(q.BrandColor, 1) == chr(35) ? q.BrandColor : chr(35) & q.BrandColor) : "" }; // Add header image URL if extension exists - if (len(q.BusinessHeaderImageExtension)) { - business["HeaderImageURL"] = "https://biz.payfrit.com/uploads/headers/" & q.BusinessID & "." & q.BusinessHeaderImageExtension; + if (len(q.HeaderImageExtension)) { + business["HeaderImageURL"] = "https://biz.payfrit.com/uploads/headers/" & q.ID & "." & q.HeaderImageExtension; } response["OK"] = true; diff --git a/api/businesses/getChildren.cfm b/api/businesses/getChildren.cfm index 71571b4..39d8541 100644 --- a/api/businesses/getChildren.cfm +++ b/api/businesses/getChildren.cfm @@ -36,10 +36,10 @@ try { q = queryExecute( " SELECT - BusinessID, - BusinessName + ID, + Name FROM Businesses - WHERE BusinessParentBusinessID = :parentId + WHERE ParentBusinessID = :parentId ORDER BY Name ", { parentId = { value = parentBusinessId, cfsqltype = "cf_sql_integer" } }, @@ -49,8 +49,8 @@ try { rows = []; for (i = 1; i <= q.recordCount; i++) { arrayAppend(rows, { - "BusinessID": q.BusinessID[i], - "Name": q.BusinessName[i] + "BusinessID": q.ID[i], + "Name": q.Name[i] }); } diff --git a/api/businesses/list.cfm b/api/businesses/list.cfm index 16f2f57..9f91962 100644 --- a/api/businesses/list.cfm +++ b/api/businesses/list.cfm @@ -43,17 +43,17 @@ try { q = queryExecute( " SELECT - b.BusinessID, - b.BusinessName, - a.AddressLat, - a.AddressLng, - a.AddressCity, - a.AddressLine1 + b.ID, + b.Name, + a.Latitude AS AddressLat, + a.Longitude AS AddressLng, + a.City AS AddressCity, + a.Line1 AS AddressLine1 FROM Businesses b - LEFT JOIN Addresses a ON b.BusinessAddressID = a.AddressID - WHERE (b.BusinessIsDemo = 0 OR b.BusinessIsDemo IS NULL) - AND (b.BusinessIsPrivate = 0 OR b.BusinessIsPrivate IS NULL) - ORDER BY b.BusinessName + LEFT JOIN Addresses a ON b.AddressID = a.ID + WHERE (b.IsDemo = 0 OR b.IsDemo IS NULL) + AND (b.IsPrivate = 0 OR b.IsPrivate IS NULL) + ORDER BY b.Name ", [], { datasource = "payfrit" } @@ -63,8 +63,8 @@ try { rows = []; for (i = 1; i <= q.recordCount; i++) { row = { - "BusinessID": q.BusinessID[i], - "Name": q.BusinessName[i], + "BusinessID": q.ID[i], + "Name": q.Name[i], "City": isNull(q.AddressCity[i]) ? "" : q.AddressCity[i], "Line1": isNull(q.AddressLine1[i]) ? "" : q.AddressLine1[i] }; diff --git a/api/businesses/saveBrandColor.cfm b/api/businesses/saveBrandColor.cfm index 368a94f..0e8ec84 100644 --- a/api/businesses/saveBrandColor.cfm +++ b/api/businesses/saveBrandColor.cfm @@ -49,8 +49,8 @@ if (len(brandColor) GT 0) { // Update the database queryExecute(" UPDATE Businesses - SET BusinessBrandColor = :color - WHERE BusinessID = :bizId + SET BrandColor = :color + WHERE ID = :bizId ", { color: { value: brandColor, cfsqltype: "cf_sql_varchar" }, bizId: { value: bizId, cfsqltype: "cf_sql_integer" } diff --git a/api/businesses/setHiring.cfm b/api/businesses/setHiring.cfm index b204cb6..bc32636 100644 --- a/api/businesses/setHiring.cfm +++ b/api/businesses/setHiring.cfm @@ -45,8 +45,8 @@ if (isHiring == -1) { try { queryExecute(" UPDATE Businesses - SET BusinessIsHiring = ? - WHERE BusinessID = ? + SET IsHiring = ? + WHERE ID = ? ", [ { value: isHiring, cfsqltype: "cf_sql_tinyint" }, { value: businessId, cfsqltype: "cf_sql_integer" } diff --git a/api/businesses/update.cfm b/api/businesses/update.cfm index 2c37dbc..669efa9 100644 --- a/api/businesses/update.cfm +++ b/api/businesses/update.cfm @@ -48,8 +48,8 @@ try { if (len(bizName)) { if (isNumeric(taxRate)) { queryExecute(" - UPDATE Businesses SET BusinessName = :name, BusinessPhone = :phone, BusinessTaxRate = :taxRate - WHERE BusinessID = :id + UPDATE Businesses SET Name = :name, Phone = :phone, TaxRate = :taxRate + WHERE ID = :id ", { name: bizName, phone: bizPhone, @@ -58,8 +58,8 @@ try { }, { datasource: "payfrit" }); } else { queryExecute(" - UPDATE Businesses SET BusinessName = :name, BusinessPhone = :phone - WHERE BusinessID = :id + UPDATE Businesses SET Name = :name, Phone = :phone + WHERE ID = :id ", { name: bizName, phone: bizPhone, @@ -81,7 +81,7 @@ try { stateID = 0; if (len(state)) { qState = queryExecute(" - SELECT tt_StateID AS ID FROM tt_States WHERE tt_StateAbbreviation = :abbr + SELECT ID FROM tt_States WHERE Abbreviation = :abbr ", { abbr: uCase(state) }, { datasource: "payfrit" }); if (qState.recordCount > 0) { stateID = qState.ID; @@ -90,8 +90,8 @@ try { // Check if business has an address qAddr = queryExecute(" - SELECT AddressID FROM Addresses - WHERE AddressBusinessID = :bizID AND AddressUserID = 0 AND AddressIsDeleted = 0 + SELECT ID FROM Addresses + WHERE BusinessID = :bizID AND UserID = 0 AND IsDeleted = 0 LIMIT 1 ", { bizID: businessId }, { datasource: "payfrit" }); @@ -99,22 +99,22 @@ try { // Update existing address queryExecute(" UPDATE Addresses SET - AddressLine1 = :line1, - AddressCity = :city, - AddressStateID = :stateID, - AddressZIPCode = :zip - WHERE AddressID = :addrID + Line1 = :line1, + City = :city, + StateID = :stateID, + ZIPCode = :zip + WHERE ID = :addrID ", { line1: addressLine1, city: city, stateID: stateID, zip: zip, - addrID: qAddr.AddressID + addrID: qAddr.ID }, { datasource: "payfrit" }); } else { // Create new address queryExecute(" - INSERT INTO Addresses (AddressLine1, AddressCity, AddressStateID, AddressZIPCode, AddressBusinessID, AddressUserID, AddressTypeID, AddressAddedOn) + INSERT INTO Addresses (Line1, City, StateID, ZIPCode, BusinessID, UserID, AddressTypeID, AddedOn) VALUES (:line1, :city, :stateID, :zip, :bizID, 0, 2, NOW()) ", { line1: addressLine1, diff --git a/api/chat/getMessages.cfm b/api/chat/getMessages.cfm index feb49f7..10f6ce4 100644 --- a/api/chat/getMessages.cfm +++ b/api/chat/getMessages.cfm @@ -43,9 +43,9 @@ try { m.MessageBody, m.IsRead, m.CreatedOn, - u.UserFirstName as SenderName + u.FirstName as SenderName FROM ChatMessages m - LEFT JOIN Users u ON u.UserID = m.SenderUserID + LEFT JOIN Users u ON u.ID = m.SenderUserID WHERE m.TaskID = :taskID AND m.ID > :afterID ORDER BY m.CreatedOn ASC ", { @@ -62,9 +62,9 @@ try { m.MessageBody, m.IsRead, m.CreatedOn, - u.UserFirstName as SenderName + u.FirstName as SenderName FROM ChatMessages m - LEFT JOIN Users u ON u.UserID = m.SenderUserID + LEFT JOIN Users u ON u.ID = m.SenderUserID WHERE m.TaskID = :taskID ORDER BY m.CreatedOn ASC ", { diff --git a/api/menu/getForBuilder.cfm b/api/menu/getForBuilder.cfm index a05bf27..2712883 100644 --- a/api/menu/getForBuilder.cfm +++ b/api/menu/getForBuilder.cfm @@ -442,7 +442,7 @@ try { brandColor = ""; try { qBrand = queryExecute(" - SELECT BusinessBrandColor FROM Businesses WHERE BusinessID = :bizId + SELECT BrandColor AS BusinessBrandColor FROM Businesses WHERE ID = :bizId ", { bizId: businessID }, { datasource: "payfrit" }); if (qBrand.recordCount > 0 && len(trim(qBrand.BusinessBrandColor))) { brandColor = left(qBrand.BusinessBrandColor, 1) == chr(35) ? qBrand.BusinessBrandColor : chr(35) & qBrand.BusinessBrandColor; diff --git a/api/menu/items.cfm b/api/menu/items.cfm index da61847..69b4ecf 100644 --- a/api/menu/items.cfm +++ b/api/menu/items.cfm @@ -533,7 +533,7 @@ diff --git a/api/menu/uploadHeader.cfm b/api/menu/uploadHeader.cfm index 2bf5e01..e535023 100644 --- a/api/menu/uploadHeader.cfm +++ b/api/menu/uploadHeader.cfm @@ -49,7 +49,7 @@ if (bizId LTE 0) { - SELECT BusinessHeaderImageExtension + SELECT HeaderImageExtension AS BusinessHeaderImageExtension FROM Businesses WHERE BusinessID = @@ -70,7 +70,7 @@ if (bizId LTE 0) { UPDATE Businesses - SET BusinessHeaderImageExtension = + SET HeaderImageExtension = WHERE BusinessID = diff --git a/api/orders/getActiveCart.cfm b/api/orders/getActiveCart.cfm index 7dd5797..d026bf0 100644 --- a/api/orders/getActiveCart.cfm +++ b/api/orders/getActiveCart.cfm @@ -36,17 +36,17 @@ try { o.StatusID, o.ServicePointID, o.AddedOn, - b.BusinessName, - b.BusinessOrderTypes, - sp.ServicePointName, + b.Name AS BusinessName, + b.OrderTypes AS BusinessOrderTypes, + sp.Name AS ServicePointName, (SELECT COUNT(*) FROM OrderLineItems oli WHERE oli.OrderID = o.ID AND oli.IsDeleted = 0 AND oli.ParentOrderLineItemID = 0) as ItemCount FROM Orders o - LEFT JOIN Businesses b ON b.BusinessID = o.BusinessID - LEFT JOIN ServicePoints sp ON sp.ServicePointID = o.ServicePointID + LEFT JOIN Businesses b ON b.ID = o.BusinessID + LEFT JOIN ServicePoints sp ON sp.ID = o.ServicePointID WHERE o.UserID = :userId AND o.StatusID = 0 ORDER BY o.ID DESC @@ -71,7 +71,7 @@ try { response["OK"] = true; response["HAS_CART"] = true; response["CART"] = { - "OrderID": val(qCart.OrderID), + "OrderID": val(qCart.ID), "UUID": qCart.UUID ?: "", "BusinessID": val(qCart.BusinessID), "Name": len(trim(qCart.BusinessName)) ? qCart.BusinessName : "", diff --git a/api/orders/getCart.cfm b/api/orders/getCart.cfm index 283006d..5d1f522 100644 --- a/api/orders/getCart.cfm +++ b/api/orders/getCart.cfm @@ -67,12 +67,12 @@ - - + + NOW() LIMIT 1) AS RatingToken FROM Tasks t - INNER JOIN Users u ON u.UserID = t.ClaimedByUserID + INNER JOIN Users u ON u.ID = t.ClaimedByUserID WHERE t.OrderID = :orderID AND t.ClaimedByUserID > 0 ", { orderID: orderID }); diff --git a/api/orders/getOrCreateCart.cfm b/api/orders/getOrCreateCart.cfm index 163d4b2..7d88668 100644 --- a/api/orders/getOrCreateCart.cfm +++ b/api/orders/getOrCreateCart.cfm @@ -62,11 +62,11 @@ - + - + 0 diff --git a/api/orders/listForKDS.cfm b/api/orders/listForKDS.cfm index 061da2d..0c868bb 100644 --- a/api/orders/listForKDS.cfm +++ b/api/orders/listForKDS.cfm @@ -70,12 +70,12 @@ o.Remarks, o.SubmittedOn, o.LastEditedOn, - sp.ServicePointName AS Name, - u.UserFirstName AS FirstName, - u.UserLastName AS LastName + sp.Name AS Name, + u.FirstName, + u.LastName FROM Orders o - LEFT JOIN ServicePoints sp ON sp.ServicePointID = o.ServicePointID - LEFT JOIN Users u ON u.UserID = o.UserID + LEFT JOIN ServicePoints sp ON sp.ID = o.ServicePointID + LEFT JOIN Users u ON u.ID = o.UserID INNER JOIN OrderLineItems oli ON oli.OrderID = o.ID INNER JOIN Items i ON i.ID = oli.ItemID WHERE #whereSQL# @@ -96,12 +96,12 @@ o.Remarks, o.SubmittedOn, o.LastEditedOn, - sp.ServicePointName AS Name, - u.UserFirstName AS FirstName, - u.UserLastName AS LastName + sp.Name AS Name, + u.FirstName, + u.LastName FROM Orders o - LEFT JOIN ServicePoints sp ON sp.ServicePointID = o.ServicePointID - LEFT JOIN Users u ON u.UserID = o.UserID + LEFT JOIN ServicePoints sp ON sp.ID = o.ServicePointID + LEFT JOIN Users u ON u.ID = o.UserID WHERE #whereSQL# ORDER BY o.SubmittedOn ASC, o.ID ASC ", params, { datasource = "payfrit" })> diff --git a/api/orders/setLineItem.cfm b/api/orders/setLineItem.cfm index 7049cbf..6437bf7 100644 --- a/api/orders/setLineItem.cfm +++ b/api/orders/setLineItem.cfm @@ -191,9 +191,9 @@ o.LastEditedOn, o.SubmittedOn, o.ServicePointID, - COALESCE(b.BusinessDeliveryFlatFee, 0) AS BusinessDeliveryFee + COALESCE(b.DeliveryFlatFee, 0) AS BusinessDeliveryFee FROM Orders o - LEFT JOIN Businesses b ON b.BusinessID = o.BusinessID + LEFT JOIN Businesses b ON b.ID = o.BusinessID WHERE o.ID = ? LIMIT 1 ", diff --git a/api/orders/setOrderType.cfm b/api/orders/setOrderType.cfm index 2deb094..f0e1150 100644 --- a/api/orders/setOrderType.cfm +++ b/api/orders/setOrderType.cfm @@ -62,11 +62,11 @@ - + - + diff --git a/api/portal/getSettings.cfm b/api/portal/getSettings.cfm index 0adc3c8..095b061 100644 --- a/api/portal/getSettings.cfm +++ b/api/portal/getSettings.cfm @@ -24,12 +24,12 @@ if (!structKeyExists(request, "BusinessID") || !isNumeric(request.BusinessID) || try { q = queryExecute(" SELECT - b.BusinessID AS ID, - b.BusinessName AS Name, - b.BusinessTaxRate AS TaxRate, - b.BusinessPhone AS Phone + b.ID, + b.Name, + b.TaxRate, + b.Phone FROM Businesses b - WHERE b.BusinessID = :businessId + WHERE b.ID = :businessId LIMIT 1 ", { businessId: request.BusinessID }, { datasource: "payfrit" }); @@ -39,11 +39,11 @@ try { // Get address from Addresses table qAddr = queryExecute(" - SELECT a.AddressLine1 AS Line1, a.AddressLine2 AS Line2, a.AddressCity AS City, a.AddressZIPCode AS ZIPCode, s.tt_StateAbbreviation AS State + SELECT a.Line1, a.Line2, a.City, a.ZIPCode, s.Abbreviation AS State FROM Addresses a - LEFT JOIN tt_States s ON s.tt_StateID = a.AddressStateID - WHERE (a.AddressBusinessID = :businessId OR a.AddressID = (SELECT BusinessAddressID FROM Businesses WHERE BusinessID = :businessId)) - AND a.AddressIsDeleted = 0 + LEFT JOIN tt_States s ON s.ID = a.StateID + WHERE (a.BusinessID = :businessId OR a.ID = (SELECT AddressID FROM Businesses WHERE ID = :businessId)) + AND a.IsDeleted = 0 LIMIT 1 ", { businessId: request.BusinessID }, { datasource: "payfrit" }); @@ -62,7 +62,7 @@ try { qUser = queryExecute(" SELECT UserContactNumber AS ContactNumber, UserEmailAddress AS EmailAddress FROM Users - WHERE UserID = (SELECT BusinessUserID FROM Businesses WHERE BusinessID = :businessId) + WHERE ID = (SELECT UserID FROM Businesses WHERE ID = :businessId) LIMIT 1 ", { businessId: request.BusinessID }, { datasource: "payfrit" }); diff --git a/api/portal/myBusinesses.cfm b/api/portal/myBusinesses.cfm index 0f01d15..b4ca131 100644 --- a/api/portal/myBusinesses.cfm +++ b/api/portal/myBusinesses.cfm @@ -45,17 +45,17 @@ try { // Get businesses for this user (owner only) q = queryExecute(" - SELECT b.BusinessID, b.BusinessName + SELECT b.ID, b.Name FROM Businesses b - WHERE b.BusinessUserID = :userID - ORDER BY b.BusinessName + WHERE b.UserID = :userID + ORDER BY b.Name ", { userID: userID }, { datasource: "payfrit" }); businesses = []; for (row in q) { arrayAppend(businesses, { - "BusinessID": row.BusinessID, - "Name": row.BusinessName + "BusinessID": row.ID, + "Name": row.Name }); } diff --git a/api/portal/team.cfm b/api/portal/team.cfm index 86fc7c8..64e55e1 100644 --- a/api/portal/team.cfm +++ b/api/portal/team.cfm @@ -46,10 +46,10 @@ try { e.UserID, e.StatusID, CAST(e.IsActive AS UNSIGNED) AS IsActive, - u.UserFirstName AS FirstName, - u.UserLastName AS LastName, - u.UserEmailAddress AS EmailAddress, - u.UserContactNumber AS ContactNumber, + u.FirstName, + u.LastName, + u.EmailAddress, + u.ContactNumber, CASE e.StatusID WHEN 0 THEN 'Pending' WHEN 1 THEN 'Invited' @@ -58,9 +58,9 @@ try { ELSE 'Unknown' END AS StatusName FROM Employees e - JOIN Users u ON e.UserID = u.UserID + JOIN Users u ON e.UserID = u.ID WHERE e.BusinessID = ? - ORDER BY e.IsActive DESC, u.UserFirstName ASC + ORDER BY e.IsActive DESC, u.FirstName ASC ", [ { value: businessId, cfsqltype: "cf_sql_integer" } ], { datasource: "payfrit" }); diff --git a/api/portal/updateSettings.cfm b/api/portal/updateSettings.cfm index d7f87ee..ff01f74 100644 --- a/api/portal/updateSettings.cfm +++ b/api/portal/updateSettings.cfm @@ -54,25 +54,25 @@ try { if (taxRate < 0 || taxRate > 0.5) { apiAbort({ OK: false, ERROR: "invalid_tax_rate", MESSAGE: "Tax rate must be between 0% and 50%" }); } - arrayAppend(updates, "BusinessTaxRate = :taxRate"); + arrayAppend(updates, "TaxRate = :taxRate"); params.taxRate = { value: taxRate, cfsqltype: "cf_sql_decimal" }; } else if (structKeyExists(data, "TaxRate") && isNumeric(data.TaxRate)) { taxRate = data.TaxRate; if (taxRate < 0 || taxRate > 0.5) { apiAbort({ OK: false, ERROR: "invalid_tax_rate", MESSAGE: "Tax rate must be between 0 and 0.5" }); } - arrayAppend(updates, "BusinessTaxRate = :taxRate"); + arrayAppend(updates, "TaxRate = :taxRate"); params.taxRate = { value: taxRate, cfsqltype: "cf_sql_decimal" }; } // Add more updatable fields as needed if (structKeyExists(data, "Name") && len(trim(data.Name))) { - arrayAppend(updates, "BusinessName = :businessName"); + arrayAppend(updates, "Name = :businessName"); params.businessName = { value: left(trim(data.Name), 100), cfsqltype: "cf_sql_varchar" }; } if (structKeyExists(data, "Phone")) { - arrayAppend(updates, "BusinessPhone = :phone"); + arrayAppend(updates, "Phone = :phone"); params.phone = { value: left(trim(data.Phone), 20), cfsqltype: "cf_sql_varchar" }; } @@ -98,16 +98,16 @@ try { // Build and execute Businesses update if (arrayLen(updates) > 0) { - sql = "UPDATE Businesses SET " & arrayToList(updates, ", ") & " WHERE BusinessID = :businessId"; + sql = "UPDATE Businesses SET " & arrayToList(updates, ", ") & " WHERE ID = :businessId"; queryExecute(sql, params, { datasource: "payfrit" }); } // Update address in Addresses table if needed if (hasAddressUpdate) { qExistingAddr = queryExecute(" - SELECT AddressID AS ID FROM Addresses - WHERE (AddressBusinessID = :businessId OR AddressID = (SELECT BusinessAddressID FROM Businesses WHERE BusinessID = :businessId)) - AND AddressIsDeleted = 0 + SELECT ID FROM Addresses + WHERE (BusinessID = :businessId OR ID = (SELECT AddressID FROM Businesses WHERE ID = :businessId)) + AND IsDeleted = 0 LIMIT 1 ", { businessId: request.BusinessID }, { datasource: "payfrit" }); @@ -115,19 +115,19 @@ try { addrUpdates = []; addrParams = { addrId: qExistingAddr.ID }; if (structKeyExists(addrFields, "Line1")) { - arrayAppend(addrUpdates, "AddressLine1 = :line1"); + arrayAppend(addrUpdates, "Line1 = :line1"); addrParams.line1 = { value: addrFields.Line1, cfsqltype: "cf_sql_varchar" }; } if (structKeyExists(addrFields, "City")) { - arrayAppend(addrUpdates, "AddressCity = :city"); + arrayAppend(addrUpdates, "City = :city"); addrParams.city = { value: addrFields.City, cfsqltype: "cf_sql_varchar" }; } if (structKeyExists(addrFields, "ZIPCode")) { - arrayAppend(addrUpdates, "AddressZIPCode = :zip"); + arrayAppend(addrUpdates, "ZIPCode = :zip"); addrParams.zip = { value: addrFields.ZIPCode, cfsqltype: "cf_sql_varchar" }; } if (arrayLen(addrUpdates) > 0) { - queryExecute("UPDATE Addresses SET " & arrayToList(addrUpdates, ", ") & " WHERE AddressID = :addrId", + queryExecute("UPDATE Addresses SET " & arrayToList(addrUpdates, ", ") & " WHERE ID = :addrId", addrParams, { datasource: "payfrit" }); } } @@ -135,18 +135,18 @@ try { // Return updated settings q = queryExecute(" - SELECT b.BusinessID AS ID, b.BusinessName AS Name, b.BusinessTaxRate AS TaxRate, b.BusinessPhone AS Phone + SELECT b.ID, b.Name, b.TaxRate, b.Phone FROM Businesses b - WHERE b.BusinessID = :businessId + WHERE b.ID = :businessId LIMIT 1 ", { businessId: request.BusinessID }, { datasource: "payfrit" }); qAddr = queryExecute(" - SELECT a.AddressLine1 AS Line1, a.AddressCity AS City, a.AddressZIPCode AS ZIPCode, s.tt_StateAbbreviation AS State + SELECT a.Line1, a.City, a.ZIPCode, s.Abbreviation AS State FROM Addresses a - LEFT JOIN tt_States s ON s.tt_StateID = a.AddressStateID - WHERE (a.AddressBusinessID = :businessId OR a.AddressID = (SELECT BusinessAddressID FROM Businesses WHERE BusinessID = :businessId)) - AND a.AddressIsDeleted = 0 + LEFT JOIN tt_States s ON s.ID = a.StateID + WHERE (a.BusinessID = :businessId OR a.ID = (SELECT AddressID FROM Businesses WHERE ID = :businessId)) + AND a.IsDeleted = 0 LIMIT 1 ", { businessId: request.BusinessID }, { datasource: "payfrit" }); diff --git a/api/ratings/createAdminRating.cfm b/api/ratings/createAdminRating.cfm index 6511424..cfb1a8f 100644 --- a/api/ratings/createAdminRating.cfm +++ b/api/ratings/createAdminRating.cfm @@ -69,7 +69,7 @@ try { // Check if admin rating already exists for this task qExisting = queryExecute(" - SELECT TaskRatingID FROM TaskRatings + SELECT ID FROM TaskRatings WHERE TaskID = :taskID AND Direction = 'admin_rates_worker' LIMIT 1 diff --git a/api/ratings/listForAdmin.cfm b/api/ratings/listForAdmin.cfm index ae19428..56a42d6 100644 --- a/api/ratings/listForAdmin.cfm +++ b/api/ratings/listForAdmin.cfm @@ -32,18 +32,18 @@ try { // and no admin rating exists yet qTasks = queryExecute(" SELECT t.ID, t.Title, t.CompletedOn, t.ClaimedByUserID, t.OrderID, - u.UserFirstName AS WorkerFirstName, u.UserLastName AS WorkerLastName, + u.FirstName AS WorkerFirstName, u.LastName AS WorkerLastName, o.ID, o.UserID, - cu.UserFirstName AS CustomerFirstName, cu.UserLastName AS CustomerLastName, - sp.ServicePointName AS Name, + cu.FirstName AS CustomerFirstName, cu.LastName AS CustomerLastName, + sp.Name AS Name, (SELECT COUNT(*) FROM TaskRatings r WHERE r.TaskID = t.ID AND r.Direction = 'admin_rates_worker') AS HasAdminRating FROM Tasks t - INNER JOIN Users u ON u.UserID = t.ClaimedByUserID + INNER JOIN Users u ON u.ID = t.ClaimedByUserID LEFT JOIN Orders o ON o.ID = t.OrderID - LEFT JOIN Users cu ON cu.UserID = o.UserID - LEFT JOIN ServicePoints sp ON sp.ServicePointID = o.ServicePointID + LEFT JOIN Users cu ON cu.ID = o.UserID + LEFT JOIN ServicePoints sp ON sp.ID = o.ServicePointID WHERE t.BusinessID = :businessID AND t.CompletedOn IS NOT NULL AND t.CompletedOn > DATE_SUB(NOW(), INTERVAL 7 DAY) diff --git a/api/setup/checkDuplicate.cfm b/api/setup/checkDuplicate.cfm index e11eccb..a8ebfc5 100644 --- a/api/setup/checkDuplicate.cfm +++ b/api/setup/checkDuplicate.cfm @@ -45,24 +45,24 @@ try { // Match by name (case-insensitive) OR by address components qDuplicates = queryExecute(" SELECT DISTINCT - b.BusinessID, - b.BusinessName AS Name, - a.AddressLine1 AS Line1, - a.AddressCity AS City, - s.tt_StateAbbreviation as AddressState, - a.AddressZIPCode AS ZIPCode + b.ID AS BusinessID, + b.Name AS Name, + a.Line1, + a.City, + s.Abbreviation as AddressState, + a.ZIPCode FROM Businesses b - LEFT JOIN Addresses a ON a.AddressBusinessID = b.BusinessID - LEFT JOIN tt_States s ON s.tt_StateID = a.AddressStateID + LEFT JOIN Addresses a ON a.BusinessID = b.ID + LEFT JOIN tt_States s ON s.ID = a.StateID WHERE - LOWER(b.BusinessName) = LOWER(:bizName) + LOWER(b.Name) = LOWER(:bizName) OR ( - LOWER(a.AddressLine1) = LOWER(:addressLine1) - AND LOWER(a.AddressCity) = LOWER(:city) - AND a.AddressLine1 != '' - AND a.AddressCity != '' + LOWER(a.Line1) = LOWER(:addressLine1) + AND LOWER(a.City) = LOWER(:city) + AND a.Line1 != '' + AND a.City != '' ) - ORDER BY b.BusinessName + ORDER BY b.Name ", { bizName: bizName, addressLine1: addressLine1, diff --git a/api/setup/saveWizard.cfm b/api/setup/saveWizard.cfm index 42438f4..478f59a 100644 --- a/api/setup/saveWizard.cfm +++ b/api/setup/saveWizard.cfm @@ -71,7 +71,7 @@ try { response.steps.append("State value received: '" & state & "' (len: " & len(state) & ")"); if (len(state)) { qState = queryExecute(" - SELECT tt_StateID AS ID FROM tt_States WHERE tt_StateAbbreviation = :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"); @@ -82,7 +82,7 @@ try { } queryExecute(" - INSERT INTO Addresses (AddressLine1, AddressCity, AddressStateID, AddressZIPCode, AddressUserID, AddressTypeID, AddressAddedOn) + INSERT INTO Addresses (Line1, City, StateID, ZIPCode, UserID, AddressTypeID, AddedOn) VALUES (:line1, :city, :stateID, :zip, :userID, :typeID, NOW()) ", { line1: len(addressLine1) ? addressLine1 : "Address pending", @@ -103,7 +103,7 @@ try { // Create new business with address link and phone queryExecute(" - INSERT INTO Businesses (BusinessName, BusinessPhone, BusinessUserID, BusinessAddressID, BusinessDeliveryZipCodes, BusinessCommunityMealType, BusinessTaxRate, BusinessAddedOn) + INSERT INTO Businesses (Name, Phone, UserID, AddressID, DeliveryZIPCodes, BusinessCommunityMealType, TaxRate, BusinessAddedOn) VALUES (:name, :phone, :userId, :addressId, :deliveryZips, :communityMealType, :taxRate, NOW()) ", { name: bizName, @@ -121,7 +121,7 @@ try { // Update address with business ID link queryExecute(" - UPDATE Addresses SET AddressBusinessID = :businessID WHERE AddressID = :addressID + UPDATE Addresses SET BusinessID = :businessID WHERE ID = :addressID ", { businessID: businessId, addressID: addressId @@ -188,7 +188,7 @@ try { } else { // Verify existing business exists qBiz = queryExecute(" - SELECT BusinessID, BusinessName FROM Businesses WHERE BusinessID = :id + SELECT ID, Name AS BusinessName FROM Businesses WHERE ID = :id ", { id: businessId }, { datasource: "payfrit" }); if (qBiz.recordCount == 0) { @@ -228,7 +228,7 @@ try { ", { bizID: businessId, name: tmplName }, { datasource: "payfrit" }); if (qTmpl.recordCount > 0) { - templateItemID = qTmpl.ItemID; + templateItemID = qTmpl.ID; response.steps.append("Template exists: " & tmplName & " (ID: " & templateItemID & ")"); } else { // Create template as Item with CategoryID=0 to mark as template @@ -399,7 +399,7 @@ try { ", { bizID: businessId, name: catName, menuID: menuID }, { datasource: "payfrit" }); if (qCat.recordCount > 0) { - categoryID = qCat.CategoryID; + categoryID = qCat.ID; response.steps.append("Category exists: " & catName & " (ID: " & categoryID & ")"); } else { // Create category in Categories table with MenuID @@ -497,7 +497,7 @@ try { Description = :desc, Price = :price, SortOrder = :sortOrder - WHERE ItemID = :id + WHERE ID = :id ", { desc: itemDesc, price: itemPrice, diff --git a/api/stripe/createPaymentIntent.cfm b/api/stripe/createPaymentIntent.cfm index 13c4e41..9976fb4 100644 --- a/api/stripe/createPaymentIntent.cfm +++ b/api/stripe/createPaymentIntent.cfm @@ -62,7 +62,7 @@ try { // Get business Stripe account qBusiness = queryExecute(" - SELECT BusinessStripeAccountID, BusinessStripeOnboardingComplete, BusinessName + SELECT StripeAccountID AS BusinessStripeAccountID, StripeOnboardingComplete AS BusinessStripeOnboardingComplete, Name AS BusinessName FROM Businesses WHERE BusinessID = :businessID ", { businessID: businessID }, { datasource: "payfrit" }); diff --git a/api/stripe/onboard.cfm b/api/stripe/onboard.cfm index 0d059b4..746b4c4 100644 --- a/api/stripe/onboard.cfm +++ b/api/stripe/onboard.cfm @@ -32,7 +32,7 @@ try { // Check if business already has a Stripe account qBusiness = queryExecute(" - SELECT BusinessStripeAccountID, BusinessName + SELECT StripeAccountID AS BusinessStripeAccountID, Name AS BusinessName FROM Businesses WHERE BusinessID = :businessID ", { businessID: businessID }); @@ -73,7 +73,7 @@ try { // Save to database queryExecute(" UPDATE Businesses - SET BusinessStripeAccountID = :stripeAccountID, + SET StripeAccountID = :stripeAccountID, BusinessStripeOnboardingStarted = NOW() WHERE BusinessID = :businessID ", { diff --git a/api/stripe/status.cfm b/api/stripe/status.cfm index 532d09c..7c2cdcc 100644 --- a/api/stripe/status.cfm +++ b/api/stripe/status.cfm @@ -23,9 +23,9 @@ try { // Get business Stripe info qBusiness = queryExecute(" - SELECT BusinessStripeAccountID, BusinessStripeOnboardingComplete + SELECT StripeAccountID AS BusinessStripeAccountID, StripeOnboardingComplete AS BusinessStripeOnboardingComplete FROM Businesses - WHERE BusinessID = :businessID + WHERE ID = :businessID ", { businessID: businessID }); if (qBusiness.recordCount == 0) { @@ -76,8 +76,8 @@ try { if (!qBusiness.BusinessStripeOnboardingComplete) { queryExecute(" UPDATE Businesses - SET BusinessStripeOnboardingComplete = 1 - WHERE BusinessID = :businessID + SET StripeOnboardingComplete = 1 + WHERE ID = :businessID ", { businessID: businessID }); } } else if (detailsSubmitted) { diff --git a/api/tasks/getDetails.cfm b/api/tasks/getDetails.cfm index f4ab322..da4c488 100644 --- a/api/tasks/getDetails.cfm +++ b/api/tasks/getDetails.cfm @@ -54,17 +54,17 @@ o.ServicePointID, o.Remarks, o.SubmittedOn, - sp.ServicePointName AS ServicePointName, - sp.ServicePointTypeID AS ServicePointTypeID, - u.UserID AS CustomerUserID, - u.UserFirstName AS FirstName, - u.UserLastName AS LastName, - u.UserContactNumber AS ContactNumber + sp.Name AS ServicePointName, + sp.TypeID AS ServicePointTypeID, + u.ID AS CustomerUserID, + u.FirstName, + u.LastName, + u.ContactNumber FROM Tasks t LEFT JOIN TaskCategories tc ON tc.ID = t.CategoryID LEFT JOIN Orders o ON o.ID = t.OrderID - LEFT JOIN ServicePoints sp ON sp.ServicePointID = o.ServicePointID - LEFT JOIN Users u ON u.UserID = o.UserID + LEFT JOIN ServicePoints sp ON sp.ID = o.ServicePointID + LEFT JOIN Users u ON u.ID = o.UserID WHERE t.ID = ? ", [ { value = TaskID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })> @@ -129,7 +129,7 @@ SELECT b.UUID FROM ServicePoints sp_link INNER JOIN Beacons b ON b.ID = sp_link.BeaconID - WHERE sp_link.ServicePointID = ? + WHERE sp_link.ID = ? AND b.IsActive = 1 LIMIT 1 ", [ { value = qTask.ServicePointID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })> diff --git a/api/tasks/listMine.cfm b/api/tasks/listMine.cfm index bbe8990..c92c6ca 100644 --- a/api/tasks/listMine.cfm +++ b/api/tasks/listMine.cfm @@ -82,11 +82,11 @@ tt.Name AS TaskTypeName, tt.Icon AS TaskTypeIcon, tt.Color AS TaskTypeColor, - b.BusinessName AS BusinessName + 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 - LEFT JOIN Businesses b ON b.BusinessID = t.BusinessID + LEFT JOIN Businesses b ON b.ID = t.BusinessID WHERE #whereSQL# ORDER BY t.ClaimedOn DESC ", params, { datasource = "payfrit" })> diff --git a/api/users/search.cfm b/api/users/search.cfm index 3dc890e..bd29400 100644 --- a/api/users/search.cfm +++ b/api/users/search.cfm @@ -38,22 +38,22 @@ try { qUsers = queryExecute(" SELECT - u.UserID AS ID, - u.UserFirstName AS FirstName, - u.UserLastName AS LastName, - u.UserEmailAddress AS EmailAddress, - u.UserContactNumber AS ContactNumber, - u.UserAvatarPath + u.ID, + u.FirstName, + u.LastName, + u.EmailAddress, + u.ContactNumber, + u.ImageExtension FROM Users u - WHERE u.UserID != :currentUserId + WHERE u.ID != :currentUserId AND ( - u.UserContactNumber LIKE :searchTerm - OR u.UserEmailAddress LIKE :searchTerm - OR u.UserFirstName LIKE :searchTerm - OR u.UserLastName LIKE :searchTerm - OR CONCAT(u.UserFirstName, ' ', u.UserLastName) LIKE :searchTerm + u.ContactNumber LIKE :searchTerm + OR u.EmailAddress LIKE :searchTerm + OR u.FirstName LIKE :searchTerm + OR u.LastName LIKE :searchTerm + OR CONCAT(u.FirstName, ' ', u.LastName) LIKE :searchTerm ) - ORDER BY u.UserFirstName, u.UserLastName + ORDER BY u.FirstName, u.LastName LIMIT 10 ", { currentUserId: { value: currentUserId, cfsqltype: "cf_sql_integer" }, @@ -69,11 +69,11 @@ try { } arrayAppend(users, { - "UserID": user.UserID, + "UserID": user.ID, "Name": trim(user.FirstName & " " & user.LastName), "Email": user.EmailAddress, "Phone": maskedPhone, - "AvatarUrl": len(trim(user.UserAvatarPath)) ? "https://biz.payfrit.com/uploads/" & user.UserAvatarPath : "" + "AvatarUrl": len(trim(user.ImageExtension)) ? "https://biz.payfrit.com/uploads/users/" & user.ID & "." & user.ImageExtension : "" }); } diff --git a/api/workers/myBusinesses.cfm b/api/workers/myBusinesses.cfm index 9568f8c..2a8845b 100644 --- a/api/workers/myBusinesses.cfm +++ b/api/workers/myBusinesses.cfm @@ -40,13 +40,13 @@ e.BusinessID, MIN(e.StatusID) AS StatusID, MAX(e.IsActive) AS IsActive, - b.BusinessName AS Name, + b.Name AS Name, (SELECT COUNT(*) FROM Tasks t WHERE t.BusinessID = e.BusinessID AND t.ClaimedByUserID = 0) AS PendingTaskCount FROM Employees e - INNER JOIN Businesses b ON b.BusinessID = e.BusinessID + INNER JOIN Businesses b ON b.ID = e.BusinessID WHERE e.UserID = ? AND e.IsActive = b'1' - GROUP BY e.BusinessID, b.BusinessName - ORDER BY b.BusinessName ASC + GROUP BY e.BusinessID, b.Name + ORDER BY b.Name ASC ", [ { value = UserID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })> diff --git a/confirm_email.cfm b/confirm_email.cfm index 4345632..a2655b7 100644 --- a/confirm_email.cfm +++ b/confirm_email.cfm @@ -6,7 +6,7 @@ - SELECT ID AS UserID, EmailAddress + SELECT ID, EmailAddress FROM Users WHERE UUID = '#url.UUID#' AND @@ -49,7 +49,7 @@ - SELECT ID AS UserID, ContactNumber + SELECT ID, ContactNumber FROM Users WHERE UUID = '#url.UUID#' AND @@ -63,7 +63,7 @@ UPDATE Users SET IsEmailVerified = 1 - WHERE ID = '#get_confirmed_customer.UserID#' + WHERE ID = '#get_confirmed_customer.ID#' your email was confirmed but we still need to verify your mobile number!

@@ -73,7 +73,7 @@ UPDATE Users SET MobileVerifyCode = '#customer_OPT_confirm#' - WHERE ID = #get_confirmed_customer.UserID# + WHERE ID = #get_confirmed_customer.ID# we sent a six-digit code to #get_confirmed_customer.ContactNumber#, please input that code here: