photowall/api2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PW-721 new canvas price formula

Browse Source
This commit is contained in:
Martin
2017-05-03 18:32:55 +02:00
parent 4c7ab37a21
commit 7e3c2c3c41
5 changed files with 108 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/lib/prices.py
+20 -67
View File
@@ -54,7 +54,7 @@ def wallpaper_price(width, height, material, market, designer=None, reseller=Non
def canvas_cm2_price(cm2):
price_cm2_at_1cm2 = 0.224
price_cm2_at_1cm2 = 0.2461
price_cm2_at_5000cm2 = 0.144
price_cm2_at_10000cm2 = 0.096
price_cm2_at_22500cm2 = 0.064
@@ -78,64 +78,30 @@ def canvas_cm2_price(cm2):
return cm2_price
def canvas_price(width, height, market, framed=True, designer=None, reseller=None, inc_vat=True):
def canvas_price(width, height, market, framed=True, designer=None, reseller=None, inquiry=None, rounded=True, inc_vat=True):
cm2 = width * height
# get the price per cm2
cm2_price = canvas_cm2_price(cm2)
# calculate price for canvas with frame
price = (cm2 * cm2_price)
price = max(price, 396.8) # the price can never go below 396.8 SEK
price = cm2 * cm2_price
price = max(price, 341.4848) # the price can never go below 341.4848 SEK
if not framed:
price *= 0.7
# 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
if inquiry:
price *= (float(inquiry.pricepremium) / 100) + 1
# multiply price with market price adjustments
price *= market.exchange_rate
price *= market.price_adjustments
# add vat
if inc_vat:
price *= market.vat
return round(price)
def canvas_frame_price(width, height, stock_price, market, additional_price=None, reseller=None, rounded=True, inc_vat=True):
width, height = calculate_canvas_limits(width, height, framed=True)
circumference = (2 * width) + (2 * height)
circumference = max(circumference, 170)
price = stock_price * circumference
# if width or height goes above this limit additional costs are added
if additional_price:
additional_price_limit = 120
if width > additional_price_limit or height > additional_price_limit:
price += additional_price
# exchange to local currency
price *= market.exchange_rate
# multiply price with market price adjustments
price *= market.price_adjustments
# add reseller price premium
if reseller:
price *= (float(reseller.pricepremium) / 100) + 1
# add vat
if inc_vat:
price *= market.vat
@@ -145,33 +111,20 @@ def canvas_frame_price(width, height, stock_price, market, additional_price=None
return price
def old_canvas_diy_frame_price(width, height, market, reseller=None, rounded=True, inc_vat=True):
# todo: when product models are in place we should use stockproduct ""Do it yourself frame""
# instead of hardcoded values
stock_price = 1.61084
additional_price = 94.750000
return canvas_frame_price(width, height, stock_price, market, additional_price, reseller=reseller, rounded=rounded, inc_vat=inc_vat)
def canvas_frame_price(width, height, market, reseller=None, rounded=True, inc_vat=True):
width, height = calculate_canvas_limits(width, height, framed=True)
cm2 = width * height
cm2_price = canvas_cm2_price(cm2)
price = cm2 * cm2_price
price = max(price, 317.44)
price *= 0.65
if reseller:
price *= (float(reseller.pricepremium) / 100) + 1
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)
price *= market.exchange_rate
price *= market.price_adjustments
# calculate square meter
sqm = (width / 100) * (height / 100)
sqm = max(sqm, 0.2) # sqm can never go below 0.2
price *= sqm
if framed:
# todo: when product models are in place we should use stockproduct
# "Canvasframe" instead of hardcoded values
stock_price = 1.04230824
additional_price = 94.750000
price += canvas_frame_price(width, height, stock_price, market,
additional_price=additional_price, reseller=reseller, rounded=False, inc_vat=False)
# add vat
if inc_vat:
price *= market.vat
@@ -191,8 +144,8 @@ def inquiry_price(inquiry, inc_price_retouch=True, rounded=True, inc_vat=True, *
price = wallpaper_price(width, height, material, inquiry.market,
designer=inquiry.designer, reseller=inquiry.dealer_store, inquiry=inquiry, rounded=False, inc_vat=False)
elif inquiry.product_group == 'canvas':
price = old_canvas_price(width, height, material, inquiry.market,
designer=inquiry.designer, reseller=inquiry.dealer_store, inquiry=inquiry, framed=framed, rounded=False, inc_vat=False)
price = canvas_price(width, height, inquiry.market,
designer=inquiry.designer, reseller=inquiry.dealer_store, inquiry=inquiry, framed=framed, rounded=False, inc_vat=False)
else:
raise ValueError(
'Invalid product group: {}'.format(inquiry.product_group))
api/models/product.py
+1 -2
View File
@@ -45,7 +45,6 @@ class Material(db.Model):
name = db.Column('material', db.String(255), nullable=False)
price = db.Column('price', db.Integer)
def to_json(self):
return {
'id': self.id,
@@ -54,4 +53,4 @@ class Material(db.Model):
}
def __repr__(self):
return self.name
return self.name
api/resources/prices.py
+7 -10
View File
@@ -5,7 +5,7 @@ from api.models.inquiry import Inquiry
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
from api.lib.prices import wallpaper_price, canvas_price, canvas_frame_price, m2_price, inquiry_price
from api.lib.limits import calculate_canvas_limits
mod = Blueprint('prices', __name__, url_prefix='/prices')
@@ -61,7 +61,6 @@ def canvas():
market = market_model.from_territory(request.args.get('territory'))
reseller = get_reseller()
designer = get_designer()
material = Material.query.canvas().first()
data = []
@@ -71,14 +70,14 @@ def canvas():
request.args.get('height', type=int),
framed
)
# def canvas_price(width, height, market, framed=True, designer=None, reseller=None, inquiry=None, rounded=True, inc_vat=True):
data.append({
'framed': framed,
'width': width,
'height': height,
'm2_price': m2_price(material, market, reseller=reseller, designer=designer, rounded=False, inc_vat=True),
'm2_price_excl_vat': m2_price(material, market, reseller=reseller, designer=designer, rounded=False, inc_vat=False),
'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)
'price': canvas_price(width, height, market, framed=framed, designer=designer, reseller=reseller, rounded=False, inc_vat=True),
'price_excl_vat': canvas_price(width, height, market, framed=framed, designer=designer, reseller=reseller, rounded=False, inc_vat=False),
})
return jsonify(data=data)
@@ -99,8 +98,8 @@ def diy_frame():
data = [{
'width': width,
'height': height,
'price': old_canvas_diy_frame_price(width, height, market, reseller=reseller, rounded=False),
'price_excl_vat': old_canvas_diy_frame_price(width, height, market, reseller=reseller, rounded=False, inc_vat=False)
'price': canvas_frame_price(width, height, market, reseller=reseller, rounded=False),
'price_excl_vat': canvas_frame_price(width, height, market, reseller=reseller, rounded=False, inc_vat=False)
}]
return jsonify(data=data)
@@ -169,8 +168,6 @@ def inquiry_canvas(inquiry):
'framed': framed,
'width': width,
'height': height,
'm2_price': m2_price(material, inquiry.market, designer=inquiry.designer, reseller=inquiry.dealer_store, inquiry=inquiry, rounded=False, inc_vat=True),
'm2_price_excl_vat': m2_price(material, inquiry.market, designer=inquiry.designer, reseller=inquiry.dealer_store, inquiry=inquiry, rounded=False, inc_vat=False),
'inquiry_price_excl_retouch': inquiry_price(inquiry, material=material, width=width, height=height, framed=framed, rounded=False, inc_price_retouch=False, inc_vat=True),
'inquiry_price': inquiry_price(inquiry, material=material, width=width, height=height, framed=framed, rounded=False, inc_vat=True),
'inquiry_price_excl_vat': inquiry_price(inquiry, material=material, width=width, height=height, framed=framed, rounded=False, inc_vat=False)