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

test with non-rounded values for diy-frame prices

Browse Source
This commit is contained in:
Martin
2016-11-08 14:47:32 +01:00
parent 1f75cb9cc5
commit 4affc08eae
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/lib/prices.py
+2 -2
View File
@@ -149,12 +149,12 @@ def canvas_frame_price(width, height, stock_price, market, additional_price=None
return price return price
def old_canvas_diy_frame_price(width, height, market, reseller=None, inc_vat=True): 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"" # todo: when product models are in place we should use stockproduct ""Do it yourself frame""
# instead of hardcoded values # instead of hardcoded values
stock_price = 1.61084 stock_price = 1.61084
additional_price = 94.750000 additional_price = 94.750000
return canvas_frame_price(width, height, stock_price, market, additional_price, reseller=reseller, rounded=True, inc_vat=inc_vat) 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, inc_vat=True): def old_canvas_price(width, height, material, market, framed=True, designer=None, reseller=None, inc_vat=True):
api/resources/prices.py
+2 -2
View File
@@ -86,8 +86,8 @@ def diy_frame():
data = [{ data = [{
'width': width, 'width': width,
'height': height, 'height': height,
'price': old_canvas_diy_frame_price(width, height, market, reseller=reseller), '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, inc_vat=False) 'price_excl_vat': old_canvas_diy_frame_price(width, height, market, reseller=reseller, rounded=False, inc_vat=False)
}] }]
return jsonify(data=data) return jsonify(data=data)
tests/resources/test_prices.py
+1 -1
View File
@@ -56,4 +56,4 @@ class TestEndpoints(flask_testing.TestCase):
product = response.json['data'][0] product = response.json['data'][0]
self.assertEqual(150, product['width'], "it adjusts measurements") self.assertEqual(150, product['width'], "it adjusts measurements")
self.assertEqual(50, product['height']) self.assertEqual(50, product['height'])
self.assertEqual(924, product['price']) self.assertAlmostEqual(923.857, product['price'], places=2)