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

updated forms

Browse Source
This commit is contained in:
Edwin Eames
2024-10-24 11:51:14 -04:00
parent 5649294be0
commit b3f0e85574
10 changed files with 340 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/delivery/views.py
View File

@@ -127,9 +127,7 @@ def get_deliveries_not_delivered_all(page):
deliveries = (db.session
.query(Delivery_Delivery)
.filter(Delivery_Delivery.delivery_status != 10)
.filter(Delivery_Delivery.delivery_status != 3)
.order_by(Delivery_Delivery.id.asc())
.order_by(Delivery_Delivery.id.desc())
.limit(per_page_amount).offset(offset_limit))
@@ -895,8 +893,13 @@ def calculate_total(delivery_id):
.query(Promo_Promo)
.filter(Promo_Promo.id == get_delivery.promo_id)
.first())
discount = (get_delivery.total_price * get_promo_data.money_off_delivery)
total_amount_after_discount = (get_delivery.total_price - discount)
discount_gallon_price = get_delivery.customer_price - get_promo_data.money_off_delivery
total_amount_after_discount = (get_delivery.gallons_ordered * discount_gallon_price)
discount = (get_delivery.gallons_ordered * get_delivery.customer_price) - total_amount_after_discount
else:
discount = 0
total_amount_after_discount = 0
@@ -906,22 +909,30 @@ def calculate_total(delivery_id):
.first())
if get_delivery.prime == 1:
priceprime = get_price_query.price_prime
priceprime = float(get_price_query.price_prime)
else:
priceprime = 0
if get_delivery.emergency == 1:
priceemergency = get_price_query.price_emergency
priceemergency = float(get_price_query.price_emergency)
else:
priceemergency = 0
if get_delivery.same_day == 1:
pricesameday = get_price_query.price_same_day
pricesameday = float(get_price_query.price_same_day)
else:
pricesameday = 0
total = float(get_delivery.total_price) + float(priceprime) + float(pricesameday) + float(priceemergency)
priceprime = round(priceprime, 2)
pricesameday = round(pricesameday, 2)
priceemergency = round(priceemergency, 2)
priceprime = round(priceprime, 2)
total_amount_after_discount = round(total_amount_after_discount, 2)
discount = round(discount, 2)
total = round(total, 2)
return jsonify({
"ok": True,
'priceprime': priceprime,