implement currency and report

transportmanager/server/routes/currency.py

@@ -0,0 +1,36 @@
+from flask import Blueprint, request, jsonify
+from models.currency import Currency
+from models.user import Users
+
+from flask_jwt_extended import jwt_required, get_jwt_identity
+
+currency_bp = Blueprint("currency", __name__, url_prefix="/currency")
+
+@currency_bp.route("/", methods=["GET"])
+@jwt_required()
+def list_currency():
+    #currency = Currency()
+    currency = [
+        {
+            'id':1,
+            'name':'USD',
+            'value':'',
+        },
+        {
+            'id':2,
+            'name':'EURO',
+            'value':'',
+        },
+        {
+            'id':3,
+            'name':'CHF',
+            'value':'',
+        },
+        {
+            'id':4,
+            'name':'GBP',
+            'value':'',
+        }
+    ]
+
+    return jsonify(currency), 200

transportmanager/server/routes/orders_out.py

@@ -50,6 +50,8 @@ def create_order_route():
         'track_reg_number': incoming_data["track_reg_number"],
         'trailer_reg_number': incoming_data["trailer_reg_number"],
         'products_description': incoming_data["products_description"],
+        'order_in_number': incoming_data["order_in_number"],
+        'currency': incoming_data["currency"]
     }
     order_id = orders.create_order(order_data)
 
@@ -110,6 +112,8 @@ def update_order_route(order_id):
             "track_reg_number": data.get("track_reg_number", order["track_reg_number"]),
             "trailer_reg_number": data.get("trailer_reg_number", order["trailer_reg_number"]),
             "products_description": data.get("products_description", order["products_description"]),
+            "order_in_number": data.get("order_in_number", order["order_in_number"]),
+            "currency":data.get("currency", order["currency"]),
         })
 
         orders.delete_points_by_order_id(order_id)

transportmanager/server/routes/ouders_in.py

@@ -33,7 +33,8 @@ def create_order_in_route():
             'trailer_reg_number': incoming_data["trailer_reg_number"],
             'products_description': incoming_data["products_description"],
             'file': incoming_data['file'],
-            'expenses': incoming_data['expenses']
+            'expenses': incoming_data['expenses'],
+            'currency': incoming_data['currency']
         }
         #print(order_data)
         order_id = orders.create_order(order_data)
@@ -91,9 +92,10 @@ def update_order_route(order_id):
             "track_reg_number": data.get("track_reg_number", order["track_reg_number"]),
             "trailer_reg_number": data.get("trailer_reg_number", order["trailer_reg_number"]),
             "products_description": data.get("products_description", order["products_description"]),
-            'file': data.get("file", order["file"]),
-            'expenses': data.get("expenses", order["expenses"]),
-            "user_id":user_id
+            "file": data.get("file", order["file"]),
+            "expenses": data.get("expenses", order["expenses"]),
+            "currency": data.get("currency", order["currency"]),
+            "user_id":user_id,
         })
 
         orders.delete_points_by_order_id(order_id)

transportmanager/server/routes/profile.py

@@ -30,7 +30,8 @@ def get_profile():
         "terms": user["terms"],
         "first_order_number": user["first_order_number"],
         "user_role": user["user_role"],
-        "vat":user["vat"]
+        "vat":user["vat"],
+        "company_id":user['company_id']
     })
 
 

transportmanager/server/routes/report_order_out.py

@@ -4,9 +4,9 @@ from models.order_out import OrdersOut  # Your plain SQL model
 from datetime import datetime
 from models.user import Users
 
-report_bp = Blueprint("report", __name__, url_prefix="/report")
+report_order_out_bp = Blueprint("report_order_out", __name__, url_prefix="/report_order_out")
 
-@report_bp.route("/profit", methods=["GET"])
+@report_order_out_bp.route("/profit", methods=["GET"])
 @jwt_required()
 def get_profit_report():
     try: