Merge branch 'develop'

pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.1.15</version>
+    <version>1.1.16</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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));
     }
 }

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<JSONObject> adminAccounts = clientAccountMapper.listAdminAccounts(clientId);
             adminAccounts.forEach(o -> {
                 sendClientPostponeNotify(o, nextYearExipryDate);

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

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;

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;