Remove DeliveryMultiplier from Businesses query (column no longer exists)
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
parent
152ac572c7
commit
e21a7f7266
3 changed files with 13 additions and 13 deletions
10
CLAUDE.md
10
CLAUDE.md
|
|
@ -5,15 +5,15 @@ Main CFML/JS repository: API + Portal + KDS + HUD + Receipt. Git repo on Forgejo
|
||||||
## Build & Deploy
|
## Build & Deploy
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Edit files directly on dev server via SSH (never locally, never scp)
|
# Deploy: SCP to /tmp on dev, then sudo cp to biz.payfrit.com/ path
|
||||||
ssh dev.payfrit.com
|
ssh dev.payfrit.com
|
||||||
|
|
||||||
# Files live at:
|
# Canonical source of truth on dev:
|
||||||
# Dev server: /opt/lucee/tomcat/webapps/ROOT/biz.payfrit.com/
|
# /opt/lucee/tomcat/webapps/ROOT/biz.payfrit.com/
|
||||||
# Local Lucee: C:\lucee\tomcat\webapps\ROOT\biz.payfrit.com\
|
# No local Lucee — all development happens on the dev server
|
||||||
```
|
```
|
||||||
|
|
||||||
**Dev symlinks** on dev server: `/api`, `/portal`, `/config` symlink to `biz.payfrit.com/` — edit once, both `dev.payfrit.com` and `biz.payfrit.com` paths work.
|
**Dev symlinks** on dev server: `/api`, `/portal`, `/config`, `/cron` are all symlinks to `biz.payfrit.com/`. **Always edit under `biz.payfrit.com/` — never the root symlinks directly.**
|
||||||
|
|
||||||
## Project Structure
|
## Project Structure
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -238,7 +238,7 @@
|
||||||
<!--- Create new cart order --->
|
<!--- Create new cart order --->
|
||||||
<cfset qBiz = queryTimed(
|
<cfset qBiz = queryTimed(
|
||||||
"
|
"
|
||||||
SELECT DeliveryMultiplier, DeliveryFlatFee
|
SELECT DeliveryFlatFee
|
||||||
FROM Businesses
|
FROM Businesses
|
||||||
WHERE ID = ?
|
WHERE ID = ?
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
|
|
@ -359,7 +359,7 @@
|
||||||
{ value = newUUID, cfsqltype = "cf_sql_varchar" },
|
{ value = newUUID, cfsqltype = "cf_sql_varchar" },
|
||||||
{ value = UserID, cfsqltype = "cf_sql_integer" },
|
{ value = UserID, cfsqltype = "cf_sql_integer" },
|
||||||
{ value = BusinessID, cfsqltype = "cf_sql_integer" },
|
{ value = BusinessID, cfsqltype = "cf_sql_integer" },
|
||||||
{ value = qBiz.DeliveryMultiplier, cfsqltype = "cf_sql_decimal" },
|
{ value = 1.0, cfsqltype = "cf_sql_decimal" },
|
||||||
{ value = OrderTypeID, cfsqltype = "cf_sql_integer" },
|
{ value = OrderTypeID, cfsqltype = "cf_sql_integer" },
|
||||||
{ value = deliveryFee, cfsqltype = "cf_sql_decimal" },
|
{ value = deliveryFee, cfsqltype = "cf_sql_decimal" },
|
||||||
{ value = nowDt, cfsqltype = "cf_sql_timestamp" },
|
{ value = nowDt, cfsqltype = "cf_sql_timestamp" },
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ try {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get business Stripe account
|
// Get business Stripe account
|
||||||
qBusiness = queryTimed("
|
qBusiness = queryExecute("
|
||||||
SELECT StripeAccountID AS BusinessStripeAccountID, StripeOnboardingComplete AS BusinessStripeOnboardingComplete, Name AS BusinessName
|
SELECT StripeAccountID AS BusinessStripeAccountID, StripeOnboardingComplete AS BusinessStripeOnboardingComplete, Name AS BusinessName
|
||||||
FROM Businesses
|
FROM Businesses
|
||||||
WHERE BusinessID = :businessID
|
WHERE BusinessID = :businessID
|
||||||
|
|
@ -74,15 +74,15 @@ try {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get order's delivery fee and grant economics (if applicable)
|
// Get order's delivery fee and grant economics (if applicable)
|
||||||
qOrder = queryTimed("
|
qOrder = queryExecute("
|
||||||
SELECT OrderDeliveryFee, OrderTypeID, GrantID, GrantOwnerBusinessID, GrantEconomicsType, GrantEconomicsValue
|
SELECT DeliveryFee, OrderTypeID, GrantID, GrantOwnerBusinessID, GrantEconomicsType, GrantEconomicsValue
|
||||||
FROM Orders
|
FROM Orders
|
||||||
WHERE OrderID = :orderID
|
WHERE ID = :orderID
|
||||||
", { orderID: orderID }, { datasource: "payfrit" });
|
", { orderID: orderID }, { datasource: "payfrit" });
|
||||||
|
|
||||||
deliveryFee = 0;
|
deliveryFee = 0;
|
||||||
if (qOrder.recordCount > 0 && qOrder.OrderTypeID == 3) {
|
if (qOrder.recordCount > 0 && qOrder.OrderTypeID == 3) {
|
||||||
deliveryFee = val(qOrder.OrderDeliveryFee);
|
deliveryFee = val(qOrder.DeliveryFee);
|
||||||
}
|
}
|
||||||
|
|
||||||
// SP-SM: Resolve grant economics
|
// SP-SM: Resolve grant economics
|
||||||
|
|
@ -169,7 +169,7 @@ try {
|
||||||
|
|
||||||
// Link PaymentIntent to worker payout ledger (if a ledger row exists for this order's task)
|
// Link PaymentIntent to worker payout ledger (if a ledger row exists for this order's task)
|
||||||
try {
|
try {
|
||||||
queryTimed("
|
queryExecute("
|
||||||
UPDATE WorkPayoutLedgers wpl
|
UPDATE WorkPayoutLedgers wpl
|
||||||
INNER JOIN Tasks t ON t.ID = wpl.TaskID AND t.OrderID = :orderID
|
INNER JOIN Tasks t ON t.ID = wpl.TaskID AND t.OrderID = :orderID
|
||||||
SET wpl.StripePaymentIntentID = :piID
|
SET wpl.StripePaymentIntentID = :piID
|
||||||
|
|
|
||||||
Reference in a new issue