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
tests/lib/test_prices.py
+59 -66
View File
@@ -97,87 +97,75 @@ class TestPrice(unittest2.TestCase):
material=standard_wallpaper, market=us), "Minium price for US is 2 sqm")
def test_canvas_cm2_price(self):
self.assertEqual(0.22, canvas_cm2_price(250))
self.assertEqual(0.22384, canvas_cm2_price(10))
self.assertEqual(0.208, canvas_cm2_price(1000))
self.assertEqual(0.24099500000000001, canvas_cm2_price(250))
self.assertEqual(0.24589580000000003, canvas_cm2_price(10))
self.assertEqual(0.22568000000000002, canvas_cm2_price(1000))
def test_canvas_price(self):
self.assertEqual(460, canvas_price(width=50, height=50,
self.assertEqual(488, canvas_price(width=50, height=50,
market=sweden, framed=True, inc_vat=False))
self.assertEqual(960, canvas_price(
width=100, height=100, market=sweden, framed=True, inc_vat=False))
self.assertEqual(1359, canvas_price(
width=150, height=120, market=sweden, framed=True, inc_vat=False))
self.assertEqual(256000, canvas_price(
width=2000, height=2000, market=sweden, framed=True, inc_vat=False))
self.assertEqual(397, canvas_price(width=10, height=10,
self.assertEqual(341, canvas_price(width=10, height=10,
market=sweden, framed=True, inc_vat=False))
self.assertEqual(427, canvas_price(width=40, height=40,
market=sweden, framed=True, inc_vat=True))
self.assertEqual(299, canvas_price(width=40, height=40,
market=sweden, framed=False, inc_vat=True))
self.assertEqual(277, canvas_frame_price(
width=40, height=40, market=sweden, inc_vat=True))
self.assertEqual(731, canvas_price(width=80, height=80,
market=sweden, framed=False, inc_vat=True))
self.assertEqual(1044, canvas_price(width=80, height=80,
market=sweden, framed=True, inc_vat=True))
self.assertEqual(1260, canvas_price(width=150, height=150,
market=sweden, framed=False, inc_vat=True))
self.assertEqual(1800, canvas_price(width=150, height=150,
market=sweden, framed=True, inc_vat=True))
self.assertEqual(672, canvas_price(
width=100, height=100, market=sweden, framed=False, inc_vat=False))
self.assertEqual(840, canvas_price(
width=100, height=100, market=sweden, framed=False, inc_vat=True))
self.assertEqual(436, canvas_price(width=50, height=50,
self.assertEqual(462, canvas_price(width=50, height=50,
market=denmark, framed=True, inc_vat=False))
def test_canvas_frame_price(self):
self.assertAlmostEqual(416.923, canvas_frame_price(width=100, height=100, stock_price=1.04230824,
additional_price=94.75, market=sweden, rounded=False, inc_vat=False), places=2)
self.assertAlmostEqual(177.19, canvas_frame_price(
1, 1, stock_price=1.04230824, additional_price=94.750000, market=sweden, rounded=False, inc_vat=False), places=2)
self.assertAlmostEqual(625.38, canvas_frame_price(
500, 500, stock_price=1.04230824, additional_price=None, market=sweden, rounded=False, inc_vat=False), places=2)
self.assertAlmostEqual(41.692, canvas_frame_price(
width=100, height=100, stock_price=1.04230824, additional_price=94.75, rounded=False, market=russia), places=2)
def test_old_canvas_diy_frame_price(self):
self.assertEqual(
403, old_canvas_diy_frame_price(50, 50, market=sweden))
self.assertEqual(801, old_canvas_diy_frame_price(
100, 110, market=denmark))
self.assertEqual(463, old_canvas_diy_frame_price(
50, 50, market=sweden, reseller=reseller))
self.assertEqual(1327, old_canvas_diy_frame_price(
500, 500, market=sweden))
self.assertEqual(88, old_canvas_diy_frame_price(
100, 100, market=russia, reseller=piterra))
def test_old_canvas_price(self):
self.assertEqual(250, old_canvas_price(
width=50, height=50, material=standard_canvas, market=sweden, framed=False))
self.assertEqual(200, old_canvas_price(
width=1, height=1, material=standard_canvas, market=sweden, framed=False))
self.assertEqual(7493, old_canvas_price(
width=500, height=500, material=standard_canvas, market=sweden, framed=False))
self.assertEqual(5994, old_canvas_price(width=500, height=500,
material=standard_canvas, market=sweden, framed=False, inc_vat=False))
self.assertEqual(7493, old_canvas_price(
width=500, height=500, material=standard_canvas, market=sweden, framed=False))
self.assertEqual(236, old_canvas_price(
width=50, height=50, material=standard_canvas, market=denmark, framed=False))
self.assertEqual(294, old_canvas_price(
width=50, height=50, material=standard_canvas, market=sweden, designer=designer, framed=False))
self.assertEqual(510, old_canvas_price(
width=50, height=50, material=standard_canvas, market=sweden, framed=True))
self.assertEqual(2972, old_canvas_price(
width=150, height=140, material=standard_canvas, market=sweden, framed=True))
self.assertEqual(168, old_canvas_price(width=100, height=100, material=standard_canvas, market=russia, framed=True,
designer=designer_moomin, reseller=piterra))
self.assertEqual(287, old_canvas_price(
width=50, height=50, material=standard_canvas, market=sweden, framed=False, reseller=reseller))
self.assertEqual(111, old_canvas_price(width=100, height=100, material=standard_canvas, market=russia, framed=False,
designer=designer_moomin, reseller=piterra))
self.assertEqual(624, canvas_frame_price(
width=100, height=100, market=sweden, inc_vat=False))
self.assertEqual(780, canvas_frame_price(
width=100, height=100, market=sweden, inc_vat=True))
self.assertEqual(62, canvas_frame_price(
width=100, height=100, market=russia))
self.assertEqual(936, canvas_frame_price(
500, 500, market=sweden, inc_vat=False))
self.assertEqual(222, canvas_frame_price(
1, 1, market=sweden, inc_vat=False))
def test_wallpaper_custom_inquiry_price(self):
with mock.patch.object(Inquiry, 'market', nl):
inquiry = Inquiry(product_group="photo-wallpaper", territory="NL", pricepremium=0,
width=350, height=270, price_effect=0, price_retouch=160.00, material=standard_wallpaper)
width=350, height=270, price_effect=0, price_retouch=160.00, material=standard_wallpaper)
self.assertEqual(333, inquiry_price(inquiry))
self.assertEqual(310, inquiry_price(inquiry, inc_price_retouch=False))
self.assertEqual(310, inquiry_price(
inquiry, inc_price_retouch=False))
self.assertEqual(160, inquiry.price_retouch)
self.assertEqual(18.4, inquiry.local_price_retouch(rounded=False))
self.assertEqual(22, inquiry.local_price_retouch(
@@ -195,10 +183,11 @@ class TestPrice(unittest2.TestCase):
product = Product(designer=designer)
with mock.patch.object(Inquiry, 'market', sweden):
inquiry = Inquiry(product_group="photo-wallpaper", territory="SE", pricepremium=0,
width=350, height=280, price_retouch=0, material=standard_wallpaper, product=product)
width=350, height=280, price_retouch=0, material=standard_wallpaper, product=product)
self.assertEqual(3007, inquiry_price(inquiry))
self.assertEqual(3007, inquiry_price(inquiry, inc_price_retouch=False))
self.assertEqual(3007, inquiry_price(
inquiry, inc_price_retouch=False))
self.assertEqual(3312, inquiry_price(
inquiry, material=premium_wallpaper))
@@ -210,7 +199,8 @@ class TestPrice(unittest2.TestCase):
inquiry = Inquiry(product_group="photo-wallpaper", territory="SE", pricepremium=25,
width=250, height=400, price_retouch=200, material=standard_wallpaper, product=product)
self.assertEqual(3835, inquiry_price(inquiry, inc_price_retouch=False))
self.assertEqual(3835, inquiry_price(
inquiry, inc_price_retouch=False))
self.assertEqual(200, inquiry.price_retouch)
self.assertEqual(250, inquiry.local_price_retouch(
rounded=True, inc_vat=True))
@@ -221,7 +211,8 @@ class TestPrice(unittest2.TestCase):
inquiry = Inquiry(product_group="photo-wallpaper", territory="RU", width=150, height=211, dealer_store=piterra, pricepremium=36.029411,
material=standard_wallpaper, product=product)
self.assertEqual(138, inquiry_price(inquiry, inc_price_retouch=False))
self.assertEqual(138, inquiry_price(
inquiry, inc_price_retouch=False))
self.assertEqual(152, inquiry_price(
inquiry, inc_price_retouch=False, material=premium_wallpaper))
@@ -230,9 +221,11 @@ class TestPrice(unittest2.TestCase):
inquiry = Inquiry(product_group='canvas', territory='SE', width=100, height=100,
framed=True, price_retouch=200, pricepremium=0, material=standard_canvas)
self.assertEqual(1520, inquiry_price(inquiry, inc_price_retouch=False))
self.assertEqual(1770, inquiry_price(inquiry, inc_price_retouch=True))
self.assertEqual(999, inquiry_price(
self.assertEqual(1200, inquiry_price(
inquiry, inc_price_retouch=False))
self.assertEqual(1450, inquiry_price(
inquiry, inc_price_retouch=True))
self.assertEqual(840, inquiry_price(
inquiry, inc_price_retouch=False, framed=False))
def test_canvas_piterra_inquiry_price(self):
@@ -242,5 +235,5 @@ class TestPrice(unittest2.TestCase):
# note: site currently calculates this as €150 which is wrong because
# it does not add dealer_store.pricepremium to the frame price
self.assertEqual(165, inquiry_price(inquiry))
self.assertEqual(109, inquiry_price(inquiry, framed=False))
self.assertEqual(131, inquiry_price(inquiry))
self.assertEqual(91, inquiry_price(inquiry, framed=False))
tests/resources/test_prices.py
+21 -31
View File
@@ -98,34 +98,28 @@ class TestEndpoints(flask_testing.TestCase):
self.assertEqual(expected, response.json['data'])
def test_canvas(self):
self._add_material('standard-canvas', 2, 79920)
response = self.client.get(
'/prices/canvas?width=200&height=10&territory=SE')
self.assert200(response)
expected = [
{
'price_excl_vat': 970.3471312000001,
'price': 1212.9339140000002,
'width': 150,
'height': 40,
'framed': True,
'm2_price': 999.0,
'm2_price_excl_vat': 799.2,
"framed": True,
"height": 40,
"price": 1008.0,
"price_excl_vat": 806.4,
"width": 150
},
{
'price_excl_vat': 319.68000000000006,
'price': 399.6000000000001,
'width': 200,
'height': 20,
'framed': False,
'm2_price': 999.0,
'm2_price_excl_vat': 799.2,
"framed": False,
"height": 20,
"price": 575.47,
"price_excl_vat": 460.37600000000003,
"width": 200
}
]
self.assertEqual(expected, response.json['data'])
def test_canvas_with_product(self):
self._add_material('standard-canvas', 2, 79920)
designer = self._add_designer(4)
product = self._add_product(designer)
response = self.client.get(
@@ -133,22 +127,18 @@ class TestEndpoints(flask_testing.TestCase):
self.assert200(response)
expected = [
{
'height': 40,
'price_excl_vat': 989.5279312000002,
'price': 1236.9099140000003,
'framed': True,
'm2_price': 1038.96,
'm2_price_excl_vat': 831.1680000000001,
'width': 150
"framed": True,
"height": 40,
"price": 1048.32,
"price_excl_vat": 838.656,
"width": 150
},
{
'height': 20,
'price_excl_vat': 332.46720000000005,
'price': 415.58400000000006,
'framed': False,
'm2_price': 1038.96,
'm2_price_excl_vat': 831.1680000000001,
'width': 200
"framed": False,
"height": 20,
"price": 598.4888000000001,
"price_excl_vat": 478.79104000000007,
"width": 200
}
]
self.assertEqual(expected, response.json['data'])
@@ -160,7 +150,7 @@ class TestEndpoints(flask_testing.TestCase):
product = response.json['data'][0]
self.assertEqual(150, product['width'], "it adjusts measurements")
self.assertEqual(50, product['height'])
self.assertAlmostEqual(923.857, product['price'], places=2)
self.assertAlmostEqual(731.25, product['price'], places=2)
def test_inquiry_wallpaper(self):
self._add_material('standard-wallpaper', 1, 236)