Merge remote-tracking branch 'origin/develop' into develop

pom.xml

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

src/main/java/au/com/royalpay/payment/manage/task/DBSaleAnalysisTask.java

@@ -24,9 +24,9 @@ public class DBSaleAnalysisTask {
     @Resource
     private BDAnalysisService bdAnalysisService;
 
-    @Scheduled(cron = "0 0 10 * * ?")
+    @Scheduled(cron = "0 0 1 * * ?")
     public void dailyReportAutoGenerateReport() {
-        synchronizedScheduler.executeProcess("manage_task:dailyReportAutoGenerateReport", 120_000, () -> {
+        synchronizedScheduler.executeProcess("manage_task:dailyDBSaleReportAutoGenerateReport", 120_000, () -> {
             Date yesterday = DateUtils.addDays(new Date(), -1);
             bdAnalysisService.generateReport(DateFormatUtils.format(yesterday, "yyyy-MM-dd"));
         });

src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml

@@ -203,7 +203,7 @@
         org.type AS org_type,
         org.name AS org_name,
         if(org.org_id=1,1,0) AS isOrg,
-        SUM( IF ( temp.transaction_type = 'Credit', temp.clearing_amount, 0 )) clearing_amount,
+        SUM( IF ( temp.transaction_type = 'Credit', temp.clearing_amount, -temp.clearing_amount )) clearing_amount,
         SUM(if(temp.transaction_type = 'Credit',temp.clearing_amount * clinetBD.proportion, -temp.clearing_amount * clinetBD.proportion)) pay_amount,
         ifnull(SUM(if(temp.refund_id IS NOT NULL, if(temp.transaction_type='Debit', temp.clearing_amount, -temp.clearing_amount) * clinetBD.proportion, 0)), 0) refund_amount,
         (SUM(if(temp.transaction_type = 'Credit', temp.clearing_amount * clinetBD.proportion, -temp.clearing_amount * clinetBD.proportion))) - (ifnull(SUM(if(temp.refund_id IS NOT NULL, if(temp.transaction_type='Debit', temp.clearing_amount, -temp.clearing_amount) * clinetBD.proportion, 0)), 0)) AS net_amount

src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml

@@ -719,7 +719,7 @@
        SELECT
           org.org_id,
           org.name org_name,
-          SUM(if(trans.transaction_type='Credit',trans.clearing_amount,0)) AS amount
+          SUM(if(trans.transaction_type='Credit',trans.clearing_amount,-trans.clearing_amount)) AS amount
         FROM pmt_transactions AS trans
         RIGHT JOIN sys_clients AS clinet
           ON trans.client_id = clinet.client_id

src/main/ui/static/templates/payment/v4/payment.css

@@ -587,6 +587,8 @@ input.value:focus {
     height: 18px;
     border: 1px solid #FFFFFF;
     border-radius: 0;
+    resize: none;
+    outline: none;
     border-bottom-color: #BCBCBC;
     -webkit-appearance: none;
 }