work
This commit is contained in:
@@ -508,6 +508,11 @@ def edit_a_delivery(delivery_id):
|
|||||||
# 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"]
|
||||||
@@ -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"]:
|
||||||
|
|||||||
Reference in New Issue
Block a user