Eamco/eamco_money_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug with discount

Browse Source
This commit is contained in:
Edwin Eames
2024-10-24 11:51:58 -04:00
parent c313680c13
commit 71a39c13ec
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/money.py
View File

@@ -1,7 +1,6 @@
from sqlalchemy import Column, Integer,\ from sqlalchemy import Column, Integer,\
DECIMAL, Text,\ DECIMAL, TEXT,\
VARCHAR, TIMESTAMP, DATE VARCHAR, TIMESTAMP, DATE
from datetime import datetime, timezone
from database import Base from database import Base

4
app/routers/delivery.py
View File

@@ -71,8 +71,10 @@ async def calculate_delivery_final(delivery_id_order):
if get_delivery.promo_id is not None: if get_delivery.promo_id is not None:
get_promo_amount = (float(get_delivery.gallons_delivered)) *(float(get_promo_data.money_off_delivery)) get_promo_amount = (float(get_delivery.gallons_delivered)) *(float(get_promo_data.money_off_delivery))
discount = (float(calc_total_oil)) - (float(get_promo_amount)) discount = (float(calc_total_oil)) - (float(get_promo_amount))
discount_amount = get_promo_data.money_off_delivery
else: else:
discount = 0 discount = 0
discount_amount = 0
# calculate fees # calculate fees
total_amount_fees_from_delivery = (float(same_day_price) + float(prime_price)) total_amount_fees_from_delivery = (float(same_day_price) + float(prime_price))
@@ -101,7 +103,7 @@ async def calculate_delivery_final(delivery_id_order):
total_amount_fee= total_amount_fees_from_delivery, total_amount_fee= total_amount_fees_from_delivery,
total_amount=total_amount_delivery, total_amount=total_amount_delivery,
taxes_paid=None, taxes_paid=None,
total_discount_amount=get_promo_data.money_off_delivery, total_discount_amount=discount_amount,
total_discount_total=discount, total_discount_total=discount,
total_profit_oil=profit_from_oil, total_profit_oil=profit_from_oil,
total_profit=profit_from_stop, total_profit=profit_from_stop,