Changeset 3229

Timestamp:

25 Feb 2008, 22:53:37 (17 years ago)

Author:

Henrik Bettermann

Message:

adjust getPaymentsFolderInfo.py to Okene version

Location:

WAeUP_SRP/fceokene

Files:

• profiles/default/vocabularies/cos_sandwich.xml (modified) (1 diff)
• waeup_custom/getPaymentsFolderInfo.py (modified) (3 diffs)

WAeUP_SRP/fceokene/profiles/default/vocabularies/cos_sandwich.xml

@@ -7 +7 @@
     <property name="acl_write_roles">Manager</property>
 
-    <item key="" msgid="">--</item>
-    <item key="DAE" msgid="">Diploma in Agricultural Economics</item>
-    <item key="DAE" msgid="">Diploma in Agricultural Economics</item>
-    <item key="DAE" msgid="">Diploma in Agricultural Economics</item>
-    <item key="DAE" msgid="">Diploma in Agricultural Economics</item>
-    <item key="DAE" msgid="">Diploma in Agricultural Economics</item>
-    <item key="DAE" msgid="">Diploma in Agricultural Economics</item>
-    <item key="DAE" msgid="">Diploma in Agricultural Economics</item>
+
+    <item key="BADTSW" msgid="">B.A (Ed) Adult Education (Sandwich)</item>
+    <item key="BISCSW" msgid="">B.Sc (Ed) Integrated Science (Sandwich)</item>
+    <item key="BHEDSW" msgid="">B.Sc (Ed) Health Education (Sandwich)</item>
+    <item key="BSSTSW" msgid="">B.Sc (Ed) Social Studies (Sandwich)</item>
+    <item key="BBEDSW" msgid="">B.Sc (Ed) Business Education (Sandwich)</item>
+    <item key="BHECSW" msgid="">B.Sc (Ed) Home Economics (Sandwich)</item>
+    <item key="BEMGTSW" msgid="">B.Sc (Ed) Educationaml Management (Sandwich)</item>
+    <item key="BENLSW" msgid="">B.A (Ed) English and Literature (Sandwich)</item>
+    <item key="BCSCSW" msgid="">B.Sc (Ed) Computer Science (Sandwich)</item>
+    <item key="BCHESW" msgid="">B.Sc (Ed) Chemistry (Sandwich)</item>
+    <item key="BAGRSW" msgid="">B.Sc (Ed) Agriculture (Sandwich)</item>
+    <item key="BBIOSW" msgid="">B.Sc (Ed) Biology (Sandwich)</item>
+    <item key="BITESW" msgid="">B.Sc (Ed) Industrial Technical Education (Sandwich)</item>
+    <item key="BGEOSW" msgid="">B.Sc (Ed) Geography (Sandwich)</item>
+    <item key="BPOLSW" msgid="">B.Sc (Ed) Political Science (Sandwich)</item>
+    <item key="BHISSW" msgid="">B.A (Ed) History (Sandwich)</item>
+    <item key="BENLSW" msgid="">B.A (Ed) English and Literature (Sandwich)</item>
+    <item key="BECOSW" msgid="">B.Sc (Ed) Economics (Sandwich)</item>
+
 
 </object>

WAeUP_SRP/fceokene/waeup_custom/getPaymentsFolderInfo.py

@@ -58 +58 @@
 fulltime = student_record.mode and student_record.mode.endswith('_ft')
 
-#if review_state == 'cleared_and_validated' or (parttime and review_state == 'returning'):
-#    online_payment = True
-#elif fulltime and review_state == 'returning':
-#    sc_payment = True
 
 session = student_record.session
@@ -72 +68 @@
 if review_state == 'cleared_and_validated':
     info['payment_method'] = "online_payment"
+
+
 elif review_state == 'returning' and info['next_session'] != session:
     info['payment_method'] = "online_payment"
@@ -95 +93 @@
     row['is_requeryable'] = "%s_%s" % (payment.type,payment.session_id) not in paid_fees or str(member) in ('admin',)
     row['is_approvable'] = is_so and row['is_requeryable']
-    row['resp_desc'] = payment.resp_desc or (row['is_requeryable'] and 'Payment Process Interrupted')
+    row['resp_desc'] = payment.resp_desc or 'Payment Process Interrupted'
     row['trans_ref'] = payment.order_id
     if row['is_requeryable']: