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

small fixes

Browse Source
This commit is contained in:
Edwin Eames
2024-12-23 18:10:18 -05:00
parent 86ec25a499
commit e6f85ff014
4 changed files with 152 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
app/delivery/views.py
View File

@@ -489,8 +489,13 @@ def edit_a_delivery(delivery_id):
.filter(Customer_Customer.id == get_delivery.customer_id) \
.first()
get_today_price = db.session\
.query(Pricing_Oil_Oil)\
.order_by(Pricing_Oil_Oil.id.desc())\
.first()
if not get_delivery:
return jsonify({"ok": False}), 200
return jsonify({"error": False}), 200
else:
gallons_ordered = request.json["gallons_ordered"]
delivery_status = request.json["delivery_status"]
@@ -499,6 +504,7 @@ def edit_a_delivery(delivery_id):
customer_wants_fill = request.json["customer_asked_for_fill"]
card_payment = request.json["credit"]
cash_payment = request.json["cash"]
emergency_info = request.json["emergency"]
dispatcher_notes = request.json["dispatcher_notes_taken"]
delivery_driver_id = request.json["driver_employee_id"]
@@ -561,6 +567,7 @@ def edit_a_delivery(delivery_id):
if customer_wants_fill is True:
customer_wants_fill = 1
gallons_ordered = 250
else:
customer_wants_fill = 0
@@ -570,13 +577,42 @@ def edit_a_delivery(delivery_id):
else:
same_day_info = 0
if emergency_info is True:
emergency_asked = 1
else:
emergency_asked = 0
prime_info = request.json["prime"]
if prime_info is True:
prime_info = 1
else:
prime_info = 0
dispatcher_notes
# Pricing
if customer_wants_fill == 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_info == 1 and prime_info == 0:
total_precharge_amount = precharge_amount + get_today_price.price_same_day
elif prime_info == 1 and same_day_info == 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
get_delivery.dispatcher_notes = dispatcher_notes
get_delivery.delivery_status = delivery_status
get_delivery.gallons_ordered = gallons_ordered
@@ -591,8 +627,11 @@ def edit_a_delivery(delivery_id):
get_delivery.driver_last_name = get_driver.employee_last_name
get_delivery.driver_first_name = get_driver.employee_first_name
get_delivery.driver_employee_id = get_driver.id
get_delivery.promo_id =promo_id_get_delivery
get_delivery.promo_id = promo_id_get_delivery
get_delivery.promo_money_discount = promo_money_discount_get_delivery
get_delivery.pre_charge_amount = total_precharge_amount
get_delivery.total_price = precharge_amount
db.session.add(get_delivery)
db.session.commit()
@@ -711,6 +750,7 @@ def create_a_delivery(user_id):
gallons_ordered = 250
else:
customer_fill_up = 0
gallons_ordered = request.json["gallons_ordered"]
if emergency_info is True:
emergency_asked = 1
@@ -731,6 +771,7 @@ def create_a_delivery(user_id):
customer_filled_name = get_customer.customer_first_name + ' ' + get_customer.customer_last_name
now = datetime.utcnow()
# Pricing
if customer_fill_up == 1:
@@ -788,9 +829,8 @@ def create_a_delivery(user_id):
driver_last_name=driver_l_name,
driver_first_name=driver_f_name,
driver_employee_id=driver_emp_id,
promo_id =promo_id_get_delivery,
promo_money_discount = promo_money_discount_get_delivery
promo_id=promo_id_get_delivery,
promo_money_discount=promo_money_discount_get_delivery
)