@ -14,76 +14,76 @@
< div class = "box-body" >
< ul class = "nav nav-pills" >
< li ng-class = "{active:ctrl.channel==null}" >
< a role = "button" ng-click = "ctrl.channel=null " title = "All" >
< a role = "button" ng-click = "ctrl.channel=null ;channelAndDayOfAnalysis() " title = "All" >
< img src = "/static/images/royalpay_sign.png" class = "channel-icon-lg" >
< / a >
< / li >
< li ng-class = "{active:ctrl.channel=='Wechat'}" ng-if = "report.channels.Wechat" >
< a role = "button" ng-click = "ctrl.channel='Wechat' " title = "Wechat" >
< a role = "button" ng-click = "ctrl.channel='Wechat' ;channelAndDayOfAnalysis() " title = "Wechat" >
< img src = "/static/images/wechatpay_sign_lg.png" class = "channel-icon-lg" >
< / a >
< / li >
< li ng-class = "{active:ctrl.channel=='Alipay'}" ng-if = "report.channels.Alipay" >
< a role = "button" ng-click = "ctrl.channel='Alipay' " title = "Alipay" >
< a role = "button" ng-click = "ctrl.channel='Alipay' ;channelAndDayOfAnalysis() " title = "Alipay" >
< img src = "/static/images/alipay_sign_lg.png" class = "channel-icon-lg" >
< / a >
< / li >
< li ng-class = "{active:ctrl.channel=='AlipayOnline'}" ng-if = "report.channels.AlipayOnline" >
< a role = "button" ng-click = "ctrl.channel='AlipayOnline' " title = "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' " title = "Bestpay" >
< a role = "button" ng-click = "ctrl.channel='Bestpay' ;channelAndDayOfAnalysis() " title = "Bestpay" >
< img src = "/static/images/bestpay_sign_lg.png" class = "channel-icon-lg" >
< / a >
< / li >
< li ng-class = "{active:ctrl.channel=='jd'}" ng-if = "report.channels.jd" >
< a role = "button" ng-click = "ctrl.channel='jd' " title = "JD" >
< a role = "button" ng-click = "ctrl.channel='jd' ;channelAndDayOfAnalysis() " title = "JD" >
< img src = "/static/images/jd_sign_lg.png" class = "channel-icon-lg" >
< / a >
< / li >
< / ul >
< / div >
< / div >
< div class = "box box-warning" ng-if = "ctrl.channel==null" >
<!-- <div class="box box - warning" ng - if="ctrl.channel!=null" >
< div class = "box-header" > Analysis< / div >
< 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 >
< span class = "col-xs-6" ng-bind = "report. channels[ctrl.channel]. rate+'%'"> < / span >
< / div >
< 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 = "report. total_paymen t|currency:''"> < / span >
< span class = "col-xs-6" ng-bind = "report. channels[ctrl.channel].total_credi t|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 = "report. total_refun d|currency:''"> < / span >
< span 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 class = "col-xs-6" ng-bind = "report. gross_amount|currency:''"> < / span >
< span 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" > Total Charge< / span >
< span class = "col-xs-6" ng-bind = "report. total_charge|currency:''"> < / span >
< span class = "col-xs-6" ng-bind = "report. channels[ctrl.channel]. total_charge|currency:''"> < / span >
< / div >
< div class = "col-xs-6 col-sm-3" >
< span class = "col-xs-6 text-bold" > Channel Charge< / span >
< span class = "col-xs-6" ng-bind = "report. wechat _charge|currency:''"> < / span >
< span class = "col-xs-6" ng-bind = "report. channels[ctrl.channel].third _charge|currency:''"> < / span >
< / div >
< div class = "col-xs-6 col-sm-3" >
< span class = "col-xs-6 text-bold" > RoyalPay Charge< / span >
< span class = "col-xs-6" ng-bind = "report. royalpay_charge|currency:''"> < / span >
< span 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 class = "col-xs-6" ng-bind = "report.c learing_amount |currency:''"> < / span >
< span class = "col-xs-6" ng-bind = "report.c hannels[ctrl.channel].gross_amount-report.channels[ctrl.channel].total_charge |currency:''"> < / span >
< / div >
< / div >
< div class = "row" >
@ -93,15 +93,68 @@
< / div >
< / div >
< / div >
< / div >
< div class = "box box-warning" ng-if = "ctrl.channel!=null" >
< div class = "box-header" > Analysis< / div >
< / div > -->
< div class = "box box-warning" >
< uib-tabset active = "index" >
< uib-tab index = "0" heading = "Analysis" ng-click = "ctrl.day=''" >
< 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.channels[ctrl.channel].rate+'%'" > < / span >
< span ng-if = "ctrl.channel==null" class = "col-xs-6" ng-bind = "report.rate+'%'" > < / span >
< span ng-if = "ctrl.channel!=null" class = "col-xs-6" ng-bind = "report.channels[ctrl.channel].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" > 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" >
< 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" >
< 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|currency:''" > < / span >
< / div >
< / div >
< div class = "row" ng-if = "ctrl.channel==null" >
< 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 = "report.tax_amount|currency:''" > < / span >
< / div >
< / div >
< / div >
< / uib-tab >
<!-- <uib - tab heading="Analysis" ng - if="ctrl.channel!=null" ng - click="ctrl.day=''">
< 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 = "report.channels[ctrl.channel].total_credit|currency:''" > < / span >
@ -121,26 +174,63 @@
< span class = "col-xs-6 text-bold" > Total Charge< / span >
< span class = "col-xs-6" ng-bind = "report.channels[ctrl.channel].total_charge|currency:''" > < / span >
< / div >
< div class = "col-xs-6 col-sm-3 ">
< div class = "col-xs-6 col-sm-3 " ng-if = "!is_partner ">
< span class = "col-xs-6 text-bold" > Channel Charge< / span >
< span class = "col-xs-6" ng-bind = "report.channels[ctrl.channel].third_charge|currency:''" > < / span >
< / div >
< div class = "col-xs-6 col-sm-3 ">
< div class = "col-xs-6 col-sm-3 " ng-if = "!is_partner ">
< span class = "col-xs-6 text-bold" > RoyalPay Charge< / span >
< span 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 class = "col-xs-6" ng-bind = "report.channels[ctrl.channel].gross_amount-report.channels[ctrl.channel].total_charge|currency:''" > < / span >
< span class = "col-xs-6"
ng-bind="report.channels[ctrl.channel].gross_amount-report.channels[ctrl.channel].total_charge|currency:''">< / span >
< / div >
< / div >
< / div >
< / uib-tab > -->
< uib-tab ng-repeat = "(key,analysis) in channelAndDayMap" heading = "{{key}}" ng-click = "ctrl.day=key" ng-if = "show" >
< 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" > Total Charge< / span >
< span class = "col-xs-6" ng-bind = "analysis.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 class = "col-xs-6" ng-bind = "analysis.wechat_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 class = "col-xs-6" ng-bind = "analysis.royalpay_charge|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 class = "col-xs-6 col-sm-3" ng-if = "!ctrl.channel" >
< span class = "col-xs-6 text-bold" > Tax Amount< / span >
< span class = "col-xs-6" ng-bind = "report.tax_amount|currency:''" > < / span >
< span class = "col-xs-6" ng-bind = " analysis .tax_amount|currency:''"> < / span >
< / div >
< / div >
< / div >
< / uib-tab >
< / uib-tabset >
< / div >
< div class = "box box-default" >
< div class = "box-header" > Credits< / div >
@ -162,7 +252,7 @@
< / tr >
< / thead >
< tbody >
< tr ng-repeat = "tr in report.report|propsFilter:{transaction_type:'Credit',channel:ctrl.channel }:true">
< tr ng-repeat = "tr in report.report|propsFilter:{transaction_type:'Credit',channel:ctrl.channel ,transaction_time:ctrl.day }:true">
< td >
< img class = "channel-icon" ng-src = "{{tr.channel|channel_image}}" > {{tr.order_id}}
< / td >
@ -200,7 +290,7 @@
< / tr >
< / thead >
< tbody >
< tr ng-repeat = "tr in report.report|propsFilter:{transaction_type:'Debit',channel:ctrl.channel }:true">
< tr ng-repeat = "tr in report.report|propsFilter:{transaction_type:'Debit',channel:ctrl.channel ,transaction_time:ctrl.day }:true">
< td >
< img class = "channel-icon" ng-src = "{{tr.channel|channel_image}}" > {{tr.order_id}}
< / td >