diff --git a/src/main/resources/apple_message_cert_product.p12 b/src/main/resources/apple_message_cert_product.p12 index 58c694512..205da3527 100644 Binary files a/src/main/resources/apple_message_cert_product.p12 and b/src/main/resources/apple_message_cert_product.p12 differ diff --git a/src/main/resources/apple_message_cert_product20180413.p12 b/src/main/resources/apple_message_cert_product20180413.p12 new file mode 100644 index 000000000..58c694512 Binary files /dev/null and b/src/main/resources/apple_message_cert_product20180413.p12 differ diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml index 0a984284a..dececd472 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml @@ -211,7 +211,7 @@ c.client_moniker client_moniker FROM pmt_transactions t INNER JOIN sys_clients c ON t.client_id = c.client_id - INNER JOIN sys_client_config cc on cc.client_id = c.client_id AND cc.enable_refund_auth = 0 + INNER JOIN sys_client_config cc on cc.client_id = c.client_id AND cc.enable_refund_auth = 1 GROUP BY c.client_id) a WHERE a.amount < 0 diff --git a/src/main/resources/jasper/partner_invoice_gst.jasper b/src/main/resources/jasper/partner_invoice_gst.jasper index 9f8703f18..a5111a4fa 100644 Binary files a/src/main/resources/jasper/partner_invoice_gst.jasper and b/src/main/resources/jasper/partner_invoice_gst.jasper differ diff --git a/src/main/ui/index.html b/src/main/ui/index.html index 3f7b55aa6..2bcc76f7a 100644 --- a/src/main/ui/index.html +++ b/src/main/ui/index.html @@ -517,6 +517,9 @@ margin-bottom: 10%;"/> .ng-cloak, [ng-cloak] { display: none !important; } + .ng-show{ + display: block !important; + } @keyframes myfirst { 0% { @@ -743,7 +746,7 @@ margin-bottom: 10%;"/> @@ -845,7 +849,7 @@ margin-bottom: 10%;"/> - -->
-
+

Settlement Logs @@ -378,7 +378,7 @@

交易类型分布-交易量

-

diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 4474a573b..6df1ad0f9 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -381,6 +381,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter return; } } + if (!$scope.partner.logo_url) { + alert("Logo is necessary!"); + return; + } if ($scope.partner.referrer_id) { $scope.referrers.forEach(function (e) { if ($scope.partner.referrer_id == e.org_id) { diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html index eaeb79dd6..9dbb2a3fd 100644 --- a/src/main/ui/static/payment/partner/templates/add_partner.html +++ b/src/main/ui/static/payment/partner/templates/add_partner.html @@ -116,7 +116,7 @@
- +