Changeset 2887 for WAeUP_SRP/base/skins

Timestamp:

8 Dec 2007, 17:20:50 (17 years ago)

Author:

joachim

Message:

all in edit_form

Location:

WAeUP_SRP/base/skins/waeup_student

Files:

• accommodation_edit_form.pt (copied) (copied from WAeUP_SRP/base/skins/waeup_accommodation/accommodation_edit_form.pt) (2 diffs)
• accommodation_view.pt (modified) (2 diffs)
• reserve_accommodation.py (copied) (copied from WAeUP_SRP/base/skins/waeup_accommodation/reserve_accommodation.py) (1 diff)

WAeUP_SRP/base/skins/waeup_student/accommodation_edit_form.pt

@@ -1 +1 @@
 <tal:block define="rendered_main options/rendered;
                    portal_status_message options/psm;
-                   data_storage options/ds;
+                   data_storage options/ds|nothing;
                    mode options/mode;
                    edition python:1;"
@@ -28 +28 @@
         <div tal:replace="structure rendered_main" />
           <p>Instructions :</p>
-          <ul tal:condition="python: mode == 'create'">
+        <ul tal:condition="python: mode == 'create'">
             <li>Buy a Hostel Application Scratch Card.</li> 
             <li>Enter the PIN above and press 'Book'.</li>
             <li>Print your Hostel Allocation Slip.</li>
           </ul>
-          <ul tal:condition="python: mode == 'edit'" 
-              tal:define="info python: context.getAccommodationInfo()">
+        <tal:block condition="python: mode == 'edit'" 
+                   tal:define="info python: context.getAccommodationInfo();
+                   maintenance_online info/maintenance_online|nothing"
+                   >
+          <ul tal:condition="not: maintenance_online" tal:omit-tag="">
             <li>Buy a Hostel Maintainance Scratch Card 
-            (Code: <span tal:replace="python: info['acco_doc'].acco_maint_code" />) for 
-            <span tal:replace="python: info['acco_doc'].acco_maint_fee" /> Nairas</li> 
+              (Code: <span tal:replace="python: info['acco_doc'].acco_maint_code" />) for 
+              <span tal:replace="python: info['acco_doc'].acco_maint_fee" /> Nairas</li> 
             <li>Enter the PIN above and press 'Save'.</li>
             <li>Print your Hostel Maintenance Receipt.</li>
           </ul>
+          <tal:block condition="maintenance_online">
+            <table tal:condition="not: info/maintenance_paid">
+              <tr >
+                <form action="pay_interswitch_acco" method="post" 
+                      enctype="multipart/form-data" class="workflow"
+                      >
+                  <input type="hidden" 
+                         name="paytype"
+                         value="HOM"
+                         />
+                  <td colspan="2">  
+                    <input type="submit" 
+                           class="standalone" 
+                           name="cpsdocument_create_button"
+                           value="Pay Maintenance Fee Online"
+                           />
+                  </td>
+                </form>
+              </tr>
+            </table>
+          </tal:block>
+        </tal:block>
       </metal:block>
       <metal:block fill-slot="sub">

WAeUP_SRP/base/skins/waeup_student/accommodation_view.pt

@@ -26 +26 @@
               layout_id='student_accommodation_fe')" 
               />
-         <table>
-         <tr>
+      <table>
+        <tr>
           <td width="220px">Level:</td><td tal:content="info/level" />
-        </tr>
-        <tr tal:condition="not: info/maintenance_paid">
-          <form action="pay_interswitch_acco" method="post" 
-                enctype="multipart/form-data" class="workflow"
-                >
-            <input type="hidden" 
-                   name="paytype"
-                   value="HOM"
-                   />
-            <td colspan="2">  
-              <input type="submit" 
-                     class="standalone" 
-                     name="cpsdocument_create_button"
-                     value="Pay Maintenance Fee Online"
-                     />
-            </td>
-          </form>
         </tr>
       </table>
@@ -51 +34 @@
   </metal:main>
 </metal:body>
-

WAeUP_SRP/base/skins/waeup_student/reserve_accommodation.py

@@ -47 +47 @@
     if info['maintenance_paid']:
         return context.REQUEST.RESPONSE.redirect("%s/accommodation_view" % info['acco'].absolute_url())
-    elif info['online_payment']:
-        return context.REQUEST.RESPONSE.redirect("%s/accommodation_view" % info['acco'].absolute_url())
-        # return context.REQUEST.RESPONSE.redirect("%s/pay_interswitch_acco?paytype=HOM" % info['student'].absolute_url())
+    # elif info['online_payment']:
+    #     return context.REQUEST.RESPONSE.redirect("%s/accommodation_view" % info['acco'].absolute_url())
+    #     # return context.REQUEST.RESPONSE.redirect("%s/pay_interswitch_acco?paytype=HOM" % info['student'].absolute_url())
     else:
         mode = 'edit'