added text data
This commit is contained in:
@@ -173,135 +173,3 @@ def office_finalize_delivery(delivery_id):
|
||||
}), 200
|
||||
|
||||
|
||||
|
||||
# @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
|
||||
# """
|
||||
|
||||
|
||||
# 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())
|
||||
|
||||
# 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"]
|
||||
|
||||
# gallons_delivered = Decimal(gallons_delivered)
|
||||
|
||||
# delivery_driver_id = request.json["driver_employee_id"]
|
||||
|
||||
# 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 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
|
||||
|
||||
|
||||
|
||||
# ## 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_delivery.gallons_delivered = gallons_delivered
|
||||
|
||||
# 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
|
||||
|
||||
|
||||
# # 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.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.commit()
|
||||
|
||||
|
||||
# return jsonify({
|
||||
# "ok": True,
|
||||
# 'delivery': {
|
||||
# 'id': get_delivery.id,
|
||||
# },
|
||||
# }), 200
|
||||
|
||||
|
||||
|
||||
8
info_delivery_status.txt
Normal file
8
info_delivery_status.txt
Normal file
@@ -0,0 +1,8 @@
|
||||
0: Waiting
|
||||
1: Cancelled
|
||||
2: Today
|
||||
3: Tomorrow_Delivery
|
||||
4: Partial_Delivery
|
||||
5: Issue_Delivery
|
||||
9: Pending
|
||||
10: Finalized
|
||||
7
info_home_type.txt
Normal file
7
info_home_type.txt
Normal file
@@ -0,0 +1,7 @@
|
||||
0: Residential
|
||||
1: apartment
|
||||
2: condo
|
||||
3: commercial
|
||||
4: business
|
||||
5: construction
|
||||
6: container
|
||||
5
info_paymant_type.txt
Normal file
5
info_paymant_type.txt
Normal file
@@ -0,0 +1,5 @@
|
||||
0: Cash
|
||||
1: CC
|
||||
2: Cash/CC
|
||||
3: Check
|
||||
4: Other
|
||||
7
info_state_list.txt
Normal file
7
info_state_list.txt
Normal file
@@ -0,0 +1,7 @@
|
||||
0: MA
|
||||
1: RI
|
||||
2: NH
|
||||
3: ME
|
||||
4: VT
|
||||
5: CT
|
||||
6: NY
|
||||
Reference in New Issue
Block a user