diff --git a/pom.xml b/pom.xml
index 52dd127ca..f169dc9b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
4.0.0
manage
- 1.1.15
+ 1.1.16
UTF-8
diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java
index c5f08f985..485c09450 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java
@@ -108,6 +108,5 @@ public class ManualServiceimpl implements ManualService {
}
});
- clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, client_moniker, "tax_in_surcharge", false));
}
}
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 88d98677a..86bb56b45 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
@@ -4997,7 +4997,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
}
}
- clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, client.getString("client_moniker"), "tax_in_surcharge", false));
adminAccounts.forEach(o -> {
sendClientPostponeNotify(o, expireDate);
});
@@ -5017,7 +5016,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
public boolean postponeClientRate(int clientId, String clientMoniker, String nextYearExipryDate) {
try {
clientRateMapper.postponeMerchantRateByClientId(clientId);
- clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, clientMoniker, "tax_in_surcharge", false));
List adminAccounts = clientAccountMapper.listAdminAccounts(clientId);
adminAccounts.forEach(o -> {
sendClientPostponeNotify(o, nextYearExipryDate);
diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
index b4082fb18..3b9102fbf 100644
--- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
@@ -104,7 +104,6 @@ public class ClientContractServiceImpl implements ClientContractService {
contract.put("confirm_time", now);
contract.put("signatory", account.getString("display_name"));
clientsContractMapper.update(contract);
- clientManager.setClientTaxInSurcharge(clientAccountMapper.findById(account_id),client.getString("client_moniker"), false);
}
@Override
diff --git a/src/main/ui/static/templates/alipay/v4/payment.js b/src/main/ui/static/templates/alipay/v4/payment.js
index 1da983012..8585cc64c 100644
--- a/src/main/ui/static/templates/alipay/v4/payment.js
+++ b/src/main/ui/static/templates/alipay/v4/payment.js
@@ -261,7 +261,7 @@ $(function () {
});
$('#key_P').click(function () {
- dataCache.remark = $('.remark-textarea').val();
+ dataCache.remark = $('.remark-textarea-new').val();
if (window.requireRemark) {
if (!dataCache.remark) {
var config = {
@@ -275,7 +275,7 @@ $(function () {
});
$('#key_P').bind('touchstart', function () {
- dataCache.remark = $('.remark-textarea').val();
+ dataCache.remark = $('.remark-textarea-new').val();
if (window.requireRemark) {
if (!dataCache.remark) {
return;
diff --git a/src/main/ui/static/templates/payment/v4/payment.js b/src/main/ui/static/templates/payment/v4/payment.js
index 1d8468bf9..5fbe1c3f8 100644
--- a/src/main/ui/static/templates/payment/v4/payment.js
+++ b/src/main/ui/static/templates/payment/v4/payment.js
@@ -253,7 +253,7 @@ $(function () {
});
$('#key_P').click(function () {
- dataCache.remark = $('.remark-textarea').val();
+ dataCache.remark = $('.remark-textarea-new').val();
if (window.requireRemark) {
if (!dataCache.remark) {
var config = {
@@ -267,7 +267,7 @@ $(function () {
});
$('#key_P').bind('touchstart', function () {
- dataCache.remark = $('.remark-textarea').val();
+ dataCache.remark = $('.remark-textarea-new').val();
if (window.requireRemark) {
if (!dataCache.remark) {
return;