Changeset 1286 for WAeUP_SRP/trunk/skins/waeup_epayment

Timestamp:

12 Jan 2007, 22:27:43 (18 years ago)

Author:

Henrik Bettermann

Message:

new student statistics
sc payment beautified
student workflow state and transition renamed

Location:

WAeUP_SRP/trunk/skins/waeup_epayment

Files:

• pay_by_sc.py (modified) (3 diffs)
• payments_view.pt (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_epayment/pay_by_sc.py

@@ -32 +32 @@
     logger.info('"%s","certificate not found", "%s"' % (student_id,course))
     prefix = ""
-else:    
+else:
     prefix = res[0].getObject().getContent().school_fee_code
     if not prefix or prefix == 'none':
@@ -77 +77 @@
 now = DateTime.DateTime()
 info['date'] = now
-info['amount'] = "n/a" 
+info['amount'] = "n/a"
 pin = info['order_id'] = ds.get('pin')
-info['type_code'] = "schoolfee_%s" % pin
-info['type_description'] = 'Schoolfee SC %s' % pin
+info['type_code'] = "%s" % pin
+info['type_description'] = 'School Fee SC %s' % pin
 payments.invokeFactory('Payment', p_id)
 payment = getattr(payments,p_id)
@@ -87 +87 @@
 payment.getContent().edit(mapping=info)
 wftool.doActionFor(payment,'close')
-wftool.doActionFor(student,'enter_school_fee_pin')
+wftool.doActionFor(student,'pay_school_fee')
 url = "%s/payments" % (student.absolute_url())
 request.RESPONSE.redirect(url)

WAeUP_SRP/trunk/skins/waeup_epayment/payments_view.pt

@@ -1 +1 @@
 <metal:html tal:define="info context/getPaymentsFolderInfo;
-             is_so info/is_so;
+             is_student context/isStudent;
              rows info/payments"
              >
@@ -15 +15 @@
         </a>
         <h3> 
-          <span tal:condition="python:is_so">
+          <span tal:condition="not:is_student">
             <span tal:content="info/student_name" />:
           </span>
+          <span tal:condition="is_student">
+            My
+          </span>          
           <span tal:content="here/title_or_id" />
         </h3>