Changeset 12378

Timestamp:

3 Jan 2015, 13:41:03 (10 years ago)

Author:

Henrik Bettermann

Message:

Ease customization of courrencies. Use source instead of vocabulary in interfaces.

Location:

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

Files:

• interfaces.py (modified) (1 diff)
• products/productoptions.py (modified) (2 diffs)
• utils/utils.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/interfaces.py

@@ -205 +205 @@
         return value
 
+class CurrencySource(BasicSourceFactory):
+    """A source for currencies.
+    """
+    def getValues(self):
+        currencies = getUtility(IIkobaUtils).CURRENCIES
+        return currencies.keys()
+
+    def getToken(self, value):
+        return value
+
+    def getTitle(self, value):
+        currencies = getUtility(IIkobaUtils).CURRENCIES
+        return currencies[value][1]
+
 class IIkobaUtils(Interface):
     """A collection of methods which are subject to customization.

main/waeup.ikoba/trunk/src/waeup/ikoba/products/productoptions.py

@@ -27 +27 @@
 from zope.schema.fieldproperty import FieldProperty
 from zope.schema import Object
-from waeup.ikoba.interfaces import SimpleIkobaVocabulary
+from waeup.ikoba.interfaces import CurrencySource
 from waeup.ikoba.interfaces import MessageFactory as _
 from waeup.ikoba.widgets.objectwidget import (
     IkobaObjectWidget, IkobaObjectDisplayWidget
     )
-from waeup.ikoba.payments.currencies import ISO_4217_CURRENCIES_VOCAB as currencies
 
-#currencies = SimpleIkobaVocabulary(
-#    (_('NGN'),'NGN'),
-#    (_('USD'),'USD'),
-#    (_('EUR'),'EUR'),
-#    )
 
 class IProductOption(Interface):
@@ -54 +48 @@
     currency = schema.Choice(
         title = _(u'Currency'),
-        vocabulary = currencies,
+        source = CurrencySource(),
         required = False,
         )

main/waeup.ikoba/trunk/src/waeup/ikoba/utils/utils.py

@@ -28 +28 @@
 from waeup.ikoba.smtp import send_mail as send_mail_internally
 from waeup.ikoba.utils.helpers import get_sorted_preferred
+from waeup.ikoba.payments.currencies import ISO_4217_CURRENCIES
 
 
@@ -95 +96 @@
         'ig': (6, u'Igbo'),
         }
+
+    # CURRENCIES must be equal to or an excerpt of ISO_4217_CURRENCIES
+    CURRENCIES = ISO_4217_CURRENCIES
 
     #: A function to return