|
|
|
|
@ -1232,7 +1232,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
|
@Override
|
|
|
|
|
public void switchChannelPermission(JSONObject manager, String clientMoniker, String channel, boolean allow) {
|
|
|
|
|
for (PaymentChannelApi channelApi : channels) {
|
|
|
|
|
if (channelApi.channel().equalsIgnoreCase(channel)) {
|
|
|
|
|
if (channelApi.channel().equalsIgnoreCase(channel) || "CB_BankPay".equalsIgnoreCase(channel)) {
|
|
|
|
|
JSONObject client = getClientInfoByMoniker(clientMoniker);
|
|
|
|
|
if (client == null) {
|
|
|
|
|
throw new NotFoundException("Client Not Exists");
|
|
|
|
|
@ -1541,6 +1541,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
|
for (PaymentChannelApi channel : channels) {
|
|
|
|
|
rates.addAll(merchantInfoProvider.listClientRates(clientId, new Date(), channel.channel(), includingInactive));
|
|
|
|
|
}
|
|
|
|
|
rates.addAll(merchantInfoProvider.listClientRates(clientId, new Date(), "CB_BankPay", includingInactive));
|
|
|
|
|
if (!rates.isEmpty()) {
|
|
|
|
|
try {
|
|
|
|
|
for (JSONObject rate : rates) {
|
|
|
|
|
|