Changeset 7627

Timestamp:

10 Feb 2012, 20:35:28 (13 years ago)

Author:

Henrik Bettermann

Message:

Move vocabularies to interfaces module.

batchprocessing.txt: fix test

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• browser/batchprocessing.txt (modified) (1 diff)
• payments/interfaces.py (modified) (1 diff)
• payments/payment.py (modified) (1 diff)
• payments/vocabularies.py (deleted)

main/waeup.sirp/trunk/src/waeup/sirp/browser/batchprocessing.txt

@@ -96 +96 @@
      'Applicants Container Importer',
      'CourseTicket Importer',
+     'Payment Importer',
      'Student Importer',
      'StudentStudyCourse Importer (update only)',

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

@@ -18 +18 @@
 from zope.interface import Attribute
 from zope import schema
-from waeup.sirp.interfaces import ISIRPObject
-from waeup.sirp.payments.vocabularies import (
-    payment_states, payment_categories)
+from waeup.sirp.interfaces import ISIRPObject, SimpleSIRPVocabulary
+
+payment_states = SimpleSIRPVocabulary(
+    ('Not yet paid','unpaid'),
+    ('Paid','paid'),
+    ('Failed','failed'),
+    )
+
+payment_categories = SimpleSIRPVocabulary(
+    ('School Fee','schoolfee'),
+    ('Clearance','clearance'),
+    ('Bed Allocation','bed_allocation'),
+    ('Hostel Maintenance','hostel_maintenance'),
+    ('Transfer','transfer'),
+    ('Gown','gown'),
+    ('Acceptance Fee', 'acceptance'),
+    )
 
 class IPaymentsContainer(ISIRPObject):

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

@@ -23 +23 @@
 from grok import index
 from waeup.sirp.payments.interfaces import (
-    IPayment, ISCPayment, IOnlinePayment)
+    IPayment, ISCPayment, IOnlinePayment,
+    payment_states, payment_categories)
 from waeup.sirp.utils.helpers import attrs_to_fields
-from waeup.sirp.payments.vocabularies import payment_states, payment_categories
 
 class Payment(grok.Container):