From ca6e7ad77852ddf77b85c6cb5e2152812266c70c Mon Sep 17 00:00:00 2001 From: Edwin Eames Date: Thu, 4 Sep 2025 11:22:45 -0400 Subject: [PATCH] added text data --- app/delivery_data/views.py | 132 ------------------------------------- info_delivery_status.txt | 8 +++ info_home_type.txt | 7 ++ info_paymant_type.txt | 5 ++ info_state_list.txt | 7 ++ 5 files changed, 27 insertions(+), 132 deletions(-) create mode 100644 info_delivery_status.txt create mode 100644 info_home_type.txt create mode 100644 info_paymant_type.txt create mode 100644 info_state_list.txt diff --git a/app/delivery_data/views.py b/app/delivery_data/views.py index 81e824c..3aa5249 100755 --- a/app/delivery_data/views.py +++ b/app/delivery_data/views.py @@ -173,135 +173,3 @@ def office_finalize_delivery(delivery_id): }), 200 - -# @delivery_data.route("/driver/finalize/", 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 - - diff --git a/info_delivery_status.txt b/info_delivery_status.txt new file mode 100644 index 0000000..872699e --- /dev/null +++ b/info_delivery_status.txt @@ -0,0 +1,8 @@ +0: Waiting +1: Cancelled +2: Today +3: Tomorrow_Delivery +4: Partial_Delivery +5: Issue_Delivery +9: Pending +10: Finalized \ No newline at end of file diff --git a/info_home_type.txt b/info_home_type.txt new file mode 100644 index 0000000..592325f --- /dev/null +++ b/info_home_type.txt @@ -0,0 +1,7 @@ +0: Residential +1: apartment +2: condo +3: commercial +4: business +5: construction +6: container \ No newline at end of file diff --git a/info_paymant_type.txt b/info_paymant_type.txt new file mode 100644 index 0000000..0330721 --- /dev/null +++ b/info_paymant_type.txt @@ -0,0 +1,5 @@ +0: Cash +1: CC +2: Cash/CC +3: Check +4: Other \ No newline at end of file diff --git a/info_state_list.txt b/info_state_list.txt new file mode 100644 index 0000000..696cad4 --- /dev/null +++ b/info_state_list.txt @@ -0,0 +1,7 @@ +0: MA +1: RI +2: NH +3: ME +4: VT +5: CT +6: NY \ No newline at end of file