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

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.40</version>
+    <version>2.3.41</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

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

@@ -615,6 +615,15 @@
         <if test="trade_type=='Share Link'">
             and o.gateway=14
         </if>
+        <if test="trade_type=='Native JSAPI'">
+            and o.gateway=15
+        </if>
+        <if test="trade_type=='Card Payment'">
+            and o.gateway in (16,17)
+         </if>
+        <if test="trade_type=='Direct Debit'">
+            and o.gateway=18
+        </if>
         <if test="org_id!=null and org_ids==null">and l.org_id=#{org_id}</if>
         <if test="org_ids!=null">and l.org_id in
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>