diff --git a/pom.xml b/pom.xml index 3c86833f5..b89e1d4ca 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.81 + 1.3.82 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RSvcMchBean.java b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RSvcMchBean.java index 276ad74ee..1ca80e1cb 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RSvcMchBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RSvcMchBean.java @@ -96,4 +96,6 @@ public class RSvcMchBean { * abn */ private String abn; + + private String acn; } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 84eddb7b2..da93d10eb 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -6614,8 +6614,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid svcMchBean.setBsbNumber(mchInfo.getString("bsb_no")); svcMchBean.setAccountNo(mchInfo.getString("account_no")); svcMchBean.setAccountName(mchInfo.getString("account_name")); - svcMchBean.setTelNumber(mchInfo.getString("bank_phone")); + svcMchBean.setTelNumber(""); svcMchBean.setAbn(mchInfo.getString("abn")); + svcMchBean.setAcn(mchInfo.getString("acn")); return svcMchBean; } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml index 466e91c9c..2169bb1f6 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml @@ -55,12 +55,12 @@ sc.contact_person, sc.contact_phone, sc.contact_email, - IFNULL( sc.abn, sc.acn ) abn, + IFNULL(sc.abn,'') abn, + IFNULL(sc.acn,'') acn, sba.bsb_no, sba.account_name, sba.account_no, - IFNULL( sba.address, 'NONE' ) bank_address, - 'NONE' bank_phone + IFNULL( sba.address, '' ) bank_address FROM sys_accounts sa, sys_clients sc,