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

working money and delivery dates

Browse Source
This commit is contained in:
Anekdotin
2024-03-29 19:56:59 -04:00
parent 666d0895e4
commit 6fab39bf86
11 changed files with 202 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/delivery_data/views.py
View File

@@ -5,8 +5,7 @@ from app.classes.customer import Customer_Customer
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
from app.classes.stats_employee import Stats_Employee_Oil, Stats_Employee_Office
@@ -25,11 +24,6 @@ def office_finalize_delivery(delivery_id):
.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_customer = db.session \
.query(Customer_Customer) \
.filter(Customer_Customer.id == get_delivery.customer_id) \
@@ -65,7 +59,6 @@ def office_finalize_delivery(delivery_id):
else:
delivery_payment_method = 3
same_day_info = request.json["same_day"]
if same_day_info is True:
same_day_info = 1
@@ -107,33 +100,31 @@ def driver_finalize_delivery(delivery_id):
"""
Finalizes a delivery from office
"""
print(request.json)
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())
print(get_delivery.id)
get_stats = (db.session
.query(Stats_Employee_Oil)
.filter(Stats_Employee_Oil == get_delivery.driver_employee_id)
.filter(Stats_Employee_Oil.employee_id == 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
.query(Employee_Employee)
.filter(Employee_Employee.id == delivery_driver_id)
.first())
same_driver = False
else:
same_driver = True
delivery_driver_id = request.json["driver_employee_id"]
get_driver = (db.session
.query(Employee_Employee)
.filter(Employee_Employee.id == delivery_driver_id)
.first())
customer_filled = request.json["customer_filled"]
if customer_filled is True:
customer_filled = 1
@@ -160,10 +151,10 @@ def driver_finalize_delivery(delivery_id):
get_delivery.customer_filled = customer_filled
get_delivery.cash_recieved = cash_amount
if same_driver == False:
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
@@ -174,7 +165,6 @@ def driver_finalize_delivery(delivery_id):
get_stats.total_gallons_delivered = current_gallons_delivered
# update delivery status to delivered
if get_delivery.payment_type == 0:
get_delivery.delivery_status = 10