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

Updated

Browse Source
This commit is contained in:
Anekdotin
2024-05-16 14:36:14 -04:00
parent 2a4804ecb2
commit 2433dbb447
11 changed files with 126 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/delivery/views.py
View File

@@ -13,8 +13,6 @@ 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
from app.classes.money import Money_delivery
from app.classes.printing import Printer_jobs
@delivery.route("/<int:delivery_id>", methods=["GET"])
@@ -387,8 +385,7 @@ def edit_a_delivery(delivery_id):
gallons_ordered = request.json["gallons_ordered"]
delivery_status = request.json["delivery_status"]
when_to_deliver = request.json["expected_delivery_date"]
print(when_to_deliver)
print(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"]
@@ -416,8 +413,10 @@ def edit_a_delivery(delivery_id):
else:
card_id_from_customer = None
if cash_payment is True and card_payment is False:
delivery_payment_method = 0
elif card_payment is True and cash_payment is False:
delivery_payment_method = 1
@@ -453,7 +452,6 @@ def edit_a_delivery(delivery_id):
get_delivery.gallons_ordered = gallons_ordered
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
@@ -527,6 +525,11 @@ def create_a_delivery(user_id):
else:
card_id_from_customer = None
# 0 = cash only
# 1 = credit only
# 2 = credit /cash
# 3 unknown
if cash_payment is True and card_payment is False:
delivery_payment_method = 0
elif card_payment is True and cash_payment is False:
@@ -558,14 +561,20 @@ def create_a_delivery(user_id):
now = datetime.utcnow()
# Pricing
if customer_fill_up == 1:
precharge_amount = (250 * get_today_price.price_for_customer)
print(precharge_amount)
else:
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_today_price.price_same_day
print(total_precharge_amount)
print(precharge_amount)
print(get_today_price.price_same_day)
elif prime_asked == 1 and same_day_asked == 0:
total_precharge_amount = precharge_amount + get_today_price.price_prime
@@ -744,7 +753,6 @@ def move_waiting_to_outtodelivery():
.filter(Delivery_Delivery.expected_delivery_date == date.today())
.all())
for f in deliveries:
print(f.id)
f.delivery_status = 2
db.session.add(f)
counter = counter + 1
@@ -769,9 +777,10 @@ def calculate_total(delivery_id):
.query(Delivery_Delivery)
.filter(Delivery_Delivery.id == delivery_id)
.first())
get_price_query = (db.session
.query(Pricing_Oil_Oil)
.order_by(Pricing_Oil_Oil.date.desc())
.order_by(Pricing_Oil_Oil.date.asc())
.first())
@@ -779,15 +788,17 @@ def calculate_total(delivery_id):
priceprime = get_price_query.price_prime
else:
priceprime = 0
if get_delivery.same_day == 1:
pricesameday = get_price_query.price_prime
pricesameday = get_price_query.price_same_day
else:
pricesameday = 0
total = float(get_delivery.total_price) + float(priceprime) + float(pricesameday)
return jsonify({
"ok": True,
'priceprime': priceprime,
'pricesameday': pricesameday,
'total_amount':total
'total_amount':total,
}), 200