refactor canvas material price calculations

api/lib/prices.py

@@ -5,7 +5,7 @@ from api.lib.utils import round_half_up
 from api.lib.limits import calculate_canvas_limits
 
 
-def material_price(material, market, designer=None, reseller=None, inc_vat=True):
+def material_price(material, market, designer=None, reseller=None, rounded=True, inc_vat=True):
     price = material.price
 
     # add designer price premium
@@ -26,7 +26,10 @@ def material_price(material, market, designer=None, reseller=None, inc_vat=True)
     if inc_vat:
         price *= market.vat
 
-    return round_half_up(price)
+    if rounded:
+        price = round_half_up(price)
+
+    return price
 
 
 def wallpaper_price(width, height, material, market, designer=None, reseller=None, inc_vat=True):
@@ -153,12 +156,14 @@ def old_canvas_diy_frame_price(width, height, market, reseller=None, inc_vat=Tru
 
 def old_canvas_price(width, height, material, market, framed=True, designer=None, reseller=None, inc_vat=True):
     width, height = calculate_canvas_limits(width, height, framed)
+    m2_price = material_price(
+        material, market, designer, reseller, rounded=False, inc_vat=False)
     # calculate square meter
     sqm = (width / 100) * (height / 100)
     sqm = max(sqm, 0.2)  # sqm can never go below 0.2
 
     # calculate price per square meter
-    price = sqm * material.price
+    price = sqm * m2_price
 
     if framed:
         # todo: when product models are in place we should use stockproduct
@@ -168,20 +173,6 @@ def old_canvas_price(width, height, material, market, framed=True, designer=None
         price += canvas_frame_price(width, height,
                                     stock_price, additional_price)
 
-    # add designer price premium
-    if designer:
-        price *= (float(designer.pricepremium) / 100) + 1
-
-    # add reseller price premium
-    if reseller:
-        price *= (float(reseller.pricepremium) / 100) + 1
-
-    # exchange to local currency
-    price *= market.exchange_rate
-
-    # multiply price with market price adjustments
-    price *= market.price_adjustments
-
     # add vat
     if inc_vat:
         price *= market.vat