From f0b248eb6e99041597e5cffa5561fc0da660ce96 Mon Sep 17 00:00:00 2001
From: fakz9 <fakc445@gmail.com>
Date: Tue, 7 Nov 2023 23:16:58 +0300
Subject: [PATCH] ebanutsya

---
 app.py               |  1 +
 routes/__init__.py   |  1 +
 routes/general.py    | 10 ++++++++++
 routes/orders.py     |  8 +++++++-
 sipro/api/general.py |  8 ++++++++
 sipro/api/orders.py  |  4 ++--
 6 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 routes/general.py
 create mode 100644 sipro/api/general.py

diff --git a/app.py b/app.py
index 32305c2..32c4a8d 100644
--- a/app.py
+++ b/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:
diff --git a/routes/__init__.py b/routes/__init__.py
index eb59443..b4b52fd 100644
--- a/routes/__init__.py
+++ b/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
diff --git a/routes/general.py b/routes/general.py
new file mode 100644
index 0000000..68030b0
--- /dev/null
+++ b/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()
diff --git a/routes/orders.py b/routes/orders.py
index 5344f59..6fd56de 100644
--- a/routes/orders.py
+++ b/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)
 
 
diff --git a/sipro/api/general.py b/sipro/api/general.py
new file mode 100644
index 0000000..b3982b4
--- /dev/null
+++ b/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')
diff --git a/sipro/api/orders.py b/sipro/api/orders.py
index 6db357e..19eea43 100644
--- a/sipro/api/orders.py
+++ b/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):
-    method = f'{router}/getOrders?orderBy={order_by}&desc={desc}&page={page}&shipmentDate={shipment_date}&status={status}'
+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}&shipmentWarehouseId={shipment_warehouse_id}'
     response = client.method('GET', method)
     return response