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

Fix remaining prefixed DB column names across 17 API files

Browse source 
Hours: HoursBusinessID/HoursDayID/HoursOpenTime/HoursClosingTime -> BusinessID/DayID/OpenTime/ClosingTime
ServicePoints: ServicePointID/ServicePointName/ServicePointBusinessID -> ID/Name/BusinessID
Users: UserFirstName/UserLastName/UserEmailAddress/UserContactNumber -> FirstName/LastName/EmailAddress/ContactNumber
Orders: BusinessDeliveryMultiplier -> DeliveryMultiplier (column renamed in dev DB)
Businesses: BusinessParentBusinessID -> ParentBusinessID
tt_Days: tt_DayID/tt_DayName -> ID/Name

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
John Mizerek 2026-01-31 20:35:24 -08:00
parent 4f5ba7f549
commit 78035e9cf6
17 changed files with 55 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
api/admin/cleanupForLazyDaisy.cfm
View file

@ -13,7 +13,7 @@ try {
queryExecute(" queryExecute("
UPDATE ServicePoints UPDATE ServicePoints
SET BeaconID = NULL, AssignedByUserID = NULL SET BeaconID = NULL, AssignedByUserID = NULL
WHERE ServicePointBusinessID != :keepID AND BeaconID IS NOT NULL WHERE BusinessID != :keepID AND BeaconID IS NOT NULL
", { keepID: keepBusinessID }, { datasource: "payfrit" }); ", { keepID: keepBusinessID }, { datasource: "payfrit" });
response.steps.append("Unassigned beacons from other businesses' service points"); response.steps.append("Unassigned beacons from other businesses' service points");
@ -54,7 +54,7 @@ try {
// Delete Hours for other businesses // Delete Hours for other businesses
queryExecute(" queryExecute("
DELETE FROM Hours WHERE HoursBusinessID != :keepID DELETE FROM Hours WHERE BusinessID != :keepID
", { keepID: keepBusinessID }, { datasource: "payfrit" }); ", { keepID: keepBusinessID }, { datasource: "payfrit" });
response.steps.append("Deleted hours from other businesses"); response.steps.append("Deleted hours from other businesses");
@ -71,7 +71,7 @@ try {
// Delete ServicePoints for other businesses // Delete ServicePoints for other businesses
try { try {
queryExecute(" queryExecute("
DELETE FROM ServicePoints WHERE ServicePointBusinessID != :keepID DELETE FROM ServicePoints WHERE BusinessID != :keepID
", { keepID: keepBusinessID }, { datasource: "payfrit" }); ", { keepID: keepBusinessID }, { datasource: "payfrit" });
response.steps.append("Deleted service points from other businesses"); response.steps.append("Deleted service points from other businesses");
} catch (any e) { } catch (any e) {
@ -106,11 +106,11 @@ try {
// Get beacon status // Get beacon status
qBeacons = queryExecute(" qBeacons = queryExecute("
SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.ServicePointBusinessID AS BusinessID, SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.BusinessID AS BusinessID,
b.UUID, biz.Name AS BusinessName, sp.ServicePointName AS ServicePointName b.UUID, biz.Name AS BusinessName, sp.Name AS ServicePointName
FROM ServicePoints sp FROM ServicePoints sp
JOIN Beacons b ON b.ID = sp.BeaconID JOIN Beacons b ON b.ID = sp.BeaconID
JOIN Businesses biz ON biz.ID = sp.ServicePointBusinessID JOIN Businesses biz ON biz.ID = sp.BusinessID
WHERE sp.BeaconID IS NOT NULL WHERE sp.BeaconID IS NOT NULL
", {}, { datasource: "payfrit" }); ", {}, { datasource: "payfrit" });

6
api/admin/debugUserByPhone.cfm
View file

@ -20,10 +20,10 @@ if (len(phone) == 0) {
// Find user by phone // Find user by phone
qUser = queryExecute(" qUser = queryExecute("
SELECT UserID AS ID, UserFirstName AS FirstName, UserLastName AS LastName, UserEmailAddress AS EmailAddress, UserContactNumber AS ContactNumber SELECT ID, FirstName, LastName, EmailAddress, ContactNumber
FROM Users FROM Users
WHERE REPLACE(REPLACE(REPLACE(UserContactNumber, '-', ''), '(', ''), ')', '') LIKE ? WHERE REPLACE(REPLACE(REPLACE(ContactNumber, '-', ''), '(', ''), ')', '') LIKE ?
OR UserContactNumber LIKE ? OR ContactNumber LIKE ?
", [ ", [
{ value: "%" & phone & "%", cfsqltype: "cf_sql_varchar" }, { value: "%" & phone & "%", cfsqltype: "cf_sql_varchar" },
{ value: "%" & phone & "%", cfsqltype: "cf_sql_varchar" } { value: "%" & phone & "%", cfsqltype: "cf_sql_varchar" }

34
api/admin/setupBigDeansInfo.cfm
View file

@ -53,7 +53,7 @@ try {
// Check existing hours for this business // Check existing hours for this business
existingHours = queryExecute(" existingHours = queryExecute("
SELECT COUNT(*) as cnt FROM Hours WHERE HoursBusinessID = :bizId SELECT COUNT(*) as cnt FROM Hours WHERE BusinessID = :bizId
", { bizId: businessId }); ", { bizId: businessId });
if (existingHours.cnt == 0) { if (existingHours.cnt == 0) {
@ -64,33 +64,33 @@ try {
// Sun: 11am-10pm (day 1) // Sun: 11am-10pm (day 1)
// Sunday (1): 11am-10pm // Sunday (1): 11am-10pm
queryExecute("INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime) VALUES (:bizId, 1, '11:00:00', '22:00:00')", { bizId: businessId }); queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 1, '11:00:00', '22:00:00')", { bizId: businessId });
// Monday (2): 11am-10pm // Monday (2): 11am-10pm
queryExecute("INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime) VALUES (:bizId, 2, '11:00:00', '22:00:00')", { bizId: businessId }); queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 2, '11:00:00', '22:00:00')", { bizId: businessId });
// Tuesday (3): 11am-10pm // Tuesday (3): 11am-10pm
queryExecute("INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime) VALUES (:bizId, 3, '11:00:00', '22:00:00')", { bizId: businessId }); queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 3, '11:00:00', '22:00:00')", { bizId: businessId });
// Wednesday (4): 11am-10pm // Wednesday (4): 11am-10pm
queryExecute("INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime) VALUES (:bizId, 4, '11:00:00', '22:00:00')", { bizId: businessId }); queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 4, '11:00:00', '22:00:00')", { bizId: businessId });
// Thursday (5): 11am-10pm // Thursday (5): 11am-10pm
queryExecute("INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime) VALUES (:bizId, 5, '11:00:00', '22:00:00')", { bizId: businessId }); queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 5, '11:00:00', '22:00:00')", { bizId: businessId });
// Friday (6): 11am-11pm // Friday (6): 11am-11pm
queryExecute("INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime) VALUES (:bizId, 6, '11:00:00', '23:00:00')", { bizId: businessId }); queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 6, '11:00:00', '23:00:00')", { bizId: businessId });
// Saturday (7): 11am-11pm // Saturday (7): 11am-11pm
queryExecute("INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime) VALUES (:bizId, 7, '11:00:00', '23:00:00')", { bizId: businessId }); queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 7, '11:00:00', '23:00:00')", { bizId: businessId });
response["HOURS_ACTION"] = "inserted 7 days"; response["HOURS_ACTION"] = "inserted 7 days";
} else { } else {
// Update existing hours // Update existing hours
// Mon-Thu: 11am-10pm // Mon-Thu: 11am-10pm
queryExecute("UPDATE Hours SET HoursOpenTime = '11:00:00', HoursClosingTime = '22:00:00' WHERE HoursBusinessID = :bizId AND HoursDayID IN (1, 2, 3, 4, 5)", { bizId: businessId }); queryExecute("UPDATE Hours SET OpenTime = '11:00:00', ClosingTime = '22:00:00' WHERE BusinessID = :bizId AND DayID IN (1, 2, 3, 4, 5)", { bizId: businessId });
// Fri-Sat: 11am-11pm // Fri-Sat: 11am-11pm
queryExecute("UPDATE Hours SET HoursOpenTime = '11:00:00', HoursClosingTime = '23:00:00' WHERE HoursBusinessID = :bizId AND HoursDayID IN (6, 7)", { bizId: businessId }); queryExecute("UPDATE Hours SET OpenTime = '11:00:00', ClosingTime = '23:00:00' WHERE BusinessID = :bizId AND DayID IN (6, 7)", { bizId: businessId });
response["HOURS_ACTION"] = "updated"; response["HOURS_ACTION"] = "updated";
} }
@ -114,11 +114,11 @@ try {
", { bizId: businessId }); ", { bizId: businessId });
hours = queryExecute(" hours = queryExecute("
SELECT h.*, d.tt_DayName SELECT h.*, d.Name AS DayName
FROM Hours h FROM Hours h
JOIN tt_Days d ON d.tt_DayID = h.HoursDayID JOIN tt_Days d ON d.ID = h.DayID
WHERE h.HoursBusinessID = :bizId WHERE h.BusinessID = :bizId
ORDER BY h.HoursDayID ORDER BY h.DayID
", { bizId: businessId }); ", { bizId: businessId });
response["OK"] = true; response["OK"] = true;
@ -133,9 +133,9 @@ try {
hoursArr = []; hoursArr = [];
for (h in hours) { for (h in hours) {
arrayAppend(hoursArr, { arrayAppend(hoursArr, {
"day": h.tt_DayName, "day": h.DayName,
"open": timeFormat(h.HoursOpenTime, "h:mm tt"), "open": timeFormat(h.OpenTime, "h:mm tt"),
"close": timeFormat(h.HoursClosingTime, "h:mm tt") "close": timeFormat(h.ClosingTime, "h:mm tt")
}); });
} }
response["HOURS"] = hoursArr; response["HOURS"] = hoursArr;

8
api/admin/switchBeacons.cfm
View file

@ -25,17 +25,17 @@ queryExecute("
queryExecute(" queryExecute("
UPDATE ServicePoints UPDATE ServicePoints
SET BeaconID = NULL, AssignedByUserID = NULL SET BeaconID = NULL, AssignedByUserID = NULL
WHERE ServicePointBusinessID = :fromBiz AND BeaconID IS NOT NULL WHERE BusinessID = :fromBiz AND BeaconID IS NOT NULL
", { fromBiz: fromBiz }, { datasource: "payfrit" }); ", { fromBiz: fromBiz }, { datasource: "payfrit" });
// Get current state // Get current state
q = queryExecute(" q = queryExecute("
SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.ServicePointBusinessID AS BusinessID, SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.BusinessID AS BusinessID,
b.Name AS BeaconName, biz.Name AS BusinessName, b.Name AS BeaconName, biz.Name AS BusinessName,
sp.ServicePointName AS ServicePointName sp.Name AS ServicePointName
FROM ServicePoints sp FROM ServicePoints sp
JOIN Beacons b ON b.ID = sp.BeaconID JOIN Beacons b ON b.ID = sp.BeaconID
JOIN Businesses biz ON biz.ID = sp.ServicePointBusinessID JOIN Businesses biz ON biz.ID = sp.BusinessID
WHERE sp.BeaconID IS NOT NULL WHERE sp.BeaconID IS NOT NULL
", {}, { datasource: "payfrit" }); ", {}, { datasource: "payfrit" });

6
api/admin/updateBeaconMapping.cfm
View file

@ -25,7 +25,7 @@ queryExecute("
queryExecute(" queryExecute("
UPDATE ServicePoints UPDATE ServicePoints
SET BeaconID = NULL, AssignedByUserID = NULL SET BeaconID = NULL, AssignedByUserID = NULL
WHERE BeaconID = :beaconId AND ServicePointBusinessID = :oldBizId WHERE BeaconID = :beaconId AND BusinessID = :oldBizId
", { beaconId: beaconId, oldBizId: oldBusinessId }, { datasource: "payfrit" }); ", { beaconId: beaconId, oldBizId: oldBusinessId }, { datasource: "payfrit" });
// Get current state // Get current state
@ -36,8 +36,8 @@ q = queryExecute("
b.Name AS BeaconName, b.Name AS BeaconName,
b.BusinessID AS BeaconBusinessID, b.BusinessID AS BeaconBusinessID,
sp.ID AS ServicePointID, sp.ID AS ServicePointID,
sp.ServicePointName AS ServicePointName, sp.Name AS ServicePointName,
sp.ServicePointBusinessID AS ServicePointBusinessID, sp.BusinessID AS ServicePointBusinessID,
biz.Name AS BusinessName biz.Name AS BusinessName
FROM Beacons b FROM Beacons b
LEFT JOIN ServicePoints sp ON sp.BeaconID = b.ID LEFT JOIN ServicePoints sp ON sp.BeaconID = b.ID

2
api/assignments/save.cfm
View file

@ -48,7 +48,7 @@ ServicePointID = int(data.ServicePointID);
<!--- Validate Beacon is allowed for this Business: <!--- Validate Beacon is allowed for this Business:
Owner (Beacons.BusinessID) OR join table (lt_BeaconsID_BusinessesID) OR parent's owner ---> Owner (Beacons.BusinessID) OR join table (lt_BeaconsID_BusinessesID) OR parent's owner --->
<cfquery name="qBiz" datasource="payfrit"> <cfquery name="qBiz" datasource="payfrit">
SELECT ID, BusinessParentBusinessID AS ParentBusinessID SELECT ID, ParentBusinessID
FROM Businesses FROM Businesses
WHERE ID = <cfqueryparam cfsqltype="cf_sql_integer" value="#request.BusinessID#"> WHERE ID = <cfqueryparam cfsqltype="cf_sql_integer" value="#request.BusinessID#">
LIMIT 1 LIMIT 1

4
api/businesses/updateHours.cfm
View file

@ -38,7 +38,7 @@ try {
// Delete all existing hours for this business // Delete all existing hours for this business
queryExecute(" queryExecute("
DELETE FROM Hours WHERE HoursBusinessID = :bizID DELETE FROM Hours WHERE BusinessID = :bizID
", { bizID: businessId }, { datasource: "payfrit" }); ", { bizID: businessId }, { datasource: "payfrit" });
// Insert new hours // Insert new hours
@ -55,7 +55,7 @@ try {
if (len(closeTime) == 5) closeTime = closeTime & ":00"; if (len(closeTime) == 5) closeTime = closeTime & ":00";
queryExecute(" queryExecute("
INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime) INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime)
VALUES (:bizID, :dayID, :openTime, :closeTime) VALUES (:bizID, :dayID, :openTime, :closeTime)
", { ", {
bizID: businessId, bizID: businessId,

4
api/orders/getCart.cfm
View file

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

6
api/orders/getOrCreateCart.cfm
View file

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

4
api/orders/setLineItem.cfm
View file

@ -180,7 +180,7 @@
o.UUID, o.UUID,
o.UserID, o.UserID,
o.BusinessID, o.BusinessID,
o.BusinessDeliveryMultiplier, o.DeliveryMultiplier,
o.OrderTypeID, o.OrderTypeID,
o.DeliveryFee, o.DeliveryFee,
o.StatusID, o.StatusID,
@ -210,7 +210,7 @@
"UUID": qOrder.UUID ?: "", "UUID": qOrder.UUID ?: "",
"UserID": val(qOrder.UserID), "UserID": val(qOrder.UserID),
"BusinessID": val(qOrder.BusinessID), "BusinessID": val(qOrder.BusinessID),
"DeliveryMultiplier": val(qOrder.BusinessDeliveryMultiplier), "DeliveryMultiplier": val(qOrder.DeliveryMultiplier),
"OrderTypeID": val(qOrder.OrderTypeID), "OrderTypeID": val(qOrder.OrderTypeID),
"DeliveryFee": val(qOrder.DeliveryFee), "DeliveryFee": val(qOrder.DeliveryFee),
"StatusID": val(qOrder.StatusID), "StatusID": val(qOrder.StatusID),

4
api/orders/setOrderType.cfm
View file

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

4
api/orders/submit.cfm
View file

@ -141,9 +141,9 @@
<cfset qOrder = queryExecute( <cfset qOrder = queryExecute(
" "
SELECT o.ID, o.StatusID, o.OrderTypeID, o.BusinessID, o.ServicePointID, SELECT o.ID, o.StatusID, o.OrderTypeID, o.BusinessID, o.ServicePointID,
sp.ServicePointName AS Name sp.Name AS Name
FROM Orders o FROM Orders o
LEFT JOIN ServicePoints sp ON sp.ServicePointID = o.ServicePointID LEFT JOIN ServicePoints sp ON sp.ID = o.ServicePointID
WHERE o.ID = ? WHERE o.ID = ?
LIMIT 1 LIMIT 1
", ",

4
api/orders/updateStatus.cfm
View file

@ -38,9 +38,9 @@
<!--- Verify order exists and get details ---> <!--- Verify order exists and get details --->
<cfset qOrder = queryExecute(" <cfset qOrder = queryExecute("
SELECT o.ID, o.StatusID, o.BusinessID, o.ServicePointID, SELECT o.ID, o.StatusID, o.BusinessID, o.ServicePointID,
sp.ServicePointName AS Name sp.Name AS Name
FROM Orders o FROM Orders o
LEFT JOIN ServicePoints sp ON sp.ServicePointID = o.ServicePointID LEFT JOIN ServicePoints sp ON sp.ID = o.ServicePointID
WHERE o.ID = ? WHERE o.ID = ?
LIMIT 1 LIMIT 1
", [ { value = OrderID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })> ", [ { value = OrderID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>

2
api/portal/getSettings.cfm
View file

@ -60,7 +60,7 @@ try {
// Get owner email from Users table // Get owner email from Users table
qUser = queryExecute(" qUser = queryExecute("
SELECT UserContactNumber AS ContactNumber, UserEmailAddress AS EmailAddress SELECT ContactNumber, EmailAddress
FROM Users FROM Users
WHERE ID = (SELECT UserID FROM Businesses WHERE ID = :businessId) WHERE ID = (SELECT UserID FROM Businesses WHERE ID = :businessId)
LIMIT 1 LIMIT 1

2
api/servicepoints/delete.cfm
View file

@ -50,7 +50,7 @@ servicePointId = int(data.ServicePointID);
<cfquery datasource="payfrit"> <cfquery datasource="payfrit">
UPDATE ServicePoints UPDATE ServicePoints
SET IsActive = 0 SET IsActive = 0
WHERE ServicePointID = <cfqueryparam cfsqltype="cf_sql_integer" value="#servicePointId#"> WHERE ID = <cfqueryparam cfsqltype="cf_sql_integer" value="#servicePointId#">
AND BusinessID = <cfqueryparam cfsqltype="cf_sql_integer" value="#bizId#"> AND BusinessID = <cfqueryparam cfsqltype="cf_sql_integer" value="#bizId#">
</cfquery> </cfquery>

2
api/servicepoints/save.cfm
View file

@ -66,7 +66,7 @@ if (structKeyExists(data, "IsActive")) {
TypeID = <cfqueryparam cfsqltype="cf_sql_integer" value="#spTypeID#">, TypeID = <cfqueryparam cfsqltype="cf_sql_integer" value="#spTypeID#">,
IsActive = <cfqueryparam cfsqltype="cf_sql_tinyint" value="#isActive#">, IsActive = <cfqueryparam cfsqltype="cf_sql_tinyint" value="#isActive#">,
SortOrder = <cfqueryparam cfsqltype="cf_sql_integer" value="#sortOrder#"> SortOrder = <cfqueryparam cfsqltype="cf_sql_integer" value="#sortOrder#">
WHERE ServicePointID = <cfqueryparam cfsqltype="cf_sql_integer" value="#servicePointId#"> WHERE ID = <cfqueryparam cfsqltype="cf_sql_integer" value="#servicePointId#">
AND BusinessID = <cfqueryparam cfsqltype="cf_sql_integer" value="#request.BusinessID#"> AND BusinessID = <cfqueryparam cfsqltype="cf_sql_integer" value="#request.BusinessID#">
</cfquery> </cfquery>

6
api/setup/saveWizard.cfm
View file

@ -173,7 +173,7 @@ try {
// Insert hours record for this day // Insert hours record for this day
queryExecute(" queryExecute("
INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime) INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime)
VALUES (:bizID, :dayID, :openTime, :closeTime) VALUES (:bizID, :dayID, :openTime, :closeTime)
", { ", {
bizID: businessId, bizID: businessId,
@ -319,9 +319,9 @@ try {
// Validate menu hours fall within business operating hours // Validate menu hours fall within business operating hours
if (len(menuStartTime) && len(menuEndTime)) { if (len(menuStartTime) && len(menuEndTime)) {
qHours = queryExecute(" qHours = queryExecute("
SELECT MIN(HoursOpenTime) as earliestOpen, MAX(HoursClosingTime) as latestClose SELECT MIN(OpenTime) as earliestOpen, MAX(ClosingTime) as latestClose
FROM Hours FROM Hours
WHERE HoursBusinessID = :bizID WHERE BusinessID = :bizID
", { bizID: businessId }, { datasource: "payfrit" }); ", { bizID: businessId }, { datasource: "payfrit" });
if (qHours.recordCount > 0 && !isNull(qHours.earliestOpen) && !isNull(qHours.latestClose)) { if (qHours.recordCount > 0 && !isNull(qHours.earliestOpen) && !isNull(qHours.latestClose)) {