diff --git a/api/lib/prices.py b/api/lib/prices.py index f3eb88a..d294fc5 100644 --- a/api/lib/prices.py +++ b/api/lib/prices.py @@ -155,10 +155,10 @@ def canvas_frame_price(width, height, market, reseller=None, rounded=True, inc_v def poster_cm2_price(cm2): - price_cm2_at_1cm2 = 0.084 - price_cm2_at_5000cm2 = 0.0392 - price_cm2_at_10000cm2 = 0.0336 - price_cm2_at_22500cm2 = 0.028 + price_cm2_at_1cm2 = 0.1008 + price_cm2_at_5000cm2 = 0.04704 + price_cm2_at_10000cm2 = 0.04032 + price_cm2_at_22500cm2 = 0.0336 if cm2 <= 5000: diff = price_cm2_at_1cm2 - price_cm2_at_5000cm2 @@ -184,7 +184,7 @@ def poster_price(width, height, market, hanger=True, designer=None, reseller=Non cm2 = width * height cm2_price = poster_cm2_price(cm2) price = cm2 * cm2_price - price = max(price, 134.4) # the price can never go below 134.4 SEK + price = max(price, 200) # the price can never go below 200 SEK if(hanger): price += _price_for_poster_hanger_size(width) diff --git a/tests/lib/test_prices.py b/tests/lib/test_prices.py index 4b2e739..f8c1c34 100644 --- a/tests/lib/test_prices.py +++ b/tests/lib/test_prices.py @@ -267,20 +267,20 @@ class TestPrice(unittest2.TestCase): self.assertEqual(0, package_price('poster', 150, 40, market=sweden)) def test_poster_cm2_price(self): - self.assertEqual(0.08399104, poster_cm2_price(1)) - self.assertEqual(0.08310400000000001, poster_cm2_price(100)) - self.assertEqual(0.07504000000000001, poster_cm2_price(1000)) - self.assertEqual(0.0336, poster_cm2_price(10000)) + self.assertEqual(0.100789248, poster_cm2_price(1)) + self.assertEqual(0.0997248, poster_cm2_price(100)) + self.assertEqual(0.090048, poster_cm2_price(1000)) + self.assertEqual(0.04032, poster_cm2_price(10000)) self.assertEqual(0.028, poster_cm2_price(100000)) def test_poster_price(self): - self.assertEqual(287, poster_price(width=30, height=40, hanger=True, market=sweden)) - self.assertEqual(168, poster_price(width=30, height=40, hanger=False, market=sweden)) - self.assertEqual(59, poster_price(width=30, height=40, hanger=True, market=us), 'extra cost for us market') - self.assertEqual(64, poster_price(width=30, height=40, hanger=True, market=eu), 'extra cost for eu market') - self.assertEqual(105, poster_price(width=120, height=40, market=us), 'high extra cost for us market wide posters') - self.assertEqual(113, poster_price(width=120, height=40, market=eu), 'high extra cost for eu market wide posters') - self.assertEqual(106, poster_price(width=120, height=40, market=us, designer=designer_moomin)) + self.assertEqual(369, 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)) def test_poster_hanger_price(self): self.assertEqual(182, poster_hanger_price(30, market=sweden)) @@ -293,6 +293,6 @@ class TestPrice(unittest2.TestCase): inquiry = Inquiry(product_group='poster', territory='SE', width=30, height=40, hanger=True, price_retouch=200, pricepremium=0) - self.assertEqual(287, inquiry_price(inquiry, inc_price_retouch=False)) - self.assertEqual(537, inquiry_price(inquiry, inc_price_retouch=True)) - self.assertEqual(168, inquiry_price(inquiry, inc_price_retouch=False, hanger=False)) + self.assertEqual(369, inquiry_price(inquiry, inc_price_retouch=False)) + self.assertEqual(619, 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 0ac10ef..fdc09de 100644 --- a/tests/resources/test_prices.py +++ b/tests/resources/test_prices.py @@ -159,15 +159,15 @@ class TestEndpoints(flask_testing.TestCase): { 'hanger': True, 'height': 30, - 'price': 337.0, - 'price_excl_vat': 269.6, + 'price': 419.0, + 'price_excl_vat': 335.2, 'width': 50 }, { 'hanger': False, 'height': 30, - 'price': 168.0, - 'price_excl_vat': 134.4, + 'price': 250.0, + 'price_excl_vat': 200, 'width': 50 } ]