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/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)