intrgrating suggestions after betta 1
This commit is contained in:
@@ -17,6 +17,10 @@ orders_bp = Blueprint("orders", __name__, url_prefix="/orders")
|
||||
@jwt_required()
|
||||
def create_order_route():
|
||||
user_id = get_jwt_identity()
|
||||
users = Users()
|
||||
user = users.get_user_by_id(user_id)
|
||||
if user['user_role'] == 'company_user':
|
||||
user_id = user['company_id']
|
||||
orders = OrdersOut()
|
||||
incoming_data = request.json
|
||||
#here we need to first implement the order pdf
|
||||
@@ -83,6 +87,10 @@ def update_order_route(order_id):
|
||||
orders = OrdersOut()
|
||||
data = request.json
|
||||
user_id = get_jwt_identity()
|
||||
users = Users()
|
||||
user = users.get_user_by_id(user_id)
|
||||
if user['user_role'] == 'company_user':
|
||||
user_id = user['company_id']
|
||||
order = orders.get_order_by_id(order_id)
|
||||
if not order:
|
||||
return jsonify({"error": "Order not found"}), 404
|
||||
@@ -150,6 +158,10 @@ def update_order_route(order_id):
|
||||
def delete_order_route(order_id):
|
||||
orders = OrdersOut()
|
||||
user_id = get_jwt_identity()
|
||||
users = Users()
|
||||
user = users.get_user_by_id(user_id)
|
||||
if user['user_role'] == 'company_user':
|
||||
user_id = user['company_id']
|
||||
order = orders.get_order_by_id(order_id)
|
||||
if not order:
|
||||
return jsonify({"error": "Order not found"}), 404
|
||||
@@ -168,6 +180,10 @@ def delete_order_route(order_id):
|
||||
def list_orders():
|
||||
orders = OrdersOut()
|
||||
user_id = get_jwt_identity()
|
||||
users = Users()
|
||||
user = users.get_user_by_id(user_id)
|
||||
if user['user_role'] == 'company_user':
|
||||
user_id = user['company_id']
|
||||
try:
|
||||
user_orders = orders.get_orders_by_user(user_id)
|
||||
#result = [{"id": order["id"], "order_number": order["order_number"]} for order in user_orders]
|
||||
@@ -180,6 +196,10 @@ def list_orders():
|
||||
def get_order(order_id):
|
||||
orders = OrdersOut()
|
||||
user_id = get_jwt_identity()
|
||||
users = Users()
|
||||
user = users.get_user_by_id(user_id)
|
||||
if user['user_role'] == 'company_user':
|
||||
user_id = user['company_id']
|
||||
order = orders.get_order_by_id(order_id)
|
||||
points = orders.get_order_points_by_order(order['id'])
|
||||
loading_points = []
|
||||
@@ -251,6 +271,10 @@ def cancel_order(order_id):
|
||||
orders = OrdersOut()
|
||||
order = orders.get_order_by_id(order_id)
|
||||
user_id = get_jwt_identity()
|
||||
users = Users()
|
||||
user = users.get_user_by_id(user_id)
|
||||
if user['user_role'] == 'company_user':
|
||||
user_id = user['company_id']
|
||||
pdf_name = f'order_{user_id}_{order['order_number']}.pdf'
|
||||
cancel_order_pdf(pdf_name)
|
||||
orders.cancel_order(order_id)
|
||||
|
||||
Reference in New Issue
Block a user