diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml index f6e605d94..72c1f9331 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml @@ -168,7 +168,12 @@ c.client_moniker=#{client_moniker} and c.sub_merchant_id=#{sub_merchant_id} - + + AND c.create_time >= #{create_start_time} + + + AND c.create_time <= #{create_end_time} + and ((c.approve_result=4 and c.open_status is null) or (c.approve_result=3 and c.open_status is null) or diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html index 293d10ec3..1670dc8bc 100644 --- a/src/main/ui/static/menu/templates/main_menu.html +++ b/src/main/ui/static/menu/templates/main_menu.html @@ -103,7 +103,7 @@ -
+
diff --git a/src/main/ui/static/payment/partner/templates/partner_compliance.html b/src/main/ui/static/payment/partner/templates/partner_compliance.html index 534daecf6..a02227ee1 100644 --- a/src/main/ui/static/payment/partner/templates/partner_compliance.html +++ b/src/main/ui/static/payment/partner/templates/partner_compliance.html @@ -151,6 +151,30 @@
+
+ +
+
+ +
+ ~ +
+ +
+
+
+