ebanutsya

app.py

@@ -28,6 +28,7 @@ blueprints = [
     (routes.barcode_blueprint, '/barcode'),
     (routes.printing_blueprint, '/printing'),
     (routes.assembly_blueprint, '/assembly'),
+    (routes.general_blueprint, '/general'),
 ]
 
 for blueprint, url_prefix in blueprints:

routes/__init__.py

@@ -3,3 +3,4 @@ from routes.orders import orders_blueprint
 from routes.barcode import barcode_blueprint
 from routes.printing import printing_blueprint
 from routes.assembly import assembly_blueprint
+from routes.general import general_blueprint

routes/general.py

@@ -0,0 +1,10 @@
+from flask import Blueprint, jsonify, request
+from routes.utils import jwt_protect_blueprint
+import sipro.api.general
+
+general_blueprint = jwt_protect_blueprint(Blueprint('general', __name__))
+
+
+@general_blueprint.get('/getShippingWarehouses')
+def get_shipping_warehouses():
+    return sipro.api.general.get_shipping_warehouses()

routes/orders.py

@@ -18,7 +18,13 @@ def get_orders():
     page = int(args.get('page'))
     shipment_date = args.get('shipmentDate')
     status = args.get('status')
-    response = sipro.api.orders.get_orders(order_by, desc, page, shipment_date, status)
+    shipment_warehouse_id = int(args.get('shipmentWarehouseId'))
+    response = sipro.api.orders.get_orders(order_by,
+                                           desc,
+                                           page,
+                                           shipment_date,
+                                           status,
+                                           shipment_warehouse_id)
     return jsonify(response)
 
 

sipro/api/general.py

@@ -0,0 +1,8 @@
+from sipro.api.client import get_client
+
+client = get_client()
+router = '/general'
+
+
+def get_shipping_warehouses():
+    return client.method('GET', f'{router}/getShippingWarehouses')

sipro/api/orders.py

@@ -30,7 +30,7 @@ def close_order(order_id: int) -> dict:
     return response
 
 
-def get_orders(order_by: str, desc: int, page: int, shipment_date: str, status: str):
+def get_orders(order_by: str, desc: int, page: int, shipment_date: str, status: str, shipment_warehouse_id: int):
-    method = f'{router}/getOrders?orderBy={order_by}&desc={desc}&page={page}&shipmentDate={shipment_date}&status={status}'
+    method = f'{router}/getOrders?orderBy={order_by}&desc={desc}&page={page}&shipmentDate={shipment_date}&status={status}&shipmentWarehouseId={shipment_warehouse_id}'
     response = client.method('GET', method)
     return response