Changeset 7069

Timestamp:

11 Nov 2011, 06:12:45 (13 years ago)

Author:

Henrik Bettermann

Message:

Enable payment approval by officers also for acceptance fee payments.

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_epayment/approve_epayment.py (modified) (1 diff)
• waeup_futminna/getPaymentsFolderInfo.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_epayment/approve_epayment.py

@@ -63 +63 @@
         wftool.doActionFor(student,next_transition)
 
+elif doc.category == 'acceptance':
+    if context.getStudentReviewState() in ('admitted', 'objection_raised'):
+        logger.info('%s paid acceptance fee' % (student_id))
+        current = DateTime.DateTime()
+        wf = context.portal_workflow
+        info = context.getClearanceInfo()
+        wftool.doActionFor(student,'enter_clearance_pin')
+        context.waeup_tool.changeWorkflowState(info['clear'], 'opened')
+        context.waeup_tool.changeWorkflowState(info['app'], 'closed')
+        dc = {}
+        app_doc = info['app_doc']
+        #dc['clr_ac_pin'] = pay_doc.order_id
+        dc['clr_ac_date'] = current
+        dc['entry_date'] = current
+        info['clear_doc'].edit(mapping = dc)
+        if info['penalty']:
+            logger.info('%s started late clearance' % (info['id']))
+
 logger.info('%s approves epayment for %s' % (member,student_id))
 review_state = wftool.getInfoFor(context,'review_state',None)

WAeUP_SRP/trunk/skins/waeup_futminna/getPaymentsFolderInfo.py

@@ -108 +108 @@
     url = row['url'] = "%s/p%s" % (payments_path,oid[start_pos:])
     row['is_requeryable'] = "%s_%s" % (payment.category,payment.session_id) not in paid_fees and payment.type == 'online' or str(member) in ('admin',)
-    row['is_approvable'] = is_so and row['is_requeryable'] and payment.category == 'schoolfee' # does not make sense for maitenance
+
+    if review_state == 'objection_raised' and payment.category == 'acceptance':
+        row['is_requeryable'] = True
+
+    row['is_approvable'] = is_so and row['is_requeryable'] and \
+        payment.category in ('schoolfee', 'acceptance')
     if payment.resp_desc:
         row['resp_desc'] = payment.resp_desc