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

work

Browse Source
This commit is contained in:
Edwin Eames
2025-09-07 18:29:54 -04:00
parent 8753e3e103
commit 14abc3c2b4
1 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/delivery/views.py
View File

@@ -507,7 +507,12 @@ def edit_a_delivery(delivery_id):
else: else:
# Optionally, handle the case where the driver ID is invalid # Optionally, handle the case where the driver ID is invalid
# For now, we'll just not update the driver info. # For now, we'll just not update the driver info.
pass pass
else:
# No driver provided, set to empty values
get_delivery.driver_employee_id = 0
get_delivery.driver_first_name = ""
get_delivery.driver_last_name = ""
# --- Handle Promotion --- # --- Handle Promotion ---
promo_id = data.get("promo_id") promo_id = data.get("promo_id")
@@ -584,8 +589,7 @@ def create_a_delivery(user_id):
prime_info = request.json["prime"] prime_info = request.json["prime"]
same_day_info = request.json["same_day"] same_day_info = request.json["same_day"]
emergency_info = request.json["emergency"] emergency_info = request.json["emergency"]
delivery_driver_id = request.json["driver_employee_id"] delivery_driver_id = request.json.get("driver_employee_id", 0)
card_payment = request.json["credit"] card_payment = request.json["credit"]
cash_payment = request.json["cash"] cash_payment = request.json["cash"]
@@ -601,9 +605,9 @@ def create_a_delivery(user_id):
except: except:
promo_id = None promo_id = None
if promo_id is not None: if promo_id is not None:
get_promo_data = (db.session get_promo_data = (db.session
.query(Promo_Promo) .query(Promo_Promo)
.filter(Promo_Promo.id == promo_id) .filter(Promo_Promo.id == promo_id)
.first()) .first())
promo_id_get_delivery =get_promo_data.id, promo_id_get_delivery =get_promo_data.id,
promo_money_discount_get_delivery = get_promo_data.money_off_delivery promo_money_discount_get_delivery = get_promo_data.money_off_delivery
@@ -611,14 +615,14 @@ def create_a_delivery(user_id):
promo_id_get_delivery =None promo_id_get_delivery =None
promo_money_discount_get_delivery = None promo_money_discount_get_delivery = None
# 0 = cash only # 0 = cash only
# 1 = credit only # 1 = credit only
# 2 = credit /cash # 2 = credit /cash
# 3 = check # 3 = check
# 4 = other # 4 = other
# 5 = unknown # 5 = unknown
if cash_payment is True: if cash_payment is True:
delivery_payment_method = 0 delivery_payment_method = 0
if card_payment is True: if card_payment is True:
@@ -628,15 +632,18 @@ def create_a_delivery(user_id):
if other_payment is True: if other_payment is True:
delivery_payment_method = 4 delivery_payment_method = 4
if delivery_driver_id:
get_driver = (db.session get_driver = (db.session
.query(Employee_Employee) .query(Employee_Employee)
.filter(Employee_Employee.id == delivery_driver_id) .filter(Employee_Employee.id == delivery_driver_id)
.first()) .first())
driver_l_name = get_driver.employee_last_name
driver_l_name = get_driver.employee_last_name driver_f_name = get_driver.employee_first_name
driver_f_name = get_driver.employee_first_name driver_emp_id = get_driver.id
driver_emp_id = get_driver.id else:
driver_l_name = ""
driver_f_name = ""
driver_emp_id = 0
try: try:
if request.json["credit_card_id"]: if request.json["credit_card_id"]: