working money and delivery dates

app/delivery/views.py

@@ -12,7 +12,7 @@ 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
 
 
 
@@ -24,6 +24,7 @@ def get_a_delivery(delivery_id):
                 .query(Delivery_Delivery)\
                 .filter(Delivery_Delivery.id == delivery_id)\
                 .first()
+    get_taxes = db.session.query(Money_delivery).all()
     return jsonify({
             "ok": True,
             'delivery': {
@@ -111,7 +112,8 @@ def get_deliveries_from_customer(customer_id, page):
 
     deliveries = (db.session 
         .query(Delivery_Delivery) 
-        .filter(Delivery_Delivery.customer_id == customer_id) 
+        .filter(Delivery_Delivery.customer_id == customer_id)
+        .order_by(Delivery_Delivery.id.desc())
         .limit(per_page_amount).offset(offset_limit))
 
     customer_schema = Delivery_Delivery_schema(many=True)
@@ -200,7 +202,7 @@ def get_deliveries_outfordelivery(page):
     deliveries = (db.session 
         .query(Delivery_Delivery) 
         .filter(Delivery_Delivery.delivery_status == 2) 
-        .order_by(Delivery_Delivery.when_ordered.desc()) 
+        .order_by(Delivery_Delivery.delivery_status.asc()) 
         .limit(per_page_amount).offset(offset_limit))
 
     customer_schema = Delivery_Delivery_schema(many=True)
@@ -348,10 +350,6 @@ def edit_a_delivery(delivery_id):
         .filter(Delivery_Delivery.id == delivery_id) \
         .first()
 
-    get_today_price = (db.session 
-        .query(Pricing_Oil_Oil) 
-        .order_by(Pricing_Oil_Oil.id.desc()) 
-        .first())
 
     get_customer = db.session \
         .query(Customer_Customer) \
@@ -705,4 +703,66 @@ def service_delete_call(delivery_id):
     db.session.delete(get_call_to_delete)
     db.session.commit()
 
-    return jsonify({"ok": True}), 200
+    return jsonify({"ok": True}), 200
+
+
+@delivery.route("/updatestatus/outfordelivery", methods=["GET"])
+def move_waiting_to_outtodelivery():
+    """
+    This will get deliveries not done
+    """
+    counter = 0
+
+    deliveries = (db.session 
+        .query(Delivery_Delivery) 
+        .filter(Delivery_Delivery.delivery_status == 0) 
+        .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
+    if counter > 0:
+        db.session.commit()
+        return jsonify({
+            "ok": True,
+            'update': True,
+        }), 200
+
+    return jsonify({"ok": True}), 200
+
+
+@delivery.route("/total/<int:delivery_id>", methods=["GET"])
+def calculate_total(delivery_id):
+    """
+    This will get deliveries not done
+    """
+
+
+    get_delivery = (db.session
+        .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())
+                    .first())
+    
+    
+    if get_delivery.prime == 1:
+        priceprime = get_price_query.price_prime
+    else:
+        priceprime = 0
+    if get_delivery.same_day == 1:
+        pricesameday = get_price_query.price_prime
+    else:
+        pricesameday = 0
+    
+    total = float(get_delivery.total_price) + float(priceprime) + float(pricesameday)
+    return jsonify({
+        "ok": True,
+        'priceprime': priceprime,
+        'pricesameday': pricesameday,
+        'total_amount':total
+    }), 200