unsure
This commit is contained in:
0
app/delivery_data/__init__.py
Normal file → Executable file
0
app/delivery_data/__init__.py
Normal file → Executable file
48
app/delivery_data/views.py
Normal file → Executable file
48
app/delivery_data/views.py
Normal file → Executable file
@@ -6,7 +6,7 @@ from app.classes.delivery import Delivery_Delivery
|
||||
from app.classes.employee import Employee_Employee
|
||||
from app.classes.cards import Card_Card
|
||||
from app.classes.pricing import Pricing_Oil_Oil
|
||||
|
||||
from app.classes.stats_employee import Stats_Employee_Oil
|
||||
|
||||
|
||||
|
||||
@@ -107,21 +107,23 @@ def driver_finalize_delivery(delivery_id):
|
||||
"""
|
||||
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_today_price = db.session \
|
||||
.query(Pricing_Oil_Oil) \
|
||||
.order_by(Pricing_Oil_Oil.id.desc()) \
|
||||
.first()
|
||||
get_today_price = (db.session
|
||||
.query(Pricing_Oil_Oil)
|
||||
.order_by(Pricing_Oil_Oil.id.desc())
|
||||
.first())
|
||||
|
||||
get_stats = (db.session
|
||||
.query(Stats_Employee_Oil)
|
||||
.filter(Stats_Employee_Oil == get_delivery.driver_employee_id)
|
||||
.first())
|
||||
|
||||
gallons_delivered = request.json["gallons_delivered"]
|
||||
|
||||
|
||||
|
||||
if request.json["driver_employee_id"]:
|
||||
delivery_driver_id = request.json["delivery_driver_id"]
|
||||
get_driver = (db.session
|
||||
@@ -146,11 +148,14 @@ def driver_finalize_delivery(delivery_id):
|
||||
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
|
||||
|
||||
|
||||
get_delivery.gallons_delivered = gallons_delivered
|
||||
|
||||
get_delivery.prime = prime_info
|
||||
get_delivery.customer_filled = customer_filled
|
||||
get_delivery.cash_recieved = cash_amount
|
||||
@@ -160,9 +165,24 @@ def driver_finalize_delivery(delivery_id):
|
||||
get_delivery.driver_first_name = get_driver.employee_first_name
|
||||
get_delivery.driver_employee_id = get_driver.id
|
||||
|
||||
# update delivery stattus to delivered
|
||||
get_delivery.delivery_status = 1
|
||||
|
||||
# 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
|
||||
|
||||
|
||||
|
||||
# update delivery status to delivered
|
||||
if get_delivery.payment_type == 0:
|
||||
get_delivery.delivery_status = 10
|
||||
else:
|
||||
#office needs to confirm credit card
|
||||
get_delivery.delivery_status = 1
|
||||
|
||||
db.session.add(get_stats)
|
||||
db.session.add(get_delivery)
|
||||
db.session.commit()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user