Add PayfritFee to cart API responses
This commit is contained in:
parent
e03e021ea2
commit
1787671239
2 changed files with 7 additions and 3 deletions
|
|
@ -67,12 +67,13 @@
|
||||||
|
|
||||||
<!--- Get business info for display in cart --->
|
<!--- Get business info for display in cart --->
|
||||||
<cfset qBusiness = queryTimed(
|
<cfset qBusiness = queryTimed(
|
||||||
"SELECT DeliveryFlatFee, OrderTypes, TaxRate FROM Businesses WHERE ID = ? LIMIT 1",
|
"SELECT DeliveryFlatFee, OrderTypes, TaxRate, PayfritFee FROM Businesses WHERE ID = ? LIMIT 1",
|
||||||
[ { value = qOrder.BusinessID, cfsqltype = "cf_sql_integer" } ],
|
[ { value = qOrder.BusinessID, cfsqltype = "cf_sql_integer" } ],
|
||||||
{ datasource = "payfrit" }
|
{ datasource = "payfrit" }
|
||||||
)>
|
)>
|
||||||
<cfset businessDeliveryFee = qBusiness.recordCount GT 0 ? qBusiness.DeliveryFlatFee : 0>
|
<cfset businessDeliveryFee = qBusiness.recordCount GT 0 ? qBusiness.DeliveryFlatFee : 0>
|
||||||
<cfset businessTaxRate = qBusiness.recordCount GT 0 AND isNumeric(qBusiness.TaxRate) ? qBusiness.TaxRate : 0>
|
<cfset businessTaxRate = qBusiness.recordCount GT 0 AND isNumeric(qBusiness.TaxRate) ? qBusiness.TaxRate : 0>
|
||||||
|
<cfset businessPayfritFee = qBusiness.recordCount GT 0 AND isNumeric(qBusiness.PayfritFee) ? qBusiness.PayfritFee : 0.05>
|
||||||
<cfset businessOrderTypes = qBusiness.recordCount GT 0 AND len(trim(qBusiness.OrderTypes)) ? qBusiness.OrderTypes : "1,2,3">
|
<cfset businessOrderTypes = qBusiness.recordCount GT 0 AND len(trim(qBusiness.OrderTypes)) ? qBusiness.OrderTypes : "1,2,3">
|
||||||
<cfset businessOrderTypesArray = listToArray(businessOrderTypes, ",")>
|
<cfset businessOrderTypesArray = listToArray(businessOrderTypes, ",")>
|
||||||
|
|
||||||
|
|
@ -147,6 +148,7 @@
|
||||||
"DeliveryFee": deliveryFee,
|
"DeliveryFee": deliveryFee,
|
||||||
"BusinessDeliveryFee": val(businessDeliveryFee),
|
"BusinessDeliveryFee": val(businessDeliveryFee),
|
||||||
"TaxRate": val(businessTaxRate),
|
"TaxRate": val(businessTaxRate),
|
||||||
|
"PayfritFee": val(businessPayfritFee),
|
||||||
"Subtotal": subtotal,
|
"Subtotal": subtotal,
|
||||||
"Tax": taxAmount,
|
"Tax": taxAmount,
|
||||||
"Total": total,
|
"Total": total,
|
||||||
|
|
|
||||||
|
|
@ -64,14 +64,15 @@
|
||||||
<cfreturn { "OK": false, "ERROR": "not_found", "MESSAGE": "Order not found", "DETAIL": "" }>
|
<cfreturn { "OK": false, "ERROR": "not_found", "MESSAGE": "Order not found", "DETAIL": "" }>
|
||||||
</cfif>
|
</cfif>
|
||||||
|
|
||||||
<!--- Get business delivery fee and tax rate for display in cart --->
|
<!--- Get business delivery fee, tax rate, and payfrit fee for display in cart --->
|
||||||
<cfset var qBusiness = queryTimed(
|
<cfset var qBusiness = queryTimed(
|
||||||
"SELECT DeliveryFlatFee, TaxRate FROM Businesses WHERE ID = ? LIMIT 1",
|
"SELECT DeliveryFlatFee, TaxRate, PayfritFee FROM Businesses WHERE ID = ? LIMIT 1",
|
||||||
[ { value = qOrder.BusinessID, cfsqltype = "cf_sql_integer" } ],
|
[ { value = qOrder.BusinessID, cfsqltype = "cf_sql_integer" } ],
|
||||||
{ datasource = "payfrit" }
|
{ datasource = "payfrit" }
|
||||||
)>
|
)>
|
||||||
<cfset var businessDeliveryFee = qBusiness.recordCount GT 0 ? qBusiness.DeliveryFlatFee : 0>
|
<cfset var businessDeliveryFee = qBusiness.recordCount GT 0 ? qBusiness.DeliveryFlatFee : 0>
|
||||||
<cfset var businessTaxRate = qBusiness.recordCount GT 0 AND isNumeric(qBusiness.TaxRate) ? qBusiness.TaxRate : 0>
|
<cfset var businessTaxRate = qBusiness.recordCount GT 0 AND isNumeric(qBusiness.TaxRate) ? qBusiness.TaxRate : 0>
|
||||||
|
<cfset var businessPayfritFee = qBusiness.recordCount GT 0 AND isNumeric(qBusiness.PayfritFee) ? qBusiness.PayfritFee : 0.05>
|
||||||
|
|
||||||
<cfset out.Order = {
|
<cfset out.Order = {
|
||||||
"OrderID": val(qOrder.ID),
|
"OrderID": val(qOrder.ID),
|
||||||
|
|
@ -83,6 +84,7 @@
|
||||||
"DeliveryFee": val(qOrder.DeliveryFee),
|
"DeliveryFee": val(qOrder.DeliveryFee),
|
||||||
"BusinessDeliveryFee": val(businessDeliveryFee),
|
"BusinessDeliveryFee": val(businessDeliveryFee),
|
||||||
"TaxRate": val(businessTaxRate),
|
"TaxRate": val(businessTaxRate),
|
||||||
|
"PayfritFee": val(businessPayfritFee),
|
||||||
"StatusID": val(qOrder.StatusID),
|
"StatusID": val(qOrder.StatusID),
|
||||||
"AddressID": val(qOrder.AddressID),
|
"AddressID": val(qOrder.AddressID),
|
||||||
"PaymentID": val(qOrder.PaymentID),
|
"PaymentID": val(qOrder.PaymentID),
|
||||||
|
|
|
||||||
Reference in a new issue