Fixed errors

app/delivery/views.py

@@ -3,7 +3,8 @@ from flask_login import current_user
 from datetime import date, datetime, timedelta
 from app.delivery import delivery
 from app import db
-from app.classes.customer import Customer_Customer
+from app.classes.customer import (Customer_Customer,
+                                  Customer_Customer_schema)
 from app.classes.delivery import (Delivery_Delivery,
                                   Delivery_Delivery_schema,
                                   Delivery_Notes_Driver,
@@ -13,7 +14,7 @@ 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"])
@@ -24,7 +25,8 @@ 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': {
@@ -47,6 +49,16 @@ def get_a_delivery(delivery_id):
             },
     }), 200
 
+@delivery.route("/past/<int:customer_id>", methods=["GET"])
+def get_customer_past_delivery(customer_id):
+
+    get_customer_past_delivery = (db.session
+                .query(Delivery_Delivery)
+                .filter(Delivery_Delivery.customer_id == customer_id)
+                .limit(10))
+    
+    delivery_schema = Delivery_Delivery_schema(many=True)
+    return jsonify(delivery_schema.dump(get_customer_past_delivery))
 
 
 @delivery.route("/order/<int:delivery_id>", methods=["GET"])
@@ -81,17 +93,27 @@ def update_a_delivery_payment(delivery_id, type_of_payment):
     return jsonify({"ok": True}), 200
 
 
-@delivery.route("/all", methods=["GET"])
-def get_deliveries_not_delivered_all():
+@delivery.route("/all/<int:page>", methods=["GET"])
+def get_deliveries_not_delivered_all(page):
     """
     This will get deliveries not done
     """
-
+    per_page_amount = 50
+    if page is None:
+        offset_limit = 0
+    elif page == 1:
+        offset_limit = 0
+    else:
+        offset_limit = (per_page_amount * page) - per_page_amount
+        
+        
     deliveries = (db.session 
         .query(Delivery_Delivery) 
-        .filter(Delivery_Delivery.delivery_status != 1) 
+        .filter(Delivery_Delivery.delivery_status != 10) 
         .filter(Delivery_Delivery.delivery_status != 3) 
-        .all())
+        .order_by(Delivery_Delivery.id.asc())
+        .limit(per_page_amount).offset(offset_limit))
+
 
     customer_schema = Delivery_Delivery_schema(many=True)
     return jsonify(customer_schema.dump(deliveries))
@@ -102,6 +124,7 @@ def get_deliveries_from_customer(customer_id, page):
     """
     This will get deliveries not done
     """
+
     per_page_amount = 50
     if page is None:
         offset_limit = 0
@@ -119,7 +142,7 @@ def get_deliveries_from_customer(customer_id, page):
     customer_schema = Delivery_Delivery_schema(many=True)
     return jsonify(customer_schema.dump(deliveries))
 
-@delivery.route("/all/<int:page>", methods=["GET"])
+@delivery.route("/all/order/<int:page>", methods=["GET"])
 def get_deliveries_not_delivered(page):
     
     """
@@ -201,13 +224,15 @@ def get_deliveries_outfordelivery(page):
 
     deliveries = (db.session 
         .query(Delivery_Delivery) 
-        .filter(Delivery_Delivery.delivery_status == 2) 
+        .filter(Delivery_Delivery.expected_delivery_date == date.today())
         .order_by(Delivery_Delivery.delivery_status.asc()) 
         .limit(per_page_amount).offset(offset_limit))
 
     customer_schema = Delivery_Delivery_schema(many=True)
     return jsonify(customer_schema.dump(deliveries))
 
+
+
 @delivery.route("/tommorrow/<int:page>", methods=["GET"])
 def get_deliveries_tommorrow(page):
     """
@@ -359,10 +384,11 @@ def edit_a_delivery(delivery_id):
     if not get_delivery:
         return jsonify({"ok": False}), 200
     else:
-
         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"]
@@ -527,7 +553,6 @@ def create_a_delivery(user_id):
         else:
             same_day_asked = 0
 
-        date_object = datetime.strptime(when_to_deliver, '%Y-%m-%d').date()
 
         customer_filled_name = get_customer.customer_last_name + ' ' + get_customer.customer_first_name
         now = datetime.utcnow()
@@ -563,7 +588,7 @@ def create_a_delivery(user_id):
             delivery_status=0,
             when_ordered=now,
             when_delivered=None,
-            expected_delivery_date=date_object,
+            expected_delivery_date=when_to_deliver,
             automatic=get_customer.customer_automatic,
             oil_id=get_today_price.id,
             supplier_price=get_today_price.price_from_supplier,