Changeset 12343 for main/waeup.ikoba/trunk/src/waeup/ikoba/customers

Timestamp:

30 Dec 2014, 12:52:40 (10 years ago)

Author:

Henrik Bettermann

Message:

Move ProductOption? interfaces to productoptions to avoid nasty circular imports.

Use ISO_4217_CURRENCIES.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/customers

Files:

• tests/test_browser.py (modified) (2 diffs)
• vocabularies.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py

@@ -1293 +1293 @@
         # from the chosen product.
         self.assertTrue('<option selected="selected" value="Any product option">'
-                        'Any product option @ 88.8 EUR</option>'
+                        'Any product option @ 88.8 Euro</option>'
                         in self.browser.contents)
         self.assertTrue('<option value="First option">First option '
-                        '@ 99.9 USD</option>' in self.browser.contents)
+                        '@ 99.9 US Dollar</option>' in self.browser.contents)
         # In test browser we can at least replace the option
         self.browser.getControl(
@@ -1304 +1304 @@
         self.assertEqual(contract.product_options[0].title, 'First option')
         self.browser.getLink("View").click()
-        self.assertTrue('<span>First option @ 99.9 USD</span>' in self.browser.contents)
+        self.assertTrue('<span>First option @ 99.9 US Dollar</span>' in self.browser.contents)
         self.assertEqual(self.browser.url, self.contracts_path + '/%s/index' % conid)
         # An href attribute is referring to the document and product objects

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/vocabularies.py

@@ -33 +33 @@
 from waeup.ikoba.utils.helpers import get_sorted_preferred
 from waeup.ikoba.utils.countries import COUNTRIES
+from waeup.ikoba.payments.currencies import ISO_4217_CURRENCIES
 
 #: a tuple of tuples (<COUNTRY-NAME>, <ISO-CODE>) with Nigeria first.
@@ -203 +204 @@
 
     def getTitle(self, context, value):
-        return "%s @ %s %s" % (value.title, value.fee, value.currency)
+        currency = ISO_4217_CURRENCIES[value.currency][1]
+        return "%s @ %s %s" % (value.title, value.fee, currency)