Changes

app/delivery_status/views.py

@@ -1,24 +1,34 @@
-from flask import request, jsonify
-from flask_login import current_user
-from datetime import date, timedelta, time
+from flask import jsonify
+
+from datetime import date, timedelta
 from app.delivery_status import deliverystatus
 from app import db
+from sqlalchemy import or_
 from datetime import datetime
-from app.classes.customer import Customer_Customer
 from app.classes.delivery import (Delivery_Delivery,
                                   Delivery_Delivery_schema,
-                                  Delivery_Notes_Driver,
-                                  Delivery_Payment,
-                                  Delivery_Payment_schema,
                                   )
-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.pricing import Pricing_Service_General
+
+
+@deliverystatus.route("/delivered", methods=["GET"])
+def delivered_delivery():
+    """
+    Get deliveries that have been delivered
+    """
+
+    delivery_ticket = (db.session
+                     .query(Delivery_Delivery)
+                     .filter(or_(Delivery_Delivery.delivery_status == 1,
+                                Delivery_Delivery.delivery_status == 10))
+                     .all())
+
+
+    delivery_schema = Delivery_Delivery_schema(many=True)
+    return jsonify(delivery_schema.dump(delivery_ticket))
 
 
 @deliverystatus.route("/today/driver/<int:user_id>", methods=["GET"])
-def get_deliveries_driver_day(user_id):
+def get_deliveries_driver_today(user_id):
     """
     Get deliveries for driver that day
     """
@@ -31,6 +41,7 @@ def get_deliveries_driver_day(user_id):
     delivery_schema = Delivery_Delivery_schema(many=True)
     return jsonify(delivery_schema.dump(get_delivery))
 
+
 @deliverystatus.route("/tommorrow/driver/<int:user_id>", methods=["GET"])
 def get_deliveries_driver_tommorrow(user_id):
     """
@@ -47,6 +58,7 @@ def get_deliveries_driver_tommorrow(user_id):
     delivery_schema = Delivery_Delivery_schema(many=True)
     return jsonify(delivery_schema.dump(get_delivery))
 
+
 @deliverystatus.route("/waiting/driver/<int:user_id>", methods=["GET"])
 def get_deliveries_driver_waiting(user_id):
     """
@@ -55,7 +67,7 @@ def get_deliveries_driver_waiting(user_id):
     get_delivery = (db.session
         .query(Delivery_Delivery)
         .filter(Delivery_Delivery.driver_employee_id == user_id)
-        .filter(Delivery_Delivery.delivery_status == 1)
+        .filter(Delivery_Delivery.delivery_status == 0)
         .all())
 
     delivery_schema = Delivery_Delivery_schema(many=True)