@ -10,30 +10,31 @@
z-index: 1002;
overflow: auto;
}
.white_content::-webkit-scrollbar:vertical {
width: 11px;
}
/*定义滚动条高宽及背景
高宽分别对应横竖滚动条的尺寸*/
.white_content::-webkit-scrollbar
{
.white_content::-webkit-scrollbar {
-webkit-appearance: none;
width: 16px;
height: 16px;
background-color: #F5F5F5;
}
/*定义滚动条轨道
内阴影+圆角*/
.white_content::-webkit-scrollbar-track
{
.white_content::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
border-radius: 10px;
background-color: #F5F5F5;
}
/*定义滑块
内阴影+圆角*/
.white_content::-webkit-scrollbar-thumb
{
.white_content::-webkit-scrollbar-thumb {
border-radius: 10px;
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
background-color: #555;
@ -143,6 +144,8 @@
ng-click="params.channel='ALIPAY';loadTradeLogs(1)">Alipay< / a > |
< a role = "button" ng-class = "{'bg-primary':params.channel=='ALIPAYONLINE'}"
ng-click="params.channel='ALIPAYONLINE';loadTradeLogs(1)">AlipayOnline< / a > |
< a role = "button" ng-class = "{'bg-primary':params.channel=='ALIPAYPLUS'}"
ng-click="params.channel='ALIPAYPLUS';loadTradeLogs(1)">Alipay+< / a > |
< a role = "button" ng-class = "{'bg-primary':params.channel=='BESTPAY'}"
ng-click="params.channel='BESTPAY';loadTradeLogs(1)">BestPay< / a > |
< a role = "button" ng-class = "{'bg-primary':params.channel=='JD'}"
@ -168,29 +171,24 @@
< div class = "form-control-static form-inline" >
< div style = "display: inline-block" >
< input class = "form-control" id = "date-from-input" ng-model = "params.datefrom"
uib-datepicker-popup size="10" placeholder="From"
is-open="dateBegin.open" ng-click="dateBegin.open=true"
datepicker-options="{maxDate:params.dateto||today}">
uib-datepicker-popup size="10" placeholder="From" is-open="dateBegin.open"
ng-click="dateBegin.open=true" datepicker-options="{maxDate:params.dateto||today}">
< / div >
~
< div style = "display: inline-block" >
< input class = "form-control" id = "date-to-input" ng-model = "params.dateto"
uib-datepicker-popup size="10" placeholder="To"
is-open="dateTo.open" ng-click="dateTo.open=true"
< input class = "form-control" id = "date-to-input" ng-model = "params.dateto" uib-datepicker-popup
size="10" placeholder="To" is-open="dateTo.open" ng-click="dateTo.open=true"
datepicker-options="{minDate:params.datefrom,maxDate:today}">
< / div >
< div class = "btn-group" >
< a role = "button" class = "btn btn-default btn-sm"
ng-click="chooseToday()">Today< / a >
< a role = "button" class = "btn btn-default btn-sm" ng-click = "chooseToday()" > Today< / a >
< / div >
< div class = "btn-group" >
< a role = "button" class = "btn btn-default btn-sm"
ng-click="chooseYesterday()">Yesterday< / a >
< a role = "button" class = "btn btn-default btn-sm" ng-click = "chooseYesterday()" > Yesterday< / a >
< / div >
< div class = "btn-group" >
< a role = "button" class = "btn btn-default btn-sm"
ng-click="chooseLast7Days()">Last 7
< a role = "button" class = "btn btn-default btn-sm" ng-click = "chooseLast7Days()" > Last 7
Days< / a >
< / div >
< div class = "btn-group" >
@ -217,21 +215,22 @@
< / label >
< / p >
< p class = "form-control-static" ng-if = "clients.length>=20" >
< a role = "button" ng-class = "{'bg-primary':isAll}"
ng-click="chooseClient('all')">All< / a >
< label ng-click = "checkSubClientChoseShow('');choseDivStopPropagation($event)" style = "cursor: pointer;" >
< a role = "button" ng-class = "{'bg-primary':isAll}" ng-click = "chooseClient('all')" > All< / a >
< label ng-click = "checkSubClientChoseShow('');choseDivStopPropagation($event)"
style="cursor: pointer;">
｜ < input ng-model = "choseSubClientNow" style = "border:none;cursor: pointer;" readonly >
< / label >
< / p >
< div id = "light" class = "white_content" ng-if = "more20ChoseSubClient" style = "display: block;" ng-click = "choseDivStopPropagation($event)" >
< div id = "light" class = "white_content" ng-if = "more20ChoseSubClient" style = "display: block;"
ng-click="choseDivStopPropagation($event)">
< div class = "row" >
< div class = "form-group col-xs-12" >
< div class = "col-sm-8 col-xs-8" >
< input class = "form-control" placeholder = "Keyword"
ng-model="subSearchText">
< input class = "form-control" placeholder = "Keyword" ng-model = "subSearchText" >
< / div >
< div class = "col-sm-3" >
< button class = "btn btn-success" type = "button" ng-click = "searchSubClients(subSearchText,1)" >
< button class = "btn btn-success" type = "button"
ng-click="searchSubClients(subSearchText,1)">
< i class = "fa fa-search" > < / i > Search
< / button >
< / div >
@ -248,7 +247,8 @@
< / thead >
< tbody >
< tr ng-repeat = "subPartner in subClientTable1" >
< td ng-click = "showClient(subPartner); toShow = !toShow" style = "cursor:pointer" >
< td ng-click = "showClient(subPartner); toShow = !toShow"
style="cursor:pointer">
{{subPartner.client_moniker}}
< / td >
< td ng-bind = "subPartner.short_name" > < / td >
@ -274,7 +274,8 @@
< / thead >
< tbody >
< tr ng-repeat = "subPartner in subClientTable2" >
< td ng-click = "showClient(subPartner); toShow = !toShow" style = "cursor:pointer" >
< td ng-click = "showClient(subPartner); toShow = !toShow"
style="cursor:pointer">
{{subPartner.client_moniker}}
< / td >
< td ng-bind = "subPartner.short_name" > < / td >
@ -291,26 +292,22 @@
< / div >
< / div >
< div class = "box-footer" ng-if = "clients.length" style = "float: right;" >
< uib-pagination class = "pagination"
total-items="subClientPagination.totalCount"
boundary-links="true"
ng-model="subClientPagination.page"
items-per-page="subClientPagination.limit"
max-size="10"
ng-change="searchSubClients('',subClientPagination.page)"
previous-text="‹ "
next-text="› "
first-text="« "
last-text="» ">< / uib-pagination >
< uib-pagination class = "pagination" total-items = "subClientPagination.totalCount"
boundary-links="true" ng-model="subClientPagination.page"
items-per-page="subClientPagination.limit" max-size="10"
ng-change="searchSubClients('',subClientPagination.page)" previous-text="‹ "
next-text="› " first-text="« " last-text="» ">< / uib-pagination >
< div class = "row" >
< div class = "col-xs-12" >
Total Records:{{subClientPagination.totalCount}};Total Pages:{{subClientPagination.totalPages}}
Total Records:{{subClientPagination.totalCount}};Total
Pages:{{subClientPagination.totalPages}}
< / div >
< / div >
< / div >
< / div >
< div class = "modal-footer" >
< button type = "button" class = "btn btn-danger" ng-click = "checkSubClientChoseShow('')" > Cancel< / button >
< button type = "button" class = "btn btn-danger"
ng-click="checkSubClientChoseShow('')">Cancel< / button >
< / div >
< / div >
< / div >
@ -319,10 +316,12 @@
< label class = "control-label col-xs-4 col-sm-2" > Sub-Partner of sub-partners< / label >
< div class = "col-sm-10 col-xs-8" >
< p class = "form-control-static" >
< a role = "button" ng-class = "{'bg-primary':isLevel3All}" ng-click = "chooseLevel3Client('all')" > All< / a >
< a role = "button" ng-class = "{'bg-primary':isLevel3All}"
ng-click="chooseLevel3Client('all')">All< / a >
< label ng-repeat = "sub in level3Clients" >
|
< a role = "button" ng-class = "{'bg-primary':sub.client_id==chooseLevel3ClientId}" ng-click = "chooseLevel3Client(sub)" > {{sub.short_name}}< / a >
< a role = "button" ng-class = "{'bg-primary':sub.client_id==chooseLevel3ClientId}"
ng-click="chooseLevel3Client(sub)">{{sub.short_name}}< / a >
< / label >
< / p >
@ -337,8 +336,10 @@
< div class = "row" >
< div class = "col-sm-12" >
< h3 class = "box-title" style = "display: inherit" > Orders
< span class = "small" ng-if = "tradeLogs.length" > (Found {{pagination.totalCount}} orders and {{analysis.order_count}} transactions worth of {{analysis.paid_fee|currency:'AUD'}})< / span >
< span style = "float: right;font-size: 14px;" > Pre Authorization:< i class = "fa fa-stop" aria-hidden = "true" style = "color: #fff2a5" > < / i > < / span >
< span class = "small" ng-if = "tradeLogs.length" > (Found {{pagination.totalCount}} orders and
{{analysis.order_count}} transactions worth of {{analysis.paid_fee|currency:'AUD'}})< / span >
< span style = "float: right;font-size: 14px;" > Pre Authorization:< i class = "fa fa-stop" aria-hidden = "true"
style="color: #fff2a5">< / i > < / span >
< / h3 >
< div class = "table-responsive col-sm-12" >
< table class = "table table-bordered table-hover table-striped" >
@ -361,18 +362,79 @@
< tr ng-repeat = "trade in tradeLogs" ng-class = "{warning:trade.clearing_status==2}" >
< td ng-bind = "trade.client_order_id||'NOT PROVIDED'" > < / td >
< td >
< img src = "/static/images/card_payment_sign.png" uib-tooltip = "Card Payment" ng-if = "trade.channel=='rpaypmt_card'" / >
< img src = "/static/images/direct_debit_sign.png" uib-tooltip = "Direct Debit" ng-if = "trade.channel=='rpaypmt_dd'" / >
< img src = "/static/images/wechatpay_sign.png" uib-tooltip = "Znyoo" ng-if = "trade.channel=='Znyoo'" / >
< img src = "/static/images/wechatpay_sign.png" uib-tooltip = "WechatPay" ng-if = "trade.channel=='Wechat'" / >
< img src = "/static/images/bestpay_sign.png" uib-tooltip = "BestPay" ng-if = "trade.channel=='Bestpay'" / >
< img src = "/static/images/alipay_sign.png" uib-tooltip = "Alipay" ng-if = "trade.channel=='Alipay'" / >
< img src = "/static/images/alipay_sign.png" uib-tooltip = "AlipayOnline" ng-if = "trade.channel=='AlipayOnline'" / >
< img src = "/static/images/card_payment_sign.png" uib-tooltip = "Card Payment"
ng-if="trade.channel=='rpaypmt_card'" />
< img src = "/static/images/direct_debit_sign.png" uib-tooltip = "Direct Debit"
ng-if="trade.channel=='rpaypmt_dd'" />
< img src = "/static/images/wechatpay_sign.png" uib-tooltip = "Znyoo"
ng-if="trade.channel=='Znyoo'" />
< img src = "/static/images/wechatpay_sign.png" uib-tooltip = "WechatPay"
ng-if="trade.channel=='Wechat'" />
< img src = "/static/images/bestpay_sign.png" uib-tooltip = "BestPay"
ng-if="trade.channel=='Bestpay'" />
< img src = "/static/images/alipay_sign.png" uib-tooltip = "Alipay"
ng-if="trade.channel=='Alipay'" />
< img src = "/static/images/alipay_sign.png" uib-tooltip = "AlipayOnline"
ng-if="trade.channel=='AlipayOnline'" />
< img src = "/static/images/jd_sign.png" uib-tooltip = "JD Pay" ng-if = "trade.channel=='jd'" / >
< img src = "/static/images/hf_sign.png" uib-tooltip = "HF Pay" ng-if = "trade.channel=='hf'" / >
< img src = "/static/images/rpayplus_sign.png" uib-tooltip = "RPay+" ng-if = "trade.channel=='Rpay'" / >
< img src = "/static/images/yeepay_sign.png" uib-tooltip = "Yeepay" ng-if = "trade.channel=='Yeepay'" / >
< img src = "/static/images/lakalapay_sign.png" uib-tooltip = "LakalaPay" ng-if = "trade.channel=='LakalaPay'" / >
< img src = "/static/images/rpayplus_sign.png" uib-tooltip = "RPay+"
ng-if="trade.channel=='Rpay'" />
< img src = "/static/images/yeepay_sign.png" uib-tooltip = "Yeepay"
ng-if="trade.channel=='Yeepay'" />
< img src = "/static/images/lakalapay_sign.png" uib-tooltip = "LakalaPay"
ng-if="trade.channel=='LakalaPay'" />
< img src = "/static/images/alipay_sign.png" style = "height: 20px" uib-tooltip = "Alipay CN"
ng-if="trade.channel=='AlipayPlus' & & trade.pay_type=='alipay_cn'" />
< img src = "/static/images/alipay_sign.png" style = "height: 20px" uib-tooltip = "Alipay SG"
ng-if="trade.channel=='AlipayPlus' & & trade.pay_type=='alipay_ac_sg'" />
< img src = "/static/images/alipay_sign.png" style = "height: 20px" uib-tooltip = "Alipay MO"
ng-if="trade.channel=='AlipayPlus' & & trade.pay_type=='alipay_ac_mo'" />
< img src = "/static/images/alipay-hk.png" style = "height: 20px" uib-tooltip = "Alipay HK/支付宝香港"
ng-if="trade.channel=='AlipayPlus' & & trade.pay_type=='alipay_ac_hk'" />
< img src = "/static/images/alipay_sign.png" style = "height: 20px" uib-tooltip = "Alipay LU"
ng-if="trade.channel=='AlipayPlus' & & trade.pay_type=='alipay_ac_lu'" />
< img src = "/static/images/alipay_sign.png" style = "height: 20px" uib-tooltip = "Alipay GB"
ng-if="trade.channel=='AlipayPlus' & & trade.pay_type=='alipay_ac_gb'" />
< img src = "/static/images/alipay_sign.png" style = "height: 20px" uib-tooltip = "Alipay US"
ng-if="trade.channel=='AlipayPlus' & & trade.pay_type=='alipay_ac_us'" />
< img src = "/static/images/paytm-logo.png" style = "height: 20px" uib-tooltip = "Patytm Wallet"
ng-if="trade.channel=='AlipayPlus' & & trade.pay_type=='paytm'" />
< img src = "/static/images/kakaopay.png" style = "height: 20px" uib-tooltip = "Kakao Pay"
ng-if="trade.channel=='AlipayPlus' & & trade.pay_type=='kakaopay'" />
< img src = "/static/images/truemoney-logo.png" style = "height: 20px" uib-tooltip = "TrueMoney"
ng-if="trade.channel=='AlipayPlus' & & trade.pay_type=='truemoney'" />
< img src = "/static/images/ezlink-logo.png" style = "height: 20px" uib-tooltip = "EZLINK"
ng-if="trade.channel=='AlipayPlus' & & trade.pay_type=='ezlink'" />
< img src = "/static/images/gcash-logo.png" style = "height: 20px" uib-tooltip = "GCash"
ng-if="trade.channel=='AlipayPlus' & & trade.pay_type=='gcash'" />
< img src = "/static/images/TNGeWalletLogo.png" style = "height: 20px" uib-tooltip = "TNG"
ng-if="trade.channel=='AlipayPlus' & & trade.pay_type=='tng'" />
< img src = "/static/images/dana-wallet-logo.png" style = "height: 20px"
uib-tooltip="Dana Wallet"
ng-if="trade.channel=='AlipayPlus' & & trade.pay_type=='dana'" />
< img src = "/static/images/easypasia-logo.png" style = "height: 20px" uib-tooltip = "EasyPasia"
ng-if="trade.channel=='AlipayPlus' & & trade.pay_type=='easy_paisa'" />
< img src = "/static/images/bkash-logo.png" style = "height: 20px" uib-tooltip = "bKash Wallet"
ng-if="trade.channel=='AlipayPlus' & & trade.pay_type=='bkash'" />
< img src = "/static/images/lazada-logo.png" style = "height: 20px" uib-tooltip = "Lazada Wallet"
ng-if="trade.channel=='AlipayPlus' & & trade.pay_type=='lazada_wallet_my'" />
{{trade.order_id}}
< / td >
< td >
@ -383,7 +445,8 @@
< td ng-bind = "trade.display_amount|currency:trade.currency" > < / td >
< td ng-bind = "trade.clearing_amount|currency:'AUD '" > < / td >
< td >
< span ng-if = "(trade.channel!='hf') && (trade.channel!='Rpay')" ng-bind = "trade.exchange_rate" > < / span >
< span ng-if = "(trade.channel!='hf') && (trade.channel!='Rpay')"
ng-bind="trade.exchange_rate">< / span >
< span ng-if = "(trade.channel=='hf') || (trade.channel=='Rpay')" > - < / span >
< / td >
< td ng-bind = "trade.status|tradeStatus" > < / td >
@ -393,9 +456,9 @@
< a role = "button" class = "text-bold" ng-click = "showTradeDetail(trade)" title = "Detail" >
< i class = "fa fa-list-alt" > < / i >
< / a >
< a role = "button" ng-if = "trade.status>=5 && trade.confirm_time!=null && trade.clearing_status<2 && ('do_refund'|withFunc)"
class="text-bold text-danger"
ng-click="newRefund(trade.order_id)" title="Refund">
< a role = "button"
ng-if="trade.status>=5 & & trade.confirm_time!=null & & trade.clearing_status< 2 & & ( ' do_refund ' | withFunc ) "
class="text-bold text-danger" ng-click="newRefund(trade.order_id)" title="Refund">
< i class = "fa fa-undo" > < / i >
< / a >
< / td >
@ -403,17 +466,9 @@
< / tbody >
< / table >
< / div >
< uib-pagination ng-if = "tradeLogs.length"
class="pagination"
total-items="pagination.totalCount"
boundary-links="true"
ng-model="pagination.page"
items-per-page="pagination.limit"
max-size="10"
ng-change="loadTradeLogs()"
previous-text="‹ "
next-text="› "
first-text="« "
< uib-pagination ng-if = "tradeLogs.length" class = "pagination" total-items = "pagination.totalCount"
boundary-links="true" ng-model="pagination.page" items-per-page="pagination.limit" max-size="10"
ng-change="loadTradeLogs()" previous-text="‹ " next-text="› " first-text="« "
last-text="» ">< / uib-pagination >
< div class = "col-xs-12" > Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}< / div >
< / div >
AlanFenng
4 years ago
