Changeset 6869

Timestamp:

10 Oct 2011, 16:50:11 (13 years ago)

Author:

Henrik Bettermann

Message:

Add user interfaces to add, remove and manage student online payments.

Location:

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

Files:

• payments/interfaces.py (modified) (8 diffs)
• payments/payment.py (modified) (5 diffs)
• payments/vocabularies.py (modified) (1 diff)
• students/browser.py (modified) (4 diffs)
• students/browser_templates/paymentsmanagepage.pt (added)
• students/browser_templates/paymentspage.pt (added)

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

@@ -1 +1 @@
 ##
 ## interfaces.py
+from zope.interface import Attribute, invariant
 from zope import schema
 from waeup.sirp.interfaces import IWAeUPObject
@@ -15 +16 @@
 
     """
+    p_id = Attribute('Payment identifier.')
 
     p_state = schema.Choice(
@@ -32 +34 @@
     p_item = schema.TextLine(
         title = u'Payment Item',
-        default = u'Certificate XYZ',
+        default = None,
         required = False,
         )
 
-    date_of_creation = schema.Date(
+    creation_date = schema.Datetime(
         title = u'Ticket Creation Date',
+        readonly = True,
         )
 
-    date_of_payment = schema.Date(
-        title = u'Date of Payment',
+    payment_date = schema.Date(
+        title = u'Payment Date',
+        required = False,
+        readonly = True,
         )
 
     amount_auth = schema.Int(
-        title = u'Amount authorized',
+        title = u'Amount Authorized',
         default = 0,
         required = True,
+        readonly = True,
         )
 
@@ -59 +65 @@
         default = u'Certificate XYZ',
         required = False,
+        readonly = True,
         )
 
@@ -70 +77 @@
         default = 0,
         required = False,
+        readonly = True,
         )
 
-    order_id = schema.TextLine(
-        title = u'Order Id',
-        default = None,
-        )
+    #order_id = schema.TextLine(
+    #    title = u'Order Id',
+    #    default = None,
+    #    required = True,
+    #    )
 
     r_amount_approved = schema.Int(
@@ -81 +90 @@
         default = 0,
         required = False,
+        readonly = True,
         )
 
@@ -86 +96 @@
         title = u'Response Code',
         default = None,
+        required = False,
+        readonly = True,
         )
 
@@ -91 +103 @@
         title = u'Response Card Number',
         default = None,
+        required = False,
+        readonly = True,
         )

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

@@ -18 +18 @@
 """
 import grok
+from datetime import datetime
 from grok import index
 from zope.component.interfaces import IFactory
@@ -24 +25 @@
     IPayment, ISCPayment, IOnlinePayment)
 from waeup.sirp.utils.helpers import attrs_to_fields
+from waeup.sirp.payments.vocabularies import payment_states, payment_categories
 
 class Payment(grok.Container):
@@ -34 +36 @@
     def __init__(self):
         super(Payment, self).__init__()
+        self.creation_date = datetime.now()
+        self.p_id = None
         return
+
+    @property
+    def state(self):
+        return payment_states.getTermByToken(self.p_state).title
+
+    @property
+    def category(self):
+        return payment_categories.getTermByToken(self.p_category).title
 
 class SCPayment(Payment):
@@ -44 +56 @@
     def __init__(self):
         super(SCPayment, self).__init__()
+        p_id = None
         return
 
@@ -56 +69 @@
     def __init__(self):
         super(OnlinePayment, self).__init__()
+        p_id = None
         return
 

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

@@ -4 +4 @@
 
 payment_states = SimpleWAeUPVocabulary(
-    ('not yet paid','unpaid'),
-    ('paid','paid'),
+    ('Not yet paid','unpaid'),
+    ('Paid','paid'),
     )
 

main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

@@ -17 +17 @@
 """
 import grok
-
+from time import time
+from datetime import date, datetime
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
 from zope.component import createObject
@@ -30 +31 @@
 from waeup.sirp.interfaces import IWAeUPObject, IUserAccount
 from waeup.sirp.widgets.datewidget import (
-    FriendlyDateWidget, FriendlyDateDisplayWidget)
+    FriendlyDateWidget, FriendlyDateDisplayWidget,
+    FriendlyDatetimeDisplayWidget)
 from waeup.sirp.students.interfaces import (
     IStudentsContainer, IStudent, IStudentClearance, IStudentPasswordSetting,
@@ -42 +44 @@
 from waeup.sirp.students.vocabularies import StudyLevelSource
 from waeup.sirp.browser.resources import toggleall
+from waeup.sirp.payments.interfaces import IOnlinePayment
 
 # Save function used for save methods in manager pages
@@ -757 +760 @@
     grok.require('waeup.viewStudent')
     form_fields = grok.AutoFields(IStudentPaymentsContainer)
-    #grok.template('paymentspage')
+    grok.template('paymentspage')
     title = 'Payments'
     pnav = 4
 
+    def formatDatetime(self,datetimeobj):
+        if isinstance(datetimeobj, datetime):
+            return datetimeobj.strftime("%Y-%m-%d %H:%M:%S")
+        else:
+            return None
+
     @property
     def label(self):
         return '%s: Payments' % self.context.__parent__.fullname
+
+    def update(self):
+        super(PaymentsDisplayFormPage, self).update()
+        datatable.need()
+        return
+
+class PaymentsManageFormPage(WAeUPEditFormPage):
+    """ Page to manage the student payments
+    """
+    grok.context(IStudentPaymentsContainer)
+    grok.name('manage')
+    grok.require('waeup.manageStudents')
+    form_fields = grok.AutoFields(IStudentPaymentsContainer)
+    grok.template('paymentsmanagepage')
+    title = 'Payments'
+    pnav = 4
+
+    def formatDatetime(self,datetimeobj):
+        if isinstance(datetimeobj, datetime):
+            return datetimeobj.strftime("%Y-%m-%d %H:%M:%S")
+        else:
+            return None
+
+    @property
+    def label(self):
+        return '%s: Payments' % self.context.__parent__.fullname
+
+    def update(self):
+        super(PaymentsManageFormPage, self).update()
+        datatable.need()
+        return
+
+    @grok.action('Remove selected tickets')
+    def delPaymentTicket(self, **data):
+        form = self.request.form
+        if form.has_key('val_id'):
+            child_id = form['val_id']
+        else:
+            self.flash('No payment selected.')
+            self.redirect(self.url(self.context, '@@manage'))
+            return
+        if not isinstance(child_id, list):
+            child_id = [child_id]
+        deleted = []
+        for id in child_id:
+            try:
+                del self.context[id]
+                deleted.append(id)
+            except:
+                self.flash('Could not delete %s: %s: %s' % (
+                        id, sys.exc_info()[0], sys.exc_info()[1]))
+        if len(deleted):
+            self.flash('Successfully removed: %s' % ', '.join(deleted))
+        self.redirect(self.url(self.context, u'@@manage'))
+        return
+
+    @grok.action('Add online payment ticket')
+    def addPaymentTicket(self, **data):
+        self.redirect(self.url(self.context, '@@addop'))
+
+class OnlinePaymentManageActionButton(ManageActionButton):
+    grok.order(1)
+    grok.context(IStudentPaymentsContainer)
+    grok.view(PaymentsDisplayFormPage)
+    grok.require('waeup.manageStudents')
+    text = 'Manage payments'
+    target = 'manage'
+
+class OnlinePaymentAddFormPage(WAeUPAddFormPage):
+    """ Page to add an online payment ticket
+    """
+    grok.context(IStudentPaymentsContainer)
+    grok.name('addop')
+    grok.require('waeup.handleStudent')
+    form_fields = grok.AutoFields(IOnlinePayment).select(
+        'p_category')
+    #grok.template('addpaymentpage')
+    label = 'Add online payment'
+    title = 'Payments'
+    pnav = 4
+
+    @grok.action('Create ticket')
+    def createTicket(self, **data):
+        payment = createObject(u'waeup.OnlinePayment')
+        self.applyData(payment, **data)
+        timestamp = "%d" % int(time()*1000)
+        #order_id = "%s%s" % (student_id[1:],timestamp)
+        payment.p_id = "p%s" % timestamp
+        self.context[payment.p_id] = payment
+        self.flash('Payment ticket created.')
+        self.redirect(self.url(self.context, u'@@manage'))
+        return
+
+class OnlinePaymentDisplayFormPage(WAeUPDisplayFormPage):
+    """ Page to view an online payment ticket
+    """
+    grok.context(IOnlinePayment)
+    grok.name('index')
+    grok.require('waeup.viewStudent')
+    form_fields = grok.AutoFields(IOnlinePayment)
+    form_fields['creation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
+    form_fields['payment_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
+    pnav = 4
+
+    @property
+    def title(self):
+        return 'Online Payment Ticket %s' % self.context.p_id
+
+    @property
+    def label(self):
+        return '%s: Online Payment Ticket %s' % (
+            self.context.__parent__.__parent__.fullname,self.context.p_id)
 
 class AccommodationDisplayFormPage(WAeUPDisplayFormPage):