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

added checks emergency fixed bugs

Browse Source
This commit is contained in:
Edwin Eames
2024-09-27 14:13:44 -04:00
parent 0e827053de
commit fec638a5c8
13 changed files with 262 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/delivery/views.py
View File

@@ -33,6 +33,7 @@ def get_a_delivery(delivery_id):
'delivery_gallons_ordered': get_delivery.gallons_ordered,
'delivery_dispatcher_notes': get_delivery.dispatcher_notes,
'delivery_prime': get_delivery.prime,
'delivery_emergency': get_delivery.emergency,
'delivery_same_day': get_delivery.same_day,
'when_ordered': get_delivery.when_ordered,
'customer_price': get_delivery.customer_price,
@@ -505,6 +506,7 @@ def create_a_delivery(user_id):
dispatcher_notes_taken = request.json["dispatcher_notes_taken"]
prime_info = request.json["prime"]
same_day_info = request.json["same_day"]
emergency_info = request.json["emergency"]
delivery_driver_id = request.json["driver_employee_id"]
@@ -570,6 +572,11 @@ def create_a_delivery(user_id):
else:
customer_fill_up = 0
if emergency_info is True:
emergency_asked = 1
else:
emergency_asked = 0
if prime_info is True:
prime_asked = 1
else:
@@ -585,17 +592,25 @@ def create_a_delivery(user_id):
now = datetime.utcnow()
# Pricing
if customer_fill_up == 1:
# Fill
precharge_amount = (250 * get_today_price.price_for_customer)
else:
# Gallons
precharge_amount = int(gallons_ordered) * get_today_price.price_for_customer
# if prime/emergency/sameday
if same_day_asked == 1 and prime_asked == 0:
total_precharge_amount = precharge_amount + get_today_price.price_same_day
elif prime_asked == 1 and same_day_asked == 0:
total_precharge_amount = precharge_amount + get_today_price.price_prime
elif emergency_asked == 1:
total_precharge_amount = precharge_amount + get_today_price.price_emergency
else:
total_precharge_amount = precharge_amount + get_today_price.price_prime + get_today_price.price_same_day
@@ -624,6 +639,7 @@ def create_a_delivery(user_id):
dispatcher_notes=dispatcher_notes_taken,
prime=prime_asked,
same_day=same_day_asked,
emergency=emergency_asked,
payment_type=delivery_payment_method,
payment_card_id=card_id_from_customer,
pre_charge_amount=total_precharge_amount,
@@ -798,25 +814,30 @@ def calculate_total(delivery_id):
get_price_query = (db.session
.query(Pricing_Oil_Oil)
.order_by(Pricing_Oil_Oil.date.asc())
.order_by(Pricing_Oil_Oil.date.desc())
.first())
if get_delivery.prime == 1:
priceprime = get_price_query.price_prime
else:
priceprime = 0
if get_delivery.emergency == 1:
priceemergency = get_price_query.price_emergency
else:
priceemergency = 0
if get_delivery.same_day == 1:
pricesameday = get_price_query.price_same_day
else:
pricesameday = 0
total = float(get_delivery.total_price) + float(priceprime) + float(pricesameday)
total = float(get_delivery.total_price) + float(priceprime) + float(pricesameday) + float(priceemergency)
return jsonify({
"ok": True,
'priceprime': priceprime,
'pricesameday': pricesameday,
'priceemergency': priceemergency,
'total_amount':total,
}), 200