diff --git a/pom.xml b/pom.xml index ead5ad7d3..cea100984 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.3.58 + 2.3.59 UTF-8 2.4.0 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 c939da170..2588d9008 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 @@ -336,7 +336,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid //卡支付合同文件 private static final String LETTER_OF_OFFER_FILE = "letter_of_offer_file"; private static final String PROMOTIONAL_OFFER_FILE = "promotional_offer_file"; - private static final String TERMS_AND_CONDITIONS_FILE = "terms_and_conditions_file"; +// private static final String TERMS_AND_CONDITIONS_FILE = "terms_and_conditions_file"; private static final List tags = new ArrayList<>(); @@ -2948,7 +2948,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid throw new InvalidShortIdException(); } exportLetterOfferPDF(clientMoniker, manager); - exportTermsConditionsPDF(clientMoniker, manager); +// exportTermsConditionsPDF(clientMoniker, manager); if (!renewal) { JSONObject cardFlow = sysClientUpayProfileMapper.findInfo(client.getInteger("client_id")); @@ -3182,8 +3182,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid throw new InvalidShortIdException(); } List existLeffterFiles = clientFilesMapper.findFileByClientAndType(client.getIntValue("client_id"), LETTER_OF_OFFER_FILE); - List existConditionsFiles = clientFilesMapper.findFileByClientAndType(client.getIntValue("client_id"), TERMS_AND_CONDITIONS_FILE); - if (CollectionUtils.isEmpty(existLeffterFiles) && CollectionUtils.isEmpty(existConditionsFiles)) { +// List existConditionsFiles = clientFilesMapper.findFileByClientAndType(client.getIntValue("client_id"), TERMS_AND_CONDITIONS_FILE); + if (CollectionUtils.isEmpty(existLeffterFiles)) { throw new BadRequestException("The Agree File is not Complete!"); } JSONObject cardFlowInfo = sysClientUpayProfileMapper.findInfo(client.getInteger("client_id")); @@ -6971,7 +6971,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid private void exportLetterOfferPDF(String clientMoniker, JSONObject manage) { JSONObject info = convertClientLetterOfferInfo(clientMoniker); String pdfPath = this.getClass().getClassLoader().getResource("").getPath() + "/templates/pdf/letter_of_offer.pdf"; - String fileName = clientMoniker + "_Letter_of_Offer.pdf"; + String fileName = clientMoniker + "Upay Letter Of Variation (business day, amendment).pdf"; publishExcelCardPDFFile(clientMoniker, manage, fileName, pdfPath, info, LETTER_OF_OFFER_FILE); } @@ -7077,7 +7077,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid return info; } - private void exportTermsConditionsPDF(String clientMoniker, JSONObject manage) { + /*private void exportTermsConditionsPDF(String clientMoniker, JSONObject manage) { JSONObject client = getClientInfoByMoniker(clientMoniker); if (client == null) { throw new InvalidShortIdException(); @@ -7088,7 +7088,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid String pdfPath = this.getClass().getClassLoader().getResource("").getPath() + "/templates/pdf/terms_and_conditions.pdf"; String fileName = clientMoniker + "_Terms_And_Conditions.pdf"; publishExcelCardPDFFile(clientMoniker, manage, fileName, pdfPath, new JSONObject(), TERMS_AND_CONDITIONS_FILE); - } + }*/ private void publishExcelCardPDFFile(String clientMoniker, JSONObject manager, String fileName, String pdfPath, JSONObject info, String fileLabel) { try { diff --git a/src/main/resources/templates/letter_of_offer.pdf b/src/main/resources/templates/letter_of_offer.pdf index b9fa8f7e0..926fd473b 100644 Binary files a/src/main/resources/templates/letter_of_offer.pdf and b/src/main/resources/templates/letter_of_offer.pdf differ diff --git a/src/main/resources/templates/pdf/letter_of_offer.pdf b/src/main/resources/templates/pdf/letter_of_offer.pdf index a8f54445d..926fd473b 100644 Binary files a/src/main/resources/templates/pdf/letter_of_offer.pdf and b/src/main/resources/templates/pdf/letter_of_offer.pdf differ diff --git a/src/main/ui/rdjRRcCkVr.txt b/src/main/ui/rdjRRcCkVr.txt new file mode 100644 index 000000000..d6b1ed6af --- /dev/null +++ b/src/main/ui/rdjRRcCkVr.txt @@ -0,0 +1 @@ +89e1f60e5d01470f00ae272d8af6b446 \ No newline at end of file diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html index c97411fcd..082586496 100644 --- a/src/main/ui/static/payment/partner/templates/partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_detail.html @@ -284,9 +284,9 @@ 下载Letter Of Offer合同 - 下载Terms And Conditions合同 + + + @@ -349,10 +349,10 @@ class="btn-group btn btn-warning" type="button" ng-href="{{letterOfOfferFileManager.letter_of_offer_file}}" target="_blank"> 下载Letter Of Offer合同 - 下载Terms And Conditions合同 + class="fa fa-download">下载Terms And Conditions合同-->