Changeset 2900

Timestamp:

9 Dec 2007, 21:42:44 (17 years ago)

Author:

Henrik Bettermann

Message:

last changes before upgrade

Location:

WAeUP_SRP

Files:

• base/Payment.py (modified) (3 diffs)
• base/skins/waeup_epayment/interswitch_acco_cb.py (modified) (1 diff)
• fceokene/profiles/default/layouts/payment.xml (modified) (1 diff)
• fceokene/profiles/default/workflows/waeup_student_wf/definition.xml (modified) (2 diffs)
• fceokene/waeup_custom/getPaymentsFolderInfo.py (modified) (2 diffs)

WAeUP_SRP/base/Payment.py

@@ -20 +20 @@
 class PaymentsFolder(CPSDocument): ###(
     """
-    WAeUP PaymentsFolder containing Paymentsmmodation halls
+    WAeUP PaymentsFolder containing Payment objects
     """
     meta_type = 'PaymentsFolder'
@@ -51 +51 @@
 class Payment(CPSDocument): ###(
     """
-    WAeUP Payment containing Departments
+    WAeUP Payment containing Nothing
     """
     meta_type = 'Payment'
@@ -108 +108 @@
         d['resp_card_num'] = doc.resp_card_num
         d['date'] = getattr(doc,'date',None)
-        
+
         review_state = wftool.getInfoFor(self.aq_parent,'review_state',None)
         if review_state == "closed":

WAeUP_SRP/base/skins/waeup_epayment/interswitch_acco_cb.py

@@ -56 +56 @@
 
 ## for testing purposes
-pd['resp_desc'] = 'Simulated Callback'
-pd['resp_pay_reference'] = 'XXXX'
-pd['resp_code'] = '00'
-pd['resp_card_num'] = '0000'
-pd['resp_approved_amount'] = '10000'
+#pd['resp_desc'] = 'Simulated Callback'
+#pd['resp_pay_reference'] = 'XXXX'
+#pd['resp_code'] = '00'
+#pd['resp_card_num'] = '0000'
+#pd['resp_approved_amount'] = '10000'
 
 if pd['resp_code'] == '00' and len(pd['resp_approved_amount']) > 4:

WAeUP_SRP/fceokene/profiles/default/layouts/payment.xml

@@ -46 +46 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
+  <property name="view_format">%d/%m/%Y %H:%M</property>
+  <property name="time_setting">True</property>  
  </widget>
  <widget name="resp_approved_amount" meta_type="String Widget">

WAeUP_SRP/fceokene/profiles/default/workflows/waeup_student_wf/definition.xml

@@ -85 +85 @@
   <exit-transition transition_id="validate_courses"/>
   <exit-transition transition_id="deactivate"/>
+  <exit-transition transition_id="create_content"/>
   <permission-map name="Delete objects" acquired="False">
    <permission-role>Manager</permission-role>
@@ -100 +101 @@
   <exit-transition transition_id="reject_courses"/>
   <exit-transition transition_id="deactivate"/>
+  <exit-transition transition_id="create_content"/>
   <permission-map name="Delete objects" acquired="False">
    <permission-role>Manager</permission-role>

WAeUP_SRP/fceokene/waeup_custom/getPaymentsFolderInfo.py

@@ -43 +43 @@
 #student = getattr(students,student_id)
 student_record = context.students_catalog.getRecordByKey(student_id)
-#context['updatePayments']()
+context['updatePayments']()
 payments = []
 
@@ -96 +96 @@
     if so_doc.type_description.startswith('School Fee'):
         if (review_state == 'opened' and info['review_state'] in ('cleared_and_validated','returning') and \
-                                  hasattr(so_doc, 'order_id') and not so_doc.resp_code) or str(member) in ('admin','gbenga','isouaba'):
+                                  hasattr(so_doc, 'order_id') and not so_doc.resp_code) or str(member) in ('admin','delejason','isouaba'):
             row['is_requeryable'] = True
             row['callback_url'] = "%s/interswitch_cb" % (payments_path)