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

PW-680 fixed a bug where exchange_rate and price_adjustments didnt reload properly between requests

Browse Source
This commit is contained in:
Martin
2017-03-03 10:44:12 +01:00
parent 3e240a3123
commit 4c7ab37a21
2 changed files with 63 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/models/market.py
+15 -15
View File
@@ -74,26 +74,26 @@ class Market(object):
_markets = [ _markets = [
Market('Sweden', 'sv_SE', 'SEK', 1.25, 'SWE'), ('Sweden', 'sv_SE', 'SEK', 1.25, 'SWE'),
Market('Norway', 'nn_NO', 'NOK', 1.25, 'NOR'), ('Norway', 'nn_NO', 'NOK', 1.25, 'NOR'),
Market('United kingdom', 'en_GB', 'GBP', 1.20, 'GBR'), ('United kingdom', 'en_GB', 'GBP', 1.20, 'GBR'),
Market('Denmark', 'da_DK', 'DKK', 1.25, 'DNK'), ('Denmark', 'da_DK', 'DKK', 1.25, 'DNK'),
Market('Finland', 'fi_FI', 'EUR', 1.24, 'FIN'), ('Finland', 'fi_FI', 'EUR', 1.24, 'FIN'),
Market('Russia', 'ru_RU', 'EUR', 1, 'RUS'), ('Russia', 'ru_RU', 'EUR', 1, 'RUS'),
Market('Germany', 'de_DE', 'EUR', 1.19, 'DEU'), ('Germany', 'de_DE', 'EUR', 1.19, 'DEU'),
Market('Netherlands', 'nl_NL', 'EUR', 1.21, 'NLD'), ('Netherlands', 'nl_NL', 'EUR', 1.21, 'NLD'),
Market('Austria', 'de_AT', 'EUR', 1.20, 'AUT'), ('Austria', 'de_AT', 'EUR', 1.20, 'AUT'),
Market('USA', 'en_US', 'USD', 1, 'USA'), ('USA', 'en_US', 'USD', 1, 'USA'),
Market('Spain', 'es_ES', 'EUR', 1.25, 'ESP'), ('Spain', 'es_ES', 'EUR', 1.25, 'ESP'),
Market('France', 'fr_FR', 'EUR', 1.20, 'FRA'), ('France', 'fr_FR', 'EUR', 1.20, 'FRA'),
Market('Poland', 'pl_PL', 'PLN', 1.25, 'POL'), ('Poland', 'pl_PL', 'PLN', 1.25, 'POL'),
Market('International', 'en_EU', 'EUR', 1.25, None), ('International', 'en_EU', 'EUR', 1.25, None),
] ]
def iter_markets(): def iter_markets():
for market in _markets: for market in _markets:
yield market yield Market(*market)
def from_locale(locale): def from_locale(locale):
tests/lib/test_prices.py
+48 -40
View File
@@ -1,6 +1,7 @@
# coding=UTF-8 # coding=UTF-8
import unittest2 import unittest2
import mock
from api.lib.prices import * from api.lib.prices import *
from tests.factories import DesignerFactory, ContractCustomerFactory, InquiryFactory from tests.factories import DesignerFactory, ContractCustomerFactory, InquiryFactory
from api.models import market from api.models import market
@@ -169,70 +170,77 @@ class TestPrice(unittest2.TestCase):
self.assertEqual(111, old_canvas_price(width=100, height=100, material=standard_canvas, market=russia, framed=False, self.assertEqual(111, old_canvas_price(width=100, height=100, material=standard_canvas, market=russia, framed=False,
designer=designer_moomin, reseller=piterra)) designer=designer_moomin, reseller=piterra))
def test_wallpaper_custom_inquiry_price(self): def test_wallpaper_custom_inquiry_price(self):
inquiry = Inquiry(product_group="photo-wallpaper", territory="NL", pricepremium=0, 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(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(160, inquiry.price_retouch)
self.assertEqual(18.4, inquiry.local_price_retouch(rounded=False)) self.assertEqual(18.4, inquiry.local_price_retouch(rounded=False))
self.assertEqual(22, inquiry.local_price_retouch( self.assertEqual(22, inquiry.local_price_retouch(
rounded=True, inc_vat=True)) rounded=True, inc_vat=True))
# test with different material # test with different material
self.assertEqual(342, inquiry_price( self.assertEqual(342, inquiry_price(
inquiry, inc_price_retouch=False, material=premium_wallpaper)) inquiry, inc_price_retouch=False, material=premium_wallpaper))
self.assertEqual(364, inquiry_price( self.assertEqual(364, inquiry_price(
inquiry, material=premium_wallpaper)) inquiry, material=premium_wallpaper))
def test_wallpaper_product_inquiry_price(self): def test_wallpaper_product_inquiry_price(self):
designer = DesignerFactory() designer = DesignerFactory()
designer.pricepremium = 4 designer.pricepremium = 4
product = Product(designer=designer) product = Product(designer=designer)
inquiry = Inquiry(product_group="photo-wallpaper", territory="SE", pricepremium=0, 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))
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( self.assertEqual(3312, inquiry_price(
inquiry, material=premium_wallpaper)) inquiry, material=premium_wallpaper))
def test_wallpaper_product2_inquiry_price(self): def test_wallpaper_product2_inquiry_price(self):
designer = DesignerFactory() designer = DesignerFactory()
designer.pricepremium = 4 designer.pricepremium = 4
product = Product(designer=designer) product = Product(designer=designer)
inquiry = Inquiry(product_group="photo-wallpaper", territory="SE", pricepremium=25, with mock.patch.object(Inquiry, 'market', sweden):
width=250, height=400, price_retouch=200, material=standard_wallpaper, product=product) 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(200, inquiry.price_retouch)
self.assertEqual(250, inquiry.local_price_retouch( self.assertEqual(250, inquiry.local_price_retouch(
rounded=True, inc_vat=True)) rounded=True, inc_vat=True))
def test_wallpaper_piterra_inquiry_price(self): def test_wallpaper_piterra_inquiry_price(self):
product = Product(designer=None) product = Product(designer=None)
inquiry = Inquiry(product_group="photo-wallpaper", territory="RU", width=150, height=211, dealer_store=piterra, pricepremium=36.029411, with mock.patch.object(Inquiry, 'market', russia):
material=standard_wallpaper, product=product) 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( self.assertEqual(152, inquiry_price(
inquiry, inc_price_retouch=False, material=premium_wallpaper)) inquiry, inc_price_retouch=False, material=premium_wallpaper))
def test_canvas_custom_inquiry_price(self): def test_canvas_custom_inquiry_price(self):
inquiry = Inquiry(product_group='canvas', territory='SE', width=100, height=100, with mock.patch.object(Inquiry, 'market', sweden):
framed=True, price_retouch=200, pricepremium=0, material=standard_canvas) 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(1520, inquiry_price(inquiry, inc_price_retouch=False))
self.assertEqual(1770, inquiry_price(inquiry, inc_price_retouch=True)) self.assertEqual(1770, inquiry_price(inquiry, inc_price_retouch=True))
self.assertEqual(999, inquiry_price( self.assertEqual(999, inquiry_price(
inquiry, inc_price_retouch=False, framed=False)) inquiry, inc_price_retouch=False, framed=False))
def test_canvas_piterra_inquiry_price(self): def test_canvas_piterra_inquiry_price(self):
inquiry = Inquiry(product_group='canvas', territory='RU', width=100, height=100, with mock.patch.object(Inquiry, 'market', russia):
framed=True, dealer_store=piterra, pricepremium=0, material=standard_canvas) inquiry = Inquiry(product_group='canvas', territory='RU', width=100, height=100,
framed=True, dealer_store=piterra, pricepremium=0, material=standard_canvas)
# note: site currently calculates this as €150 which is wrong because # note: site currently calculates this as €150 which is wrong because
# it does not add dealer_store.pricepremium to the frame price # it does not add dealer_store.pricepremium to the frame price
self.assertEqual(165, inquiry_price(inquiry)) self.assertEqual(165, inquiry_price(inquiry))
self.assertEqual(109, inquiry_price(inquiry, framed=False)) self.assertEqual(109, inquiry_price(inquiry, framed=False))