Index: /main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py	(revision 17528)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py	(revision 17529)
@@ -336,5 +336,5 @@
                 else:
                     sorted_items = SCHOOLFEES[22][student.certcode].items()
-                # Move tuition
+                # Move tuition. We expect that tuition is the fourth element
                 sorted_items.insert(0, sorted_items.pop(3))
                 for item in sorted_items:
@@ -342,9 +342,25 @@
                         if  item[1].startswith('100_') and student.state == CLEARED:
                             # first year payment only
-                            item_amt = 100 * int(item[1].split('_')[1])
+                            item_amt = int(item[1].split('_')[1])
                         else:
-                            item_amt = 100 * int(item[1])
+                            item_amt = int(item[1])
                         if self.context.p_category == 'schoolfee_1' and item[0] == 'tuition':
                             item_amt /= 2
+                        # Add non-indigenous fee and session specific penalty fees
+                        try:
+                            academic_session = grok.getSite()['configuration'][str(self.context.p_session)]
+                        except KeyError:
+                            self.flash(
+                                _('Session configuration object is missing.'), type="danger")
+                            self.redirect(self.url(self.context, '@@index'))
+                            return
+                        if student.is_postgrad and item[0] == 'tuition':
+                            item_amt += academic_session.penalty_pg
+                            if student.lga and not student.lga.startswith('edo') \
+                                and student.entry_session < 2022:
+                                item_amt += 20000.0
+                        else:
+                            item_amt += academic_session.penalty_ug
+                        item_amt *= 100
                         acct_num = ''
                         bank_id = ''
