diff --git a/pom.xml b/pom.xml
index a08d4b3db..d97933c75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
4.0.0
manage
- 1.2.83
+ 1.2.84
UTF-8
1.6.1
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.java
index 78894f1bc..9d16b9fcc 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.java
@@ -40,6 +40,8 @@ public interface ClientFilesMapper {
List findFileByClientAndType(@Param("client_id") int client_id, @Param("file_name") String file_name);
+ JSONObject getSourceAgreeFilesByClientId(@Param("client_id") int clientId);
+
void deleteByClientAndFileId(@Param("file_id") String file_id);
void deleteAggreeByClientId(@Param("client_id") int file_id);
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
index 17bbd4737..5df0a155e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
@@ -242,6 +242,8 @@ public interface ClientManager {
JSONObject getAllAuthFiles(JSONObject manager, String clientMoniker);
+ JSONObject getSourceAgreeFiles(JSONObject manage, String clientMoniker);
+
void deleteAuthFiles(String fileId);
void deleteAuthFilesByAdmin(String fileId);
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 e58eae0a9..093c6de17 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
@@ -3353,6 +3353,17 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
return fileJson;
}
+ @Override
+ public JSONObject getSourceAgreeFiles(JSONObject manage, String clientMoniker) {
+ JSONObject client = getClientInfoByMoniker(clientMoniker);
+ if (client == null) {
+ throw new InvalidShortIdException();
+ }
+ JSONObject sourceFile = clientFilesMapper.getSourceAgreeFilesByClientId(client.getIntValue("client_id"));
+ sourceFile.put(sourceFile.getString("file_name"), sourceFile.getString("file_value"));
+ return sourceFile;
+ }
+
@Override
public JSONObject getAllAuthFiles(JSONObject manager, String clientMoniker) {
JSONObject client = getClientInfoByMoniker(clientMoniker);
@@ -3382,7 +3393,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
return fileJson;
}
-
@Override
public JSONObject getClientViewAuthFiles(JSONObject manager, String clientMoniker) {
JSONObject client = getClientInfoByMoniker(clientMoniker);
@@ -3414,8 +3424,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
}
- ;
-
@Override
public void deleteAuthFiles(String fileId) {
JSONObject file = clientFilesMapper.findFileById(fileId);
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
index d88feea7e..fe64de521 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
@@ -538,7 +538,7 @@ public class PartnerManageController {
@ManagerMapping(value = "/{clientMoniker}/file/source_agree_file", method = RequestMethod.GET, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.BD_USER, ManagerRole.SERVANT})
public JSONObject getSourceAgreeAuthFiles(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
- return clientManager.getAuthFiles(manager, clientMoniker);
+ return clientManager.getSourceAgreeFiles(manager, clientMoniker);
}
@ManagerMapping(value = "/auth_file/{fileId}/delete", method = RequestMethod.PUT, role = {ManagerRole.OPERATOR, ManagerRole.BD_USER})
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.xml
index c8967b6bf..6977ee40a 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.xml
@@ -13,6 +13,12 @@
update sys_files set is_valid = 0
where file_id = #{file_id}
+