updated forms
This commit is contained in:
@@ -44,7 +44,7 @@ def office_finalize_delivery(delivery_id):
|
||||
description = None,
|
||||
)
|
||||
db.session.add(new_customer_desc)
|
||||
db.session.commit()
|
||||
db.session.flush()
|
||||
get_customer_description = db.session \
|
||||
.query(Customer_Description) \
|
||||
.filter(Customer_Description.customer_id == get_delivery.customer_id) \
|
||||
@@ -121,66 +121,14 @@ def office_finalize_delivery(delivery_id):
|
||||
cash_amount = None
|
||||
|
||||
|
||||
prime_info = request.json["prime"]
|
||||
if prime_info is True:
|
||||
prime_info = 1
|
||||
current_primes = get_stats_employee.total_primes
|
||||
newprimes = current_primes + 1
|
||||
get_stats_employee.total_primes = newprimes
|
||||
else:
|
||||
prime_info = 0
|
||||
|
||||
|
||||
|
||||
gallons_delivered = request.json["gallons_delivered"]
|
||||
cash = request.json["cash"]
|
||||
card_payment = request.json["card"]
|
||||
check_payment = request.json["check"]
|
||||
other_payment = request.json["other"]
|
||||
check_number = request.json["other"]
|
||||
|
||||
check_number = request.json["check_number"]
|
||||
|
||||
|
||||
if request.json["credit_card_id"]:
|
||||
card_payment_id = request.json["credit_card_id"]
|
||||
else:
|
||||
card_payment_id = None
|
||||
|
||||
if card_payment_id is not None:
|
||||
get_card = (db.session
|
||||
.query(Card_Card)
|
||||
.filter(Card_Card.id == card_payment_id)
|
||||
.filter(Card_Card.user_id == get_customer.id)
|
||||
.first())
|
||||
card_id_from_customer = get_card.id
|
||||
else:
|
||||
card_id_from_customer = None
|
||||
|
||||
|
||||
if cash is True and card_payment is False:
|
||||
delivery_payment_method = 0
|
||||
elif card_payment is True and cash is False:
|
||||
delivery_payment_method = 1
|
||||
elif card_payment is True and cash is True:
|
||||
delivery_payment_method = 2
|
||||
elif check_payment is True :
|
||||
delivery_payment_method = 3
|
||||
elif other_payment is True :
|
||||
delivery_payment_method = 4
|
||||
else:
|
||||
delivery_payment_method = 4
|
||||
|
||||
|
||||
same_day_info = request.json["same_day"]
|
||||
if same_day_info is True:
|
||||
same_day_info = 1
|
||||
else:
|
||||
same_day_info = 0
|
||||
|
||||
|
||||
emergency_info = request.json["emergency"]
|
||||
if emergency_info is True:
|
||||
emergency_info = 1
|
||||
else:
|
||||
emergency_info = 0
|
||||
|
||||
fill_location = request.json["fill_location"]
|
||||
|
||||
@@ -194,11 +142,6 @@ def office_finalize_delivery(delivery_id):
|
||||
# update delivery
|
||||
get_delivery.when_delivered = now
|
||||
get_delivery.gallons_delivered = gallons_delivered
|
||||
get_delivery.prime = prime_info
|
||||
get_delivery.emergency = emergency_info
|
||||
get_delivery.same_day = same_day_info
|
||||
get_delivery.payment_type = delivery_payment_method
|
||||
get_delivery.payment_card_id = card_id_from_customer
|
||||
get_delivery.cash_recieved = cash_amount
|
||||
get_delivery.check_number = check_number
|
||||
get_delivery.delivery_status = 10
|
||||
@@ -240,134 +183,134 @@ def office_finalize_delivery(delivery_id):
|
||||
|
||||
|
||||
|
||||
@delivery_data.route("/driver/finalize/<int:delivery_id>", methods=["PUT"])
|
||||
def driver_finalize_delivery(delivery_id):
|
||||
"""
|
||||
This will make a delivery finalized from the driver
|
||||
"""
|
||||
# @delivery_data.route("/driver/finalize/<int:delivery_id>", methods=["PUT"])
|
||||
# def driver_finalize_delivery(delivery_id):
|
||||
# """
|
||||
# This will make a delivery finalized from the driver
|
||||
# """
|
||||
|
||||
"""
|
||||
Finalizes a delivery from office
|
||||
"""
|
||||
# """
|
||||
# Finalizes a delivery from office
|
||||
# """
|
||||
|
||||
|
||||
get_delivery = (db.session
|
||||
.query(Delivery_Delivery)
|
||||
.filter(Delivery_Delivery.id == delivery_id)
|
||||
.first())
|
||||
# get_delivery = (db.session
|
||||
# .query(Delivery_Delivery)
|
||||
# .filter(Delivery_Delivery.id == delivery_id)
|
||||
# .first())
|
||||
|
||||
get_stats = (db.session
|
||||
.query(Stats_Employee_Oil)
|
||||
.filter(Stats_Employee_Oil.employee_id == get_delivery.driver_employee_id)
|
||||
.first())
|
||||
# get_stats = (db.session
|
||||
# .query(Stats_Employee_Oil)
|
||||
# .filter(Stats_Employee_Oil.employee_id == get_delivery.driver_employee_id)
|
||||
# .first())
|
||||
|
||||
if get_stats is None:
|
||||
create_stats = Stats_Employee_Oil(
|
||||
employee_id = get_delivery.driver_employee_id,
|
||||
total_deliveries = 0,
|
||||
total_gallons_delivered = 0,
|
||||
total_primes = 0,
|
||||
oil_total_profit_delivered = 0,
|
||||
)
|
||||
db.session.add(create_stats)
|
||||
db.session.flush()
|
||||
# if get_stats is None:
|
||||
# create_stats = Stats_Employee_Oil(
|
||||
# employee_id = get_delivery.driver_employee_id,
|
||||
# total_deliveries = 0,
|
||||
# total_gallons_delivered = 0,
|
||||
# total_primes = 0,
|
||||
# oil_total_profit_delivered = 0,
|
||||
# )
|
||||
# db.session.add(create_stats)
|
||||
# db.session.flush()
|
||||
|
||||
|
||||
get_stats = (db.session
|
||||
.query(Stats_Employee_Oil)
|
||||
.filter(Stats_Employee_Oil.employee_id == get_delivery.driver_employee_id)
|
||||
.first())
|
||||
gallons_delivered = request.json["gallons_delivered"]
|
||||
# get_stats = (db.session
|
||||
# .query(Stats_Employee_Oil)
|
||||
# .filter(Stats_Employee_Oil.employee_id == get_delivery.driver_employee_id)
|
||||
# .first())
|
||||
# gallons_delivered = request.json["gallons_delivered"]
|
||||
|
||||
gallons_delivered = Decimal(gallons_delivered)
|
||||
# gallons_delivered = Decimal(gallons_delivered)
|
||||
|
||||
delivery_driver_id = request.json["driver_employee_id"]
|
||||
# delivery_driver_id = request.json["driver_employee_id"]
|
||||
|
||||
get_driver = (db.session
|
||||
.query(Employee_Employee)
|
||||
.filter(Employee_Employee.id == delivery_driver_id)
|
||||
.first())
|
||||
# get_driver = (db.session
|
||||
# .query(Employee_Employee)
|
||||
# .filter(Employee_Employee.id == delivery_driver_id)
|
||||
# .first())
|
||||
|
||||
if get_delivery.automatic == 0:
|
||||
customer_filled = request.json["customer_filled"]
|
||||
if customer_filled is True:
|
||||
customer_filled = 1
|
||||
else:
|
||||
customer_filled = 0
|
||||
else:
|
||||
customer_filled = 1
|
||||
# if get_delivery.automatic == 0:
|
||||
# customer_filled = request.json["customer_filled"]
|
||||
# if customer_filled is True:
|
||||
# customer_filled = 1
|
||||
# else:
|
||||
# customer_filled = 0
|
||||
# else:
|
||||
# customer_filled = 1
|
||||
|
||||
|
||||
if request.json["cash_amount"]:
|
||||
cash_amount = request.json["cash_amount"]
|
||||
else:
|
||||
cash_amount = None
|
||||
# if request.json["cash_amount"]:
|
||||
# cash_amount = request.json["cash_amount"]
|
||||
# else:
|
||||
# cash_amount = None
|
||||
|
||||
|
||||
|
||||
prime_info = request.json["prime"]
|
||||
if prime_info is True:
|
||||
prime_info = 1
|
||||
current_primes = get_stats.total_primes
|
||||
newprimes = current_primes + 1
|
||||
get_stats.total_primes = newprimes
|
||||
else:
|
||||
prime_info = 0
|
||||
# prime_info = request.json["prime"]
|
||||
# if prime_info is True:
|
||||
# prime_info = 1
|
||||
# current_primes = get_stats.total_primes
|
||||
# newprimes = current_primes + 1
|
||||
# get_stats.total_primes = newprimes
|
||||
# else:
|
||||
# prime_info = 0
|
||||
|
||||
|
||||
|
||||
## AUTOMATIC
|
||||
if get_delivery.automatic == 1:
|
||||
get_auto_delivery = (db.session
|
||||
.query(Auto_Delivery)
|
||||
.filter(Auto_Delivery.customer_id == get_delivery.customer_id)
|
||||
.first())
|
||||
# ## AUTOMATIC
|
||||
# if get_delivery.automatic == 1:
|
||||
# get_auto_delivery = (db.session
|
||||
# .query(Auto_Delivery)
|
||||
# .filter(Auto_Delivery.customer_id == get_delivery.customer_id)
|
||||
# .first())
|
||||
|
||||
get_auto_delivery.auto_status = 2
|
||||
db.session.add(get_auto_delivery)
|
||||
# get_auto_delivery.auto_status = 2
|
||||
# db.session.add(get_auto_delivery)
|
||||
|
||||
get_delivery.gallons_delivered = gallons_delivered
|
||||
# get_delivery.gallons_delivered = gallons_delivered
|
||||
|
||||
get_delivery.prime = prime_info
|
||||
get_delivery.customer_filled = customer_filled
|
||||
get_delivery.cash_recieved = cash_amount
|
||||
# get_delivery.prime = prime_info
|
||||
# get_delivery.customer_filled = customer_filled
|
||||
# get_delivery.cash_recieved = cash_amount
|
||||
|
||||
|
||||
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.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
|
||||
|
||||
|
||||
# update stats
|
||||
current_deliveres = get_stats.total_deliveries + 1
|
||||
get_stats.total_deliveries = current_deliveres
|
||||
# # update stats
|
||||
# current_deliveres = get_stats.total_deliveries + 1
|
||||
# get_stats.total_deliveries = current_deliveres
|
||||
|
||||
current_gallons_delivered = get_stats.total_gallons_delivered + gallons_delivered
|
||||
get_stats.total_gallons_delivered = current_gallons_delivered
|
||||
# current_gallons_delivered = get_stats.total_gallons_delivered + gallons_delivered
|
||||
# get_stats.total_gallons_delivered = current_gallons_delivered
|
||||
|
||||
|
||||
# update delivery status to delivered
|
||||
if get_delivery.automatic == 0:
|
||||
if get_delivery.payment_type == 0:
|
||||
get_delivery.delivery_status = 10
|
||||
else:
|
||||
#office needs to confirm credit card
|
||||
get_delivery.delivery_status = 1
|
||||
else:
|
||||
get_delivery.delivery_status = 1
|
||||
# # update delivery status to delivered
|
||||
# if get_delivery.automatic == 0:
|
||||
# if get_delivery.payment_type == 0:
|
||||
# get_delivery.delivery_status = 10
|
||||
# else:
|
||||
# #office needs to confirm credit card
|
||||
# get_delivery.delivery_status = 1
|
||||
# else:
|
||||
# get_delivery.delivery_status = 1
|
||||
|
||||
|
||||
db.session.add(get_stats)
|
||||
db.session.add(get_delivery)
|
||||
# db.session.add(get_stats)
|
||||
# db.session.add(get_delivery)
|
||||
|
||||
db.session.commit()
|
||||
# db.session.commit()
|
||||
|
||||
|
||||
return jsonify({
|
||||
"ok": True,
|
||||
'delivery': {
|
||||
'id': get_delivery.id,
|
||||
},
|
||||
}), 200
|
||||
# return jsonify({
|
||||
# "ok": True,
|
||||
# 'delivery': {
|
||||
# 'id': get_delivery.id,
|
||||
# },
|
||||
# }), 200
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user