diff --git a/api/lib/prices.py b/api/lib/prices.py index d294fc5..ef49b48 100644 --- a/api/lib/prices.py +++ b/api/lib/prices.py @@ -238,19 +238,19 @@ def poster_hanger_price(width, market, reseller=None, rounded=True, inc_vat=True def _price_for_poster_hanger_size(size): if size > 0 and size <= 30: - return 95.2 + return 83 if size > 30 and size <= 50: - return 135.2 + return 118 if size > 50 and size <= 60: - return 143.2 + return 125 if size > 60 and size <= 70: - return 151.2 + return 132 if size > 70 and size <= 100: - return 220 + return 192 if size > 100 and size <= 125: - return 250 + return 218 if size > 125 and size <= 150: - return 300 + return 262 raise ValueError('Invalid poster hanger size: {}'.format(size)) diff --git a/tests/lib/test_prices.py b/tests/lib/test_prices.py index f8c1c34..bfc487d 100644 --- a/tests/lib/test_prices.py +++ b/tests/lib/test_prices.py @@ -274,25 +274,25 @@ class TestPrice(unittest2.TestCase): self.assertEqual(0.028, poster_cm2_price(100000)) def test_poster_price(self): - self.assertEqual(369, poster_price(width=30, height=40, hanger=True, market=sweden)) + self.assertEqual(354, poster_price(width=30, height=40, hanger=True, market=sweden)) self.assertEqual(250, poster_price(width=30, height=40, hanger=False, market=sweden)) - self.assertEqual(67, poster_price(width=30, height=40, hanger=True, market=us), 'extra cost for us market') - self.assertEqual(73, poster_price(width=30, height=40, hanger=True, market=eu), 'extra cost for eu market') - self.assertEqual(110, poster_price(width=120, height=40, market=us), 'high extra cost for us market wide posters') - self.assertEqual(119, poster_price(width=120, height=40, market=eu), 'high extra cost for eu market wide posters') - self.assertEqual(111, poster_price(width=120, height=40, market=us, designer=designer_moomin)) + self.assertEqual(66, poster_price(width=30, height=40, hanger=True, market=us), 'extra cost for us market') + self.assertEqual(71, poster_price(width=30, height=40, hanger=True, market=eu), 'extra cost for eu market') + self.assertEqual(106, poster_price(width=120, height=40, market=us), 'high extra cost for us market wide posters') + self.assertEqual(114, poster_price(width=120, height=40, market=eu), 'high extra cost for eu market wide posters') + self.assertEqual(107, poster_price(width=120, height=40, market=us, designer=designer_moomin)) def test_poster_hanger_price(self): - self.assertEqual(182, poster_hanger_price(30, market=sweden)) - self.assertEqual(438, poster_hanger_price(150, market=sweden)) - self.assertEqual(48, poster_hanger_price(30, market=us)) - self.assertEqual(92, poster_hanger_price(150, market=us)) + self.assertEqual(166, poster_hanger_price(30, market=sweden)) + self.assertEqual(390, poster_hanger_price(150, market=sweden)) + self.assertEqual(47, poster_hanger_price(30, market=us)) + self.assertEqual(88, poster_hanger_price(150, market=us)) def test_poster_custom_inquiry_price(self): with mock.patch.object(Inquiry, 'market', sweden): inquiry = Inquiry(product_group='poster', territory='SE', width=30, height=40, hanger=True, price_retouch=200, pricepremium=0) - self.assertEqual(369, inquiry_price(inquiry, inc_price_retouch=False)) - self.assertEqual(619, inquiry_price(inquiry, inc_price_retouch=True)) + self.assertEqual(354, inquiry_price(inquiry, inc_price_retouch=False)) + self.assertEqual(604, inquiry_price(inquiry, inc_price_retouch=True)) self.assertEqual(250, inquiry_price(inquiry, inc_price_retouch=False, hanger=False)) diff --git a/tests/resources/test_prices.py b/tests/resources/test_prices.py index fdc09de..18f3243 100644 --- a/tests/resources/test_prices.py +++ b/tests/resources/test_prices.py @@ -159,8 +159,8 @@ class TestEndpoints(flask_testing.TestCase): { 'hanger': True, 'height': 30, - 'price': 419.0, - 'price_excl_vat': 335.2, + 'price': 397.5, + 'price_excl_vat': 318, 'width': 50 }, { @@ -177,8 +177,8 @@ class TestEndpoints(flask_testing.TestCase): response = self.client.get('/prices/poster-hanger?width=50&territory=SE') self.assert200(response) product = response.json['data'][0] - self.assertEqual(231.5, product['price']) - self.assertEqual(185.2, product['price_excl_vat']) + self.assertEqual(210.0, product['price']) + self.assertEqual(168, product['price_excl_vat']) self.assertEqual(50, product['width']) def test_inquiry_wallpaper(self):