Changeset 17437
- Timestamp:
- 19 Jun 2023, 06:51:53 (18 months ago)
- Location:
- main/waeup.aaue/trunk/src/waeup/aaue
- Files:
-
- 3 edited
-
interswitch/browser.py (modified) (3 diffs)
-
interswitch/tests.py (modified) (5 diffs)
-
utils/utils.py (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py
r17434 r17437 56 56 57 57 BANK_ACCOUNTS = { 58 'edohis': ('1222577132', '117', 'Edo State Health Insurance'), 59 'union': ('1019763348', '7', 'Student Union'), 60 'sport': ('1021941220', '7', 'Sport Development'), 61 'access': ('1012688013', '123', 'Access Card'), 62 'notebook': ('4011210501', '51', 'Branded Notebook'), 63 'library': ('2000122995', '8', 'Library Development'), 64 'fac1': ('1022438743', '7', 'Faculty Fee'), 65 'fac2': ('2000249757', '8', 'Faculty Fee'), 66 'fac3': ('1012678566', '123', 'Faculty Fee'), 67 'acceptance': ('2000249757', '8', 'Acceptance Fee'), 68 'matricgown': ('2000249757', '8', 'Matriculation Gown Fee'), 69 'lapel': ('2000249757', '8', 'Lapel Fee'), 58 'edohis': ('1222577132', '117'), 59 'union': ('1019763348', '7'), 60 'sport': ('1021941220', '7'), 61 'access': ('1012688013', '123'), 62 'notebook': ('4011210501', '51'), 63 'library': ('2000122995', '8'), 64 'fac1': ('1022438743', '7'), 65 'fac2': ('2000249757', '8'), 66 'fac3': ('1012678566', '123'), 67 'acceptance': ('2000249757', '8'), 68 'matricgown': ('2000249757', '8'), 69 'lapel': ('2000249757', '8'), 70 } 71 72 FEE_NAMES = { 73 'edohis': 'Edo State Health Insurance Scheme', 74 'union': 'Student Union Dues', 75 'sport': 'Sport Development Fee', 76 'access': 'Access Card Fee', 77 'notebook': 'Branded Notebook', 78 'library': 'Library Development Fee', 79 'tuition': 'Tuition', 80 'acceptance': 'Acceptance Fee', 81 'matricgown': 'Matriculation Gown Fee', 82 'lapel': 'File-Lapel Fee', 83 'lmsplus': 'LMS Plus Fee', 84 'nuga': 'NUGA Fee', 70 85 } 71 86 … … 263 278 acct_num = bank[0] 264 279 bank_id = bank[1] 265 item_name = "%s (%s)" % (bank[2], item[0])280 item_name = FEE_NAMES[item[0]] 266 281 xmltext += """ 267 282 <item_detail item_id="%s" item_name="%s" item_amt="%d" bank_id="%s" acct_num="%s" />""" % (item_id, item_name, item_amt, bank_id, acct_num) … … 300 315 acct_num = bank[0] 301 316 bank_id = bank[1] 302 item_name = "%s (%s)" % (bank[2], item[0])317 item_name = FEE_NAMES[item[0]] 303 318 xmltext += """ 304 319 <item_detail item_id="%s" item_name="%s" item_amt="%d" bank_id="%s" acct_num="%s" />""" % (item_id, item_name, item_amt, bank_id, acct_num) -
main/waeup.aaue/trunk/src/waeup/aaue/interswitch/tests.py
r17434 r17437 268 268 in self.browser.contents) 269 269 self.assertTrue( 270 'item_name=" Faculty Fee (tuition)" item_amt="18400000" bank_id="7" '270 'item_name="Tuition" item_amt="18400000" bank_id="7" ' 271 271 'acct_num="1022438743"' in self.browser.contents) 272 272 … … 291 291 in self.browser.contents) 292 292 self.assertTrue( 293 'item_name=" School Fee(2nd instalment)" item_amt="9200000" bank_id="7" acct_num="1022438743"' in self.browser.contents)293 'item_name="Tuition (2nd instalment)" item_amt="9200000" bank_id="7" acct_num="1022438743"' in self.browser.contents) 294 294 295 295 self.browser.open(self.payments_path + '/addop') … … 305 305 in self.browser.contents) 306 306 self.assertTrue( 307 'item_name=" Faculty Fee (lmsplus)" item_amt="2000000" bank_id="7" acct_num="1022438743"' in self.browser.contents)308 self.assertTrue( 309 'item_name=" Faculty Fee (tuition)" item_amt="9200000" bank_id="7" acct_num="1022438743"' in self.browser.contents)307 'item_name="LMS Plus Fee" item_amt="2000000" bank_id="7" acct_num="1022438743"' in self.browser.contents) 308 self.assertTrue( 309 'item_name="Tuition" item_amt="9200000" bank_id="7" acct_num="1022438743"' in self.browser.contents) 310 310 311 311 self.browser.open(self.payments_path + '/addop') … … 321 321 in self.browser.contents) 322 322 self.assertTrue( 323 'item_name=" School Fee(2nd instalment)" item_amt="9200000" bank_id="7" acct_num="1022438743"' in self.browser.contents)323 'item_name="Tuition (2nd instalment)" item_amt="9200000" bank_id="7" acct_num="1022438743"' in self.browser.contents) 324 324 325 325 def disabled_test_interswitch_form_pt_acceptance_fees(self): … … 372 372 self.assertTrue(self.student['payments'].values()[0].net_amt == 16800) 373 373 self.assertTrue( 374 'item_name="Acceptance Fee (acceptance)" item_amt="1400000" bank_id="8" '374 'item_name="Acceptance Fee" item_amt="1400000" bank_id="8" ' 375 375 'acct_num="2000249757"' in self.browser.contents) 376 376 -
main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py
r17431 r17437 38 38 39 39 PAYMENT_CATEGORIES = { 40 'schoolfee': ' School Fee',41 'schoolfee_1': ' School FeePlus (1st instalment)',42 'schoolfee_2': ' School Fee(2nd instalment)',43 'schoolfee_incl': ' School FeePlus',40 'schoolfee': 'Tuition', 41 'schoolfee_1': 'Tuition Plus (1st instalment)', 42 'schoolfee_2': 'Tuition (2nd instalment)', 43 'schoolfee_incl': 'Tuition Plus', 44 44 'clearance': 'Acceptance Fee', 45 45 'clearance_incl': 'Acceptance Fee Plus', … … 87 87 88 88 SELECTABLE_PAYMENT_CATEGORIES = { 89 'schoolfee': ' School Feewithout additional fees',90 'schoolfee_1': ' School Fee (1st instalment) incl. additional fees',91 'schoolfee_2': ' School Fee(2nd instalment)',92 'schoolfee_incl': ' School Feeincl. additional fees',89 'schoolfee': 'Tuition without additional fees', 90 'schoolfee_1': 'Tuition incl. additional fees (1st instalment)', 91 'schoolfee_2': 'Tuition (2nd instalment)', 92 'schoolfee_incl': 'Tuition incl. additional fees', 93 93 'clearance': 'Acceptance Fee without additional fees', 94 94 'clearance_incl': 'Acceptance Fee incl. additional fees', … … 140 140 REDUCED_PAYMENT_CATS = { 141 141 'clearance': 'Acceptance Fee', 142 'schoolfee': ' School Fee',142 'schoolfee': 'Tuition', 143 143 ##'late_registration': 'Late Course Registration Fee', 144 144 ##'sports': 'Sports Fee', … … 150 150 IJMBE_PAYMENT_CATS = { 151 151 'clearance': 'Acceptance Fee', 152 'schoolfee': ' School Fee',153 'schoolfee_1': ' School Fee(1st instalment)',154 'schoolfee_2': ' School Fee(2nd instalment)',152 'schoolfee': 'Tuition', 153 'schoolfee_1': 'Tuition (1st instalment)', 154 'schoolfee_2': 'Tuition (2nd instalment)', 155 155 ##'sports': 'Sports Fee', 156 156 ##'library': 'UG Library Fee', … … 162 162 PT_AND_DSH_PAYMENT_CATS = { 163 163 'clearance_incl': 'Acceptance Fee Plus', 164 'schoolfee_incl': ' School FeePlus',164 'schoolfee_incl': 'Tuition Plus', 165 165 ##'ent_text_book_1': 'Text Book Fee ENT201', 166 166 ##'ent_text_book_2': 'Text Book Fee ENT211', … … 199 199 200 200 REPORTABLE_PAYMENT_CATEGORIES = { 201 'schoolfee': ' School Fee',202 'schoolfee_incl': ' School FeePlus',203 'schoolfee_1': ' School Fee1 Plus',204 'schoolfee_2': ' School Fee2',201 'schoolfee': 'Tuition', 202 'schoolfee_incl': 'Tuition Plus', 203 'schoolfee_1': 'Tuition 1 Plus', 204 'schoolfee_2': 'Tuition 2', 205 205 'clearance': 'Acceptance Fee', 206 206 'clearance_incl': 'Acceptance Fee Plus', … … 211 211 212 212 XXXBALANCE_PAYMENT_CATEGORIES = { 213 'schoolfee': ' School Fee',213 'schoolfee': 'Tuition', 214 214 'clearance': 'Acceptance Fee', 215 215 'hostel_maintenance': 'Hostel Maintenance Fee', … … 238 238 239 239 PREVIOUS_PAYMENT_CATEGORIES = { 240 'schoolfee': ' School Fee',240 'schoolfee': 'Tuition', 241 241 'clearance': 'Acceptance Fee', 242 242 'late_registration': 'Late Course Registration Fee', … … 314 314 315 315 DISABLE_PAYMENT_GROUP_DICT = { 316 'sf_all': ' School Fee- All Students',317 'sf_pg': ' School Fee- Postgraduate Students',318 'sf_ug_pt': ' School Fee- Undergraduate Part-Time Students',319 'sf_found': ' School Fee- Foundation Students',316 'sf_all': 'Tuition - All Students', 317 'sf_pg': 'Tuition - Postgraduate Students', 318 'sf_ug_pt': 'Tuition - Undergraduate Part-Time Students', 319 'sf_found': 'Tuition - Foundation Students', 320 320 'maint_all': 'Accommodation Fee - All Students', 321 321 'cl_regular': 'Acceptance Fee - Regular Students',
Note: See TracChangeset for help on using the changeset viewer.
