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

Office driver api get data works

Browse Source
This commit is contained in:
amnesia
2024-03-12 18:28:22 -04:00
parent b71bbe2dc5
commit 001b8218bd
17 changed files with 345 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/delivery/views.py
View File

@@ -1,9 +1,8 @@
from flask import request, jsonify
from flask_login import current_user
from datetime import date
from datetime import date, datetime, timedelta
from app.delivery import delivery
from app import db
from datetime import datetime
from app.classes.customer import Customer_Customer
from app.classes.delivery import (Delivery_Delivery,
Delivery_Delivery_schema,
@@ -11,6 +10,7 @@ from app.classes.delivery import (Delivery_Delivery,
Delivery_Payment,
Delivery_Payment_schema,
)
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.auth import Auth_User
@@ -20,12 +20,10 @@ from app.classes.pricing import Pricing_Service_General
def get_a_delivery(delivery_id):
"""
"""
get_delivery = db.session\
.query(Delivery_Delivery)\
.filter(Delivery_Delivery.id == delivery_id)\
.first()
return jsonify({
"ok": True,
'delivery': {
@@ -42,10 +40,14 @@ def get_a_delivery(delivery_id):
'delivery_status': get_delivery.delivery_status,
'payment_type': get_delivery.payment_type,
'payment_card_id': get_delivery.payment_card_id,
'driver_employee_id': get_delivery.driver_employee_id,
'driver_first_name': get_delivery.driver_first_name,
'driver_last_name': get_delivery.driver_last_name,
},
}), 200
@delivery.route("/order/<int:delivery_id>", methods=["GET"])
def get_a_specific_delivery(delivery_id):
@@ -362,13 +364,16 @@ def edit_a_delivery(delivery_id):
delivery_status = request.json["delivery_status"]
when_to_deliver = request.json["expected_delivery_date"]
dispatcher_notes_taken = request.json["dispatcher_notes_taken"]
customer_wants_fill = request.json["customer_asked_for_fill"]
card_payment = request.json["credit"]
cash_payment = request.json["cash"]
delivery_driver_id = request.json["driver_employee_id"]
get_driver = (db.session
.query(Employee_Employee)
.filter(Employee_Employee.id == delivery_driver_id)
.first())
if request.json["credit_card_id"]:
card_payment_id = request.json["credit_card_id"]
else:
@@ -423,6 +428,10 @@ def edit_a_delivery(delivery_id):
get_delivery.payment_type = delivery_payment_method
get_delivery.payment_card_id = card_id_from_customer
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
db.session.add(get_delivery)
db.session.commit()
@@ -465,6 +474,18 @@ def create_a_delivery(user_id):
card_payment = request.json["credit"]
cash_payment = request.json["cash"]
delivery_driver_id = request.json["driver_employee_id"]
get_driver = (db.session
.query(Employee_Employee)
.filter(Employee_Employee.id == delivery_driver_id)
.first())
driver_l_name = get_driver.employee_last_name
driver_f_name = get_driver.employee_first_name
driver_emp_id = get_driver.id
try:
if request.json["credit_card_id"]:
card_payment_id = request.json["credit_card_id"]
@@ -522,13 +543,13 @@ def create_a_delivery(user_id):
precharge_amount = int(gallons_ordered) * get_today_price.price_for_customer
if same_day_asked == 1 and prime_asked == 0:
total_precharge_amount = precharge_amount + get_service_prices.price_same_day
total_precharge_amount = precharge_amount + get_today_price.price_same_day
elif prime_asked == 1 and same_day_asked == 0:
total_precharge_amount = precharge_amount + get_service_prices.price_prime
total_precharge_amount = precharge_amount + get_today_price.price_prime
else:
total_precharge_amount = precharge_amount + get_service_prices.price_prime + get_service_prices.price_same_day
total_precharge_amount = precharge_amount + get_today_price.price_prime + get_today_price.price_same_day
new_delivery = Delivery_Delivery(
@@ -559,6 +580,9 @@ def create_a_delivery(user_id):
pre_charge_amount=total_precharge_amount,
total_price=precharge_amount,
final_price=0,
driver_last_name = driver_l_name,
driver_first_name = driver_f_name,
driver_employee_id= driver_emp_id,
)