From 96c2ed3fc1e5c8f8d0a06390339417836002fbdb Mon Sep 17 00:00:00 2001
From: John Mizerek <mizerek@gmail.com>
Date: Mon, 2 Mar 2026 12:59:22 -0800
Subject: [PATCH] Fix cash payment fee: use real Payfrit platform fee, not
 2.25% cash handling fee
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

submitCash.cfm: Calculate platform fee from subtotal * PayfritFee,
store in Orders.PlatformFee and Payments.PaymentPayfritsCut on submission.

complete.cfm: Replace bogus 2.25% cash transaction fee with the real
platform fee (customer fee + business fee = 2 × PayfritFee × subtotal).
Credit full Payfrit revenue to User 0. Record business fee in
PaymentPayfritNetworkFees.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 api/orders/submitCash.cfm | 34 +++++++++++++++++++++++++++------
 api/tasks/complete.cfm    | 40 ++++++++++++++++++++++-----------------
 2 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/api/orders/submitCash.cfm b/api/orders/submitCash.cfm
index 5d0fc12..29ce89a 100644
--- a/api/orders/submitCash.cfm
+++ b/api/orders/submitCash.cfm
@@ -40,10 +40,13 @@
 </cfif>
 
 <cftry>
-  <!--- Get order details --->
+  <!--- Get order details with business fee rate --->
   <cfset qOrder = queryExecute(
-    "SELECT ID, StatusID, UserID, BusinessID, ServicePointID, PaymentID
-     FROM Orders WHERE ID = ? LIMIT 1",
+    "SELECT o.ID, o.StatusID, o.UserID, o.BusinessID, o.ServicePointID, o.PaymentID,
+            b.PayfritFee
+     FROM Orders o
+     INNER JOIN Businesses b ON b.ID = o.BusinessID
+     WHERE o.ID = ? LIMIT 1",
     [ { value = OrderID, cfsqltype = "cf_sql_integer" } ],
     { datasource = "payfrit" }
   )>
@@ -56,6 +59,21 @@
     <cfset apiAbort({ "OK": false, "ERROR": "bad_state", "MESSAGE": "Order is not in cart state." })>
   </cfif>
 
+  <!--- Calculate platform fee (customer portion — shown in cart) --->
+  <cfset feeRate = (isNumeric(qOrder.PayfritFee) AND val(qOrder.PayfritFee) GT 0) ? val(qOrder.PayfritFee) : 0>
+  <cfset customerFee = CashAmount * feeRate / (1 + feeRate)>
+  <!--- CashAmount already includes the customer fee (subtotal+tax+fee), back it out:
+        Actually CashAmount is what the Android app sends as the order total including fee.
+        The fee was calculated on subtotal, so we need the actual subtotal from line items. --->
+  <cfset qSubtotal = queryExecute(
+    "SELECT COALESCE(SUM(Price * Quantity), 0) AS Subtotal
+     FROM OrderLineItems WHERE OrderID = ? AND IsDeleted = b'0'",
+    [ { value = OrderID, cfsqltype = "cf_sql_integer" } ],
+    { datasource = "payfrit" }
+  )>
+  <cfset subtotal = val(qSubtotal.Subtotal)>
+  <cfset platformFee = subtotal * feeRate>
+
   <!--- Create Payment record with expected cash amount --->
   <cfset CashAmountCents = round(CashAmount * 100)>
   <cfset qInsertPayment = queryExecute(
@@ -65,30 +83,34 @@
        PaymentSentByUserID,
        PaymentReceivedByUserID,
        PaymentOrderID,
+       PaymentPayfritsCut,
        PaymentAddedOn
-     ) VALUES (?, 0, ?, 0, ?, NOW())",
+     ) VALUES (?, 0, ?, 0, ?, ?, NOW())",
     [
       { value = CashAmount, cfsqltype = "cf_sql_decimal" },
       { value = qOrder.UserID, cfsqltype = "cf_sql_integer" },
-      { value = OrderID, cfsqltype = "cf_sql_integer" }
+      { value = OrderID, cfsqltype = "cf_sql_integer" },
+      { value = platformFee, cfsqltype = "cf_sql_decimal" }
     ],
     { datasource = "payfrit", result = "insertResult" }
   )>
 
   <cfset PaymentID = insertResult.generatedKey>
 
-  <!--- Update order: link payment, set status to submitted, payment pending --->
+  <!--- Update order: link payment, set status to submitted, store platform fee --->
   <cfset queryExecute(
     "UPDATE Orders
      SET StatusID = 1,
          PaymentID = ?,
          PaymentStatus = 'pending',
+         PlatformFee = ?,
          TipAmount = ?,
          SubmittedOn = NOW(),
          LastEditedOn = NOW()
      WHERE ID = ?",
     [
       { value = PaymentID, cfsqltype = "cf_sql_integer" },
+      { value = platformFee, cfsqltype = "cf_sql_decimal" },
       { value = Tip, cfsqltype = "cf_sql_decimal" },
       { value = OrderID, cfsqltype = "cf_sql_integer" }
     ],
diff --git a/api/tasks/complete.cfm b/api/tasks/complete.cfm
index 0da7f86..e5c0700 100644
--- a/api/tasks/complete.cfm
+++ b/api/tasks/complete.cfm
@@ -161,28 +161,31 @@
     <cfset cashTip = val(qOrderTotal.TipAmount)>
     <cfset cashDeliveryFee = (val(qOrderTotal.OrderTypeID) EQ 3) ? val(qOrderTotal.DeliveryFee) : 0>
     <cfset cashPayfritFee = (isNumeric(qOrderTotal.PayfritFee) AND val(qOrderTotal.PayfritFee) GT 0) ? val(qOrderTotal.PayfritFee) : 0.05>
-    <cfset cashPlatformFee = cashSubtotal * cashPayfritFee>
-    <cfset orderTotalCents = round((cashSubtotal + cashTax + cashTip + cashDeliveryFee + cashPlatformFee) * 100)>
+
+    <!--- Customer fee: added to their total (visible in cart) --->
+    <cfset customerFeeDollars = cashSubtotal * cashPayfritFee>
+    <!--- Business fee: deducted when cash is distributed --->
+    <cfset businessFeeDollars = cashSubtotal * cashPayfritFee>
+    <!--- Total Payfrit revenue = customer fee + business fee --->
+    <cfset payfritRevenueDollars = customerFeeDollars + businessFeeDollars>
+
+    <cfset orderTotalCents = round((cashSubtotal + cashTax + cashTip + cashDeliveryFee + customerFeeDollars) * 100)>
 
     <cfif CashReceivedCents LT orderTotalCents>
       <cfset apiAbort({ "OK": false, "ERROR": "insufficient_cash", "MESSAGE": "Cash received ($#numberFormat(CashReceivedCents/100, '0.00')#) is less than order total ($#numberFormat(orderTotalCents/100, '0.00')#)." })>
     </cfif>
 
-    <!--- Calculate cash transaction fee (on order total) --->
-    <cfif orderTotalCents LT 1000>
-      <cfset feeCents = round(orderTotalCents * 0.0225)>
-    <cfelse>
-      <cfset feeCents = 22 + round(orderTotalCents * 0.0005)>
-    </cfif>
-
+    <cfset payfritRevenueCents = round(payfritRevenueDollars * 100)>
     <cfset changeCents = CashReceivedCents - orderTotalCents>
-    <cfset businessReceivesCents = orderTotalCents - feeCents>
+    <cfset businessReceivesCents = orderTotalCents - payfritRevenueCents>
 
     <cfset cashResult = {
       "orderTotalCents": orderTotalCents,
       "cashReceivedCents": CashReceivedCents,
       "changeCents": changeCents,
-      "feeCents": feeCents,
+      "customerFeeCents": round(customerFeeDollars * 100),
+      "businessFeeCents": round(businessFeeDollars * 100),
+      "payfritRevenueCents": payfritRevenueCents,
       "businessReceivesCents": businessReceivesCents
     }>
   </cfif>
@@ -296,12 +299,12 @@
       }, { datasource = "payfrit" })>
     </cfif>
 
-    <!--- Credit Payfrit fee to User 0 (Payfrit Network) --->
-    <cfif feeCents GT 0>
+    <!--- Credit Payfrit revenue (customer fee + business fee) to User 0 (Payfrit Network) --->
+    <cfif payfritRevenueCents GT 0>
       <cfset queryTimed("
         UPDATE Users SET Balance = Balance + :fee WHERE ID = 0
       ", {
-        fee: feeCents / 100
+        fee: payfritRevenueCents / 100
       }, { datasource = "payfrit" })>
     </cfif>
 
@@ -333,7 +336,7 @@
       ) VALUES (
         :sentBy, :receivedBy, :orderID,
         0, 0, :cashAmount,
-        :payfritCut, 0, 0,
+        :payfritCut, 0, :bizFee,
         'Cash payment', NOW()
       )
     ", {
@@ -341,7 +344,8 @@
       receivedBy: businessOwnerUserID,
       orderID: qTask.OrderID,
       cashAmount: CashReceivedCents / 100,
-      payfritCut: feeCents / 100
+      payfritCut: payfritRevenueCents / 100,
+      bizFee: round(businessFeeDollars * 100) / 100
     }, { datasource = "payfrit" })>
 
     <cfset cashProcessed = true>
@@ -410,7 +414,9 @@
     <cfset response["CashReceived"] = numberFormat(CashReceivedCents / 100, "0.00")>
     <cfset response["OrderTotal"] = numberFormat(orderTotalCents / 100, "0.00")>
     <cfset response["Change"] = numberFormat(changeCents / 100, "0.00")>
-    <cfset response["Fee"] = numberFormat(feeCents / 100, "0.00")>
+    <cfset response["CustomerFee"] = numberFormat(round(customerFeeDollars * 100) / 100, "0.00")>
+    <cfset response["BusinessFee"] = numberFormat(round(businessFeeDollars * 100) / 100, "0.00")>
+    <cfset response["PayfritRevenue"] = numberFormat(payfritRevenueCents / 100, "0.00")>
     <cfset response["BusinessReceives"] = numberFormat(businessReceivesCents / 100, "0.00")>
   </cfif>