add upay 商户invoice、settlement logs

src/main/ui/static/commons/services/clearingDetailService.js

@@ -19,6 +19,21 @@ define(['../app','decimal'], function (app,Decimal) {
                 size: 'lg'
             })
         }
+        function openDetailOfUpaySettle(url, is_partner, client_id, detailId) {
+            $uibModal.open({
+                templateUrl: '/static/payment/tradelog/templates/partner_settlement_upay_settle_dialog.html',
+                controller: 'clearingDetailOfUpaySettleCtrl',
+                resolve: {
+                    detail: ['$http', function ($http) {
+                        return $http.get(url);
+                    }],
+                    is_partner: is_partner,
+                    client_id: client_id,
+                    detailId: detailId
+                },
+                size: 'lg'
+            })
+        }
         function openDetailOfMergeSettle(url,client_id) {
             $uibModal.open({
                 templateUrl: '/static/payment/tradelog/templates/partner_settlement_merge_settle_dialog.html',
@@ -37,6 +52,9 @@ define(['../app','decimal'], function (app,Decimal) {
             clientClearingDetail: function (client_id, detailId, is_partner) {
                 openDetail('/client/clean_logs/' + client_id + '/settlement_logs/' + detailId, is_partner,client_id,detailId);
             },
+            clientClearingDetailOfUpaySettle: function (client_id, detailId, is_partner) {
+                openDetailOfUpaySettle('/client/clean_logs/' + client_id + '/settlement_logs/' + detailId, is_partner,client_id,detailId);
+            },
             clientClearingDetailOfMergeSettle: function (client_id, reportDate) {
                 openDetailOfMergeSettle('/client/clean_logs/' + client_id + '/settlement_logs/report_date/' + reportDate, client_id);
             }
@@ -55,6 +73,18 @@ define(['../app','decimal'], function (app,Decimal) {
         }
         $scope.channelAndDayOfAnalysis();
     }]);
+    app.controller('clearingDetailOfUpaySettleCtrl', ['$scope', 'detail', 'is_partner','client_id','detailId','$http', function ($scope, detail, is_partner,client_id,detailId,$http) {
+        $scope.ctrl = {channel: null,day:null};
+        $scope.report = detail.data;
+        $scope.is_partner = is_partner;
+        $scope.channelAndDayOfAnalysis = function () {
+            $http.get('/client/clean_logs/' + client_id + '/settlement_logs/' + detailId+'/analysis/'+$scope.ctrl.channel).then(function (resp) {
+                $scope.channelAndDayMap = resp.data;
+                $scope.index = 0;
+            })
+        }
+        $scope.channelAndDayOfAnalysis();
+    }]);
     app.controller('clearingDetailOfMergeSettleCtrl', ['$scope', 'detail','client_id','$http', function ($scope, detail,client_id,$http) {
         $scope.ctrl = {channel: null,day:null};
         $scope.report = detail.data;

src/main/ui/static/payment/tradelog/partner-settlement-log.js

@@ -222,6 +222,9 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
         $scope.getClearingTransactions = function (client_id, detailId) {
             clearingDetailService.clientClearingDetail(client_id, detailId, true)
         }
+        $scope.getClearingTransactionsOfUpaySettle = function (client_id, detailId) {
+            clearingDetailService.clientClearingDetailOfUpaySettle(client_id, detailId, true)
+        }
         $scope.getClearingTransactionsOfMergeSettle = function (client_id, reportDate) {
             clearingDetailService.clientClearingDetailOfMergeSettle(client_id, reportDate)
         }

src/main/ui/static/payment/tradelog/templates/balance_report.html

@@ -390,7 +390,7 @@
                                         <ul class="dropdown-menu" uib-dropdown-menu aria-labelledby="single-button"
                                             style="min-width: 80px">
                                             <li><a target="_blank" ng-href="{{export('pdf')}}">Cross-border Payment PDF</a></li>
-                                            <li><a target="_blank" ng-href="{{export('upay-pdf')}}">Card Payment PDF</a></li>
+<!--                                            <li><a target="_blank" ng-href="{{export('upay-pdf')}}">Card Payment PDF</a></li>-->
                                             <li><a target="_blank" ng-href="{{export('excel')}}">EXCEL</a></li>
                                             <li><a target="_blank"
                                                    ng-href="{{export('excel_detail')}}">EXCEL(Detail)</a></li>

src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html

@@ -309,6 +309,19 @@
                                         <i class="fa fa-download"></i>
                                     </a>
                                 </td>
+<!--                                <td ng-if="!log.merge_settle && log.balance_group =='RPAY_SVC_CARD'">-->
+<!--                                    <a role="button" class="text-bold"-->
+<!--                                       ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'"-->
+<!--                                       ng-click="getClearingTransactionsOfUpaySettle(log.client_id,log.clear_detail_id)"-->
+<!--                                       title="Detail">-->
+<!--                                        <i class="fa fa-list-alt"></i>-->
+<!--                                    </a>-->
+<!--                                    <a ng-href="/client/clean_logs/{{log.client_id}}/settlement_logs/{{log.clear_detail_id}}/export"-->
+<!--                                       target="_blank" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'"-->
+<!--                                       title="Download">-->
+<!--                                        <i class="fa fa-download"></i>-->
+<!--                                    </a>-->
+<!--                                </td>-->
                                 <td ng-if="log.merge_settle">
                                     <a role="button" class="text-bold"
                                        ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'"

src/main/ui/static/payment/tradelog/templates/partner_settlement_upay_settle_dialog.html

@@ -0,0 +1,258 @@
+<div class="modal-header">
+    <h4>Transactions{{report.client_moniker?'('+report.client_moniker+')':''}}</h4>
+</div>
+<div class="modal-body">
+    <div class="box box-warning">
+        <div class="box-body">
+            <ul class="nav nav-pills">
+                <li ng-class="{active:ctrl.channel==null}">
+                    <a role="button" ng-click="ctrl.channel=null;channelAndDayOfAnalysis()" title="All">
+                        <img src="/static/images/royalpay_sign.png">
+                    </a>
+                </li>
+                <li ng-class="{active:ctrl.channel=='Wechat'}" ng-if="report.channels.Wechat">
+                    <a role="button" ng-click="ctrl.channel='Wechat';channelAndDayOfAnalysis()" title="Wechat">
+                        <img src="/static/images/wechatpay_sign_lg.png">
+                    </a>
+                </li>
+                <li ng-class="{active:ctrl.channel=='Alipay'}" ng-if="report.channels.Alipay">
+                    <a role="button" ng-click="ctrl.channel='Alipay';channelAndDayOfAnalysis()" title="Alipay">
+                        <img src="/static/images/alipay_sign_lg.png">
+                    </a>
+                </li>
+                <li ng-class="{active:ctrl.channel=='AlipayOnline'}" ng-if="report.channels.AlipayOnline">
+                    <a role="button" ng-click="ctrl.channel='AlipayOnline';channelAndDayOfAnalysis()" title="AlipayOnline">
+                        <img src="/static/images/alipay_online.png" class="channel-icon-lg">
+                    </a>
+                </li>
+                <li ng-class="{active:ctrl.channel=='Bestpay'}" ng-if="report.channels.Bestpay">
+                    <a role="button" ng-click="ctrl.channel='Bestpay';channelAndDayOfAnalysis()" title="Bestpay">
+                        <img src="/static/images/bestpay_sign_lg.png">
+                    </a>
+                </li>
+                <li ng-class="{active:ctrl.channel=='jd'}" ng-if="report.channels.jd">
+                    <a role="button" ng-click="ctrl.channel='jd';channelAndDayOfAnalysis()" title="JD Pay">
+                        <img src="/static/images/jd_sign_lg.png">
+                    </a>
+                </li>
+                <li ng-class="{active:ctrl.channel=='hf'}" ng-if="report.channels.hf">
+                    <a role="button" ng-click="ctrl.channel='hf';channelAndDayOfAnalysis()" title="HF Pay">
+                        <img src="/static/images/hf_sign_lg.png">
+                    </a>
+                </li>
+                <li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay">
+                    <a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="Rpay Pay">
+                        <img src="/static/images/rpayplus_sign_lg.png">
+                    </a>
+                </li>
+                <li ng-class="{active:ctrl.channel=='Yeepay'}" ng-if="report.channels.Yeepay">
+                    <a role="button" ng-click="ctrl.channel='Yeepay';channelAndDayOfAnalysis()" title="Yeepay">
+                        <img src="/static/images/yeepay_sign_lg.png">
+                    </a>
+                </li>
+                <li ng-class="{active:ctrl.channel=='LakalaPay'}" ng-if="report.channels.LakalaPay">
+                    <a role="button" ng-click="ctrl.channel='LakalaPay';channelAndDayOfAnalysis()" title="LakalaPay">
+                        <img src="/static/images/lakalapay_sign_lg.png">
+                    </a>
+                </li>
+                <li ng-class="{active:ctrl.channel=='rpaypmt_card'}" ng-if="report.channels.rpaypmt_card">
+                    <a role="button" ng-click="ctrl.channel='rpaypmt_card';channelAndDayOfAnalysis()" title="rpaypmt_card">
+                        <img src="/static/images/card_payment_sign_lg.png">
+                    </a>
+                </li>
+                <li ng-class="{active:ctrl.channel=='rpaypmt_dd'}" ng-if="report.channels.rpaypmt_dd">
+                    <a role="button" ng-click="ctrl.channel='rpaypmt_dd';channelAndDayOfAnalysis()" title="rpaypmt_dd">
+                        <img src="/static/images/direct_debit_sign_lg.png">
+                    </a>
+                </li>
+
+            </ul>
+        </div>
+    </div>
+    <div class="box box-warning">
+        <uib-tabset active="index">
+            <uib-tab index="0" heading="Analysis" ng-click="ctrl.day=null">
+                <div class="box-body">
+                    <div class="row">
+                        <!--<div class="col-xs-6 col-sm-3">-->
+                        <!--<span class="col-xs-6 text-bold">Rate</span>-->
+                        <!--<span class="col-xs-6" ng-bind="report.rate+'%'"></span>-->
+                        <!--</div>-->
+                        <div class="col-xs-6 col-sm-3">
+                            <span class="col-xs-6 text-bold">Total Credit</span>
+                            <span ng-if="ctrl.channel==null" class="col-xs-6" ng-bind="report.total_payment|currency:''"></span>
+                            <span ng-if="ctrl.channel!=null"class="col-xs-6" ng-bind="report.channels[ctrl.channel].total_credit|currency:''"></span>
+                        </div>
+                        <div class="col-xs-6 col-sm-3">
+                            <span class="col-xs-6 text-bold">Total Debit</span>
+                            <span ng-if="ctrl.channel==null" class="col-xs-6" ng-bind="report.total_refund|currency:''"></span>
+                            <span ng-if="ctrl.channel!=null" class="col-xs-6" ng-bind="report.channels[ctrl.channel].total_debit|currency:''"></span>
+                        </div>
+                        <div class="col-xs-6 col-sm-3">
+                            <span class="col-xs-6 text-bold">Gross Amount</span>
+                            <span ng-if="ctrl.channel==null" class="col-xs-6" ng-bind="report.gross_amount|currency:''"></span>
+                            <span ng-if="ctrl.channel!=null" class="col-xs-6" ng-bind="report.channels[ctrl.channel].gross_amount|currency:''"></span>
+                        </div>
+
+                    </div>
+                    <div class="row">
+                        <div class="col-xs-6 col-sm-3">
+                            <span class="col-xs-6 text-bold">Tax Amount</span>
+                            <span  ng-if="ctrl.channel==null" class="col-xs-6" ng-bind="report.tax_amount|currency:''"></span>
+                            <span ng-if="ctrl.channel!=null" class="col-xs-6" ng-bind="report.channels[ctrl.channel].tax_amount|currency:''"></span>
+                        </div>
+                        <div class="col-xs-6 col-sm-3">
+                            <span class="col-xs-6 text-bold">Total Charge</span>
+                            <span ng-if="ctrl.channel==null" class="col-xs-6" ng-bind="report.total_charge|currency:''"></span>
+                            <span ng-if="ctrl.channel!=null" class="col-xs-6" ng-bind="report.channels[ctrl.channel].total_charge|currency:''"></span>
+                        </div>
+                        <div class="col-xs-6 col-sm-3" ng-if="!is_partner">
+                            <span class="col-xs-6 text-bold">Channel Charge</span>
+                            <span ng-if="ctrl.channel==null" class="col-xs-6" ng-bind="report.wechat_charge|currency:''"></span>
+                            <span ng-if="ctrl.channel!=null" class="col-xs-6" ng-bind="report.channels[ctrl.channel].third_charge|currency:''"></span>
+                        </div>
+                        <div class="col-xs-6 col-sm-3" ng-if="!is_partner">
+                            <span class="col-xs-6 text-bold">RoyalPay Charge</span>
+                            <span ng-if="ctrl.channel==null" class="col-xs-6" ng-bind="report.royalpay_charge|currency:''"></span>
+                            <span ng-if="ctrl.channel!=null" class="col-xs-6"
+                                  ng-bind="report.channels[ctrl.channel].royalpay_charge|currency:''"></span>
+                        </div>
+                        <div class="col-xs-6 col-sm-3">
+                            <span class="col-xs-6 text-bold">Net Amount</span>
+                            <span ng-if="ctrl.channel==null" class="col-xs-6"
+                                  ng-bind="report.clearing_amount|currency:''"></span>
+                            <span ng-if="ctrl.channel!=null" class="col-xs-6"
+                                  ng-bind="(report.channels[ctrl.channel].gross_amount - report.channels[ctrl.channel].total_charge-report.channels[ctrl.channel].tax_amount)|currency:''"></span>
+                        </div>
+                    </div>
+                </div>
+            </uib-tab>
+            <uib-tab ng-repeat="(key,analysis) in channelAndDayMap" heading="{{key}}" ng-click="ctrl.day=key">
+                <div class="box-body" >
+                    <div class="row">
+                        <div class="col-xs-6 col-sm-3">
+                            <span class="col-xs-6 text-bold">Total Credit</span>
+                            <span class="col-xs-6" ng-bind="analysis.total_credit|currency:''"></span>
+                        </div>
+                        <div class="col-xs-6 col-sm-3">
+                            <span class="col-xs-6 text-bold">Total Debit</span>
+                            <span class="col-xs-6" ng-bind="analysis.total_debit|currency:''"></span>
+                        </div>
+                        <div class="col-xs-6 col-sm-3">
+                            <span class="col-xs-6 text-bold">Gross Amount</span>
+                            <span class="col-xs-6" ng-bind="analysis.gross_amount|currency:''"></span>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-xs-6 col-sm-3">
+                            <span class="col-xs-6 text-bold">Tax Amount</span>
+                            <span class="col-xs-6" ng-bind="analysis.tax_amount|currency:''"></span>
+                        </div>
+                        <div class="col-xs-6 col-sm-3">
+                            <span class="col-xs-6 text-bold">Total Charge</span>
+                            <span class="col-xs-6" ng-bind="analysis.total_surcharge|currency:''"></span>
+                        </div>
+                        <div class="col-xs-6 col-sm-3">
+                            <span class="col-xs-6 text-bold">Net Amount</span>
+                            <span class="col-xs-6" ng-bind="analysis.net_amount|currency:''"></span>
+                        </div>
+                    </div>
+                </div>
+            </uib-tab>
+        </uib-tabset>
+    </div>
+    <div class="box box-default">
+        <div class="box-header">Credits</div>
+        <div class="box-body">
+            <div class="table-responsive col-sm-12">
+            <table class="table table-bordered table-striped table-hover">
+                <thead>
+                <tr>
+                    <th>Order Id</th>
+                    <th>Transaction Time</th>
+                    <th>Currency</th>
+                    <th>Input Amount</th>
+                    <th>Total Amount</th>
+                    <th>Transaction Fee (GST Inclu.)</th>
+                    <th>Surcharge rate for RoyalPay</th>
+                    <th>Surcharge Amount for RoyalPay</th>
+                    <th>GST Amount for RoyalPay</th>
+                    <th>Surcharge rate for Mini Program</th>
+                    <th>Surcharge Amount for Mini Program</th>
+                    <th>GST Amount for Mini Program </th>
+                    <th ng-if="report.report[0].settle_amount!=null">Settle Amount</th>
+                    <th>Remark</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-repeat="tr in report.report|propsFilter:{transaction_type:'Credit',channel:ctrl.channel,transaction_time:ctrl.day}:true">
+                    <td>
+                        <img src="/static/images/royalpay_sign_s.png" uib-tooltip="RoyalPay" ng-if="tr.source=='system'"/>
+                        <img src="/static/images/yangmaimai_sign.png" uib-tooltip="RP跨境商城" ng-if="tr.source=='RP跨境商城'"/>
+                        <img class="channel-icon" ng-src="{{tr.channel|channel_image}}">{{tr.order_id}}
+                    </td>
+                    <td ng-bind="tr.transaction_time"></td>
+                    <td ng-bind="tr.transaction_currency"></td>
+                    <td ng-bind="tr.display_amount"></td>
+                    <td ng-bind="tr.transaction_amount"></td>
+                    <!--<td ng-bind="tr.surcharge_rate?(tr.surcharge_rate|percentage:1):report.channels[tr.channel].rate+'%'"></td>-->
+                    <td>
+                        {{(((tr.surcharge_rate * 100) > tr.rate_value)?((tr.surcharge_rate * 100-tr.rate_value)):(tr.surcharge_rate))|number:2}} %
+                    </td>
+                    <td ng-bind="(tr.real_royal_surcharge?tr.real_royal_surcharge:0)|currency:''"></td>
+                    <td ng-bind="tr.royalpay_tax|currency:''"></td>
+                    <td ng-bind="(tr.rate_value/100)|percentage:2"></td>
+                    <td ng-bind="(tr.incremental_surcharge?tr.incremental_surcharge:0)|currency:''"></td>
+                    <td ng-bind="tr.incremental_tax|currency:''"></td>
+                    <td ng-if="tr.settle_amount!=null" ng-bind="tr.settle_amount|currency:''"></td>
+                    <td ng-bind="tr.remark"></td>
+                </tr>
+                </tbody>
+            </table>
+            </div>
+        </div>
+    </div>
+    <div class="box box-default">
+        <div class="box-header">Debits</div>
+        <div class="box-body">
+            <div class="table-responsive col-sm-12">
+            <table class="table table-bordered table-striped table-hover">
+                <thead>
+                <tr>
+                    <th>Order Id</th>
+                    <th>Transaction Time</th>
+                    <th>Currency</th>
+                    <th>Total Amount</th>
+                    <th>Surcharge rate for RoyalPay</th>
+                    <th>Surcharge Amount for RoyalPay</th>
+                    <th>GST Amount for RoyalPay</th>
+                    <th>Surcharge rate for Mini Program</th>
+                    <th>Surcharge Amount for Mini Program</th>
+                    <th>GST Amount for Mini Program </th>
+                    <th>Settle Amount</th>
+                    <th>Remark</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-repeat="tr in report.report|propsFilter:{transaction_type:'Debit',channel:ctrl.channel,transaction_time:ctrl.day}:true">
+                    <td ng-bind="tr.order_id"></td>
+                    <td ng-bind="tr.transaction_time"></td>
+                    <td ng-bind="tr.transaction_currency"></td>
+                    <td ng-bind="tr.transaction_amount"></td>
+                    <td>
+                        {{(((tr.surcharge_rate * 100) > tr.rate_value)?((tr.surcharge_rate * 100-tr.rate_value)):(tr.surcharge_rate))|number:2}} %
+                    </td>
+                    <td ng-bind="(tr.real_royal_surcharge?tr.real_royal_surcharge:0)|currency:''"></td>
+                    <td ng-bind="tr.royalpay_tax|currency:''"></td>
+                    <td ng-bind="(tr.rate_value/100)|percentage:2"></td>
+                    <td ng-bind="(tr.incremental_surcharge?tr.incremental_surcharge:0)|currency:''"></td>
+                    <td ng-bind="tr.incremental_tax|currency:''"></td>
+                    <td ng-bind="tr.settle_amount"></td>
+                    <td ng-bind="tr.remark"></td>
+                </tr>
+                </tbody>
+            </table>
+            </div>
+        </div>
+    </div>
+</div>