added checks and finalize ticket

app/delivery_data/views.py

@@ -30,19 +30,80 @@ def office_finalize_delivery(delivery_id):
         .query(Customer_Customer) \
         .filter(Customer_Customer.id == get_delivery.customer_id) \
         .first()
+    
+    delivery_driver_id = request.json["driver_employee_id"]
+    if delivery_driver_id is None:
+        delivery_driver_id = 2
+    if delivery_driver_id == 0:
+        delivery_driver_id = 2
+   
+    get_driver = (db.session
+                    .query(Employee_Employee)
+                    .filter(Employee_Employee.id == delivery_driver_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())
+        
+
+ 
+    customer_filled = request.json["customer_filled"]
+    if customer_filled is True:
+        customer_filled = 1
+    else:
+        customer_filled = 0
+
+        
+
+    if request.json["cash_recieved"]:
+        cash_amount = request.json["cash_recieved"]
+    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
 
 
     gallons_delivered = request.json["gallons_delivered"]
-    card_payment = request.json["credit"]
-    cash_payment = request.json["cash"]
+    cash = request.json["cash"]
+    card_payment = request.json["card"]
+    check_payment = request.json["check"]
+    other_payment = request.json["other"]
+
+    check_number = request.json["other"]
+
 
     if request.json["credit_card_id"]:
         card_payment_id = request.json["credit_card_id"]
     else:
         card_payment_id = None
 
-
-
     if card_payment_id is not None:
         get_card = (db.session
                     .query(Card_Card)
@@ -53,15 +114,20 @@ def office_finalize_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
 
-    elif card_payment is True and cash_payment is True:
+    if cash is True and card_payment is False:
+        delivery_payment_method = 0
+    elif card_payment is True and cash is False:
+        delivery_payment_method = 1
+    elif card_payment is True and cash is True:
         delivery_payment_method = 2
-    else:
+    elif check_payment is True :
         delivery_payment_method = 3
+    elif other_payment is True :
+        delivery_payment_method = 4
+    else:
+        delivery_payment_method = 4
+
 
     same_day_info = request.json["same_day"]
     if same_day_info is True:
@@ -69,24 +135,35 @@ def office_finalize_delivery(delivery_id):
     else:
         same_day_info = 0
 
-    prime_info = request.json["prime"]
-    if prime_info is True:
-        prime_info = 1
+
+    emergency_info = request.json["emergency"]
+    if emergency_info is True:
+        emergency_info = 1
     else:
-        prime_info = 0
+        emergency_info = 0
+
+    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.gallons_delivered = gallons_delivered
     get_delivery.prime = prime_info
+    get_delivery.emergency = emergency_info
     get_delivery.same_day = same_day_info
     get_delivery.payment_type = delivery_payment_method
     get_delivery.payment_card_id = card_id_from_customer
-
+    get_delivery.cash_recieved = cash_amount
+    get_delivery.check_number = check_number
     get_delivery.delivery_status = 10
     
+    # update stats
+    current_deliveres = get_stats.total_deliveries + 1
+    get_stats.total_deliveries = current_deliveres
+    
+    current_gallons_delivered = Decimal(get_stats.total_gallons_delivered) + Decimal(gallons_delivered)
+    get_stats.total_gallons_delivered = current_gallons_delivered
 
-    print(get_delivery.gallons_delivered)
-    print(get_delivery.payment_type)
-    print(get_delivery.delivery_status)
 
     db.session.add(get_delivery)
     db.session.commit()
@@ -158,27 +235,25 @@ def driver_finalize_delivery(delivery_id):
     else:
         customer_filled = 1
         
-    if get_delivery.automatic == 0:
-        if request.json["cash_amount"]:
-            cash_amount = request.json["cash_amount"]
-        else:
-            cash_amount = None
+
+    if request.json["cash_amount"]:
+        cash_amount = request.json["cash_amount"]
     else:
         cash_amount = None
 
-    if get_delivery.automatic == 0:
-        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
+
+
+    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