Merge remote-tracking branch 'origin/develop' into develop

src/main/ui/static/payment/partner/templates/partner_bankaccounts.html

@@ -320,7 +320,7 @@
                     <td style="text-align: center">
                         <a role="button" ng-click="editRate(rate)" style="padding-right: 10px;"
                            ng-if="'011'|withRole"><i class="fa fa-edit"></i></a>
-                        <span ng-if="rate.active=='1' && rate.current=='1' && (bankCtrl.rate_name=='rpaypmt_card' ||bankCtrl.rate_name=='rpaypmt_dd')
+                        <span ng-if="rate.active=='1' && (bankCtrl.rate_name=='rpaypmt_card' ||bankCtrl.rate_name=='rpaypmt_dd')
                         && partner.upay_approve_result">
                             <span style="color: orange">(Promotional Offer)</span>
                             <a class="fa fa-cloud-download" target="_blank"