Changeset 9405

Timestamp:

24 Oct 2012, 21:31:48 (12 years ago)

Author:

Henrik Bettermann

Message:

Make payment categories more easily customizable.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• payments/interfaces.py (modified) (3 diffs)
• payments/payment.py (modified) (2 diffs)
• utils/utils.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/payments/interfaces.py

@@ -18 +18 @@
 from zope.interface import Attribute
 from zope import schema
+from waeup.kofa.university.vocabularies import ContextualDictSourceFactoryBase
 from waeup.kofa.interfaces import (
     IKofaObject, SimpleKofaVocabulary, academic_sessions_vocab)
@@ -28 +29 @@
     )
 
-payment_categories = SimpleKofaVocabulary(
-    (_('School Fee'),'schoolfee'),
-    (_('Acceptance Fee'),'clearance'),
-    (_('Bed Allocation Fee'),'bed_allocation'),
-    (_('Hostel Maintenance Fee'),'hostel_maintenance'),
-    (_('Transfer Fee'),'transfer'),
-    (_('Gown Hire Fee'),'gown'),
-    (_('Application Fee'), 'application'),
-    )
+class PaymentCategorySource(ContextualDictSourceFactoryBase):
+    """A application category source delivers all special handling categories
+    provided for accommodation booking.
+    """
+    #: name of dict to deliver from kofa utils.
+    DICT_NAME = 'PAYMENT_CATEGORIES'
 
 class IPaymentsContainer(IKofaObject):
@@ -52 +50 @@
         title = _(u'Payment Category'),
         default = u'schoolfee',
-        vocabulary = payment_categories,
+        source = PaymentCategorySource(),
         required = True,
         )

main/waeup.kofa/trunk/src/waeup/kofa/payments/payment.py

@@ -28 +28 @@
 from waeup.kofa.payments.interfaces import (
     IPayment, ISCPayment, IOnlinePayment,
-    payment_states, payment_categories)
+    payment_states)
 from waeup.kofa.utils.helpers import attrs_to_fields, get_current_principal
 
@@ -50 +50 @@
     @property
     def category(self):
-        return payment_categories.getTermByToken(self.p_category).title
+        utils = getUtility(IKofaUtils)
+        return utils.PAYMENT_CATEGORIES[self.p_category]
 
 # not used

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

@@ -149 +149 @@
         'blocked': 'Blocked Hostel',
         'pd': 'Postgraduate Hostel'
+        }
+
+    PAYMENT_CATEGORIES = {
+        'schoolfee': 'School Fee',
+        'clearance': 'Acceptance Fee',
+        'bed_allocation': 'Bed Allocation Fee',
+        'hostel_maintenance': 'Hostel Maintenance Fee',
+        'transfer': 'Transfer Fee',
+        'gown': 'Gown Hire Fee',
+        'application': 'Application Fee'
         }