Index: /main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/browser.py
===================================================================
--- /main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/browser.py	(revision 14256)
+++ /main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/browser.py	(revision 14257)
@@ -166,6 +166,4 @@
             xmldict['institution_acct'] = SPECIAL_PAYMENT_PARAMS[self.context.p_category][3]
             xmldict['institution_bank_id'] = SPECIAL_PAYMENT_PARAMS[self.context.p_category][4]
-            if self.context.amount_auth <= 2030.0:
-                gateway_amt = round(0.015 * self.context.amount_auth, 2)
         elif 'maintenance' in self.context.p_category:
             self.pay_item_id = '102'
@@ -178,9 +176,11 @@
             xmldict['institution_acct'] = "0106259811"
             xmldict['institution_bank_id'] = '10'
-            if self.context.amount_auth <= 5077.0:
-                gateway_amt = round(0.015 * self.context.amount_auth, 2)
         else:
             xmldict['institution_acct'] = "0000000000000"
             xmldict['institution_bank_id'] = '0'
+
+        if self.pay_item_id in ('122', '123', '132', '137', '141',
+                                '142', '143', '144', '146', '147',):
+                gateway_amt = round(0.015 * self.context.amount_auth, 2)
 
         xmldict['dalash_amt'] = 100 * dalash_amt
@@ -278,6 +278,9 @@
                 xmldict['institution_acct'] = SPECIAL_PAYMENT_PARAMS[self.context.p_category][3]
                 xmldict['institution_bank_id'] = SPECIAL_PAYMENT_PARAMS[self.context.p_category][4]
-                if self.context.amount_auth <= 2030.0:
-                    gateway_amt = round(0.015 * self.context.amount_auth, 2)
+
+        if self.pay_item_id in ('122', '123', '132', '137', '141',
+                                '142', '143', '144', '146', '147',):
+                gateway_amt = round(0.015 * self.context.amount_auth, 2)
+
         xmldict['dalash_amt'] = 100 * dalash_amt
         xmldict['detail_ref'] = self.context.p_id
