add support for product price calculations

api/lib/prices.py

@@ -153,7 +153,7 @@ def old_canvas_diy_frame_price(width, height, market, reseller=None, rounded=Tru
     return canvas_frame_price(width, height, stock_price, market, additional_price, reseller=reseller, rounded=rounded, inc_vat=inc_vat)
 
 
-def old_canvas_price(width, height, material, market, framed=True, designer=None, reseller=None, inquiry=None, inc_vat=True):
+def old_canvas_price(width, height, material, market, framed=True, designer=None, reseller=None, inquiry=None, rounded=True, inc_vat=True):
     width, height = calculate_canvas_limits(width, height, framed)
     price = m2_price(material, market, designer, reseller,
                      inquiry, rounded=False, inc_vat=False)
@@ -175,7 +175,10 @@ def old_canvas_price(width, height, material, market, framed=True, designer=None
     if inc_vat:
         price *= market.vat
 
-    return round_half_up(price)
+    if rounded:
+        price = round_half_up(price)
+
+    return price
 
 
 def inquiry_price(inquiry, inc_price_retouch=True, rounded=True, inc_vat=True, **kwargs):

api/models/designer.py

@@ -23,7 +23,8 @@ class Designer(db.Model):
     visible_search = db.Column(db.Integer(), nullable=False, default=1)
     pricepremium = db.Column(db.Numeric(), nullable=False, default=0)
 
-    def __init__(self, name, username, territory, currency):
+    def __init__(self, name, username, territory, currency, *args, **kwargs):
+        super(Designer, self).__init__(*args, **kwargs)
         self.name = name
         self.username = username
         self.territory = territory

api/resources/prices.py

@@ -2,7 +2,7 @@ from flask import Blueprint, request, jsonify, abort
 from api.helpers import check_api_key
 from api.validators import validate_territory, validate_number
 from api.models.inquiry import Inquiry
-from api.models.product import Material
+from api.models.product import Material, Product
 from api.models.contract_customer import ContractCustomer
 from api.models import market as market_model
 from api.lib.prices import wallpaper_price, old_canvas_price, old_canvas_diy_frame_price, m2_price, inquiry_price
@@ -20,6 +20,15 @@ def get_reseller():
     return None
 
 
+def get_designer():
+    product_id = request.args.get('product')
+    if product_id:
+        product = Product.query.get(product_id)
+        if product:
+            return product.designer
+    return None
+
+
 @mod.route("/wallpaper", methods=['GET'])
 @validate_number('width', 'height')
 @validate_territory('territory')
@@ -27,7 +36,7 @@ def wallpaper():
     width = request.args.get('width', type=int)
     height = request.args.get('height', type=int)
     market = market_model.from_territory(request.args.get('territory'))
-
+    designer = get_designer()
     reseller = get_reseller()
 
     materials = Material.query.wallpapers().all()
@@ -36,8 +45,9 @@ def wallpaper():
         data.append({
             'material': material.name,
             'material_id': material.id,
-            'm2_price': m2_price(material, market, reseller=reseller, inc_vat=True),
-            'price': wallpaper_price(width, height, material, market, reseller=reseller),
+            'm2_price': m2_price(material, market, reseller=reseller, designer=designer, rounded=False, inc_vat=True),
+            'price': wallpaper_price(width, height, material, market, reseller=reseller, designer=designer, rounded=False, inc_vat=True),
+            'price_excl_vat': wallpaper_price(width, height, material, market, reseller=reseller, designer=designer, rounded=False, inc_vat=False),
         })
 
     return jsonify(data=data)
@@ -49,6 +59,7 @@ def wallpaper():
 def canvas():
     market = market_model.from_territory(request.args.get('territory'))
     reseller = get_reseller()
+    designer = get_designer()
     material = Material.query.canvas().first()
 
     data = []
@@ -63,8 +74,9 @@ def canvas():
             'framed': framed,
             'width': width,
             'height': height,
-            'm2_price': m2_price(material, market, reseller=reseller, inc_vat=True),
-            'price': old_canvas_price(width, height, material, market, reseller=reseller, framed=framed)
+            'm2_price': m2_price(material, market, reseller=reseller, designer=designer, rounded=False, inc_vat=True),
+            'price': old_canvas_price(width, height, material, market, reseller=reseller, designer=designer, framed=framed, rounded=False, inc_vat=True),
+            'price_excl_vat': old_canvas_price(width, height, material, market, reseller=reseller, designer=designer, framed=framed, rounded=False, inc_vat=False)
         })
 
     return jsonify(data=data)