msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop_client_config

Browse Source 
# Conflicts:
#	src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
master
wangning 7 years ago
parent 3ce990059b 7f40f73ad6
commit 05d325db47
13 changed files with 48 additions and 27 deletions
Show Stats Download Patch File Download Diff File

BIN
src/main/resources/apple_message_cert_product.p12
View File

Binary file not shown.

BIN
src/main/resources/apple_message_cert_product20180413.p12
View File

Binary file not shown.

2
src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
Unescape View File

@ -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
</select>

BIN
src/main/resources/jasper/partner_invoice_gst.jasper
View File

Binary file not shown.

12
src/main/ui/index.html
Unescape View File

@ -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%;"/>
<!--顶部导航栏-->
<nav class="navbar navbar-static-top navbar-static-top-yedian" role="navigation">
<!--Sidebar toggle button-->
<a class="sidebar-toggle sidebar-tooggle-yedian" data-toggle="offcanvas" role="button"
<a id="toggle" class="sidebar-toggle sidebar-tooggle-yedian" data-toggle="offcanvas" role="button"
ng-click="hideSideBar=!hideSideBar">
<span class="sr-only">Toggle navigation</span>
</a>
@ -773,12 +776,12 @@ margin-bottom: 10%;"/>
</li>
<li class="user-menu">
<a role="button" ng-click="userCheckIn()">
<i class="fa fa-wechat"></i> Bind WeChat
<i class="fa fa-wechat"></i> <font class="sm_hid">Bind WeChat</font>
</a>
</li>
<li id="help" class="dropdown user user-menu" uib-dropdown>
<a href class="dropdown-toggle" uib-dropdown-toggle>
<i class="fa fa-question-circle-o" aria-hidden="true"></i> Support
<i class="fa fa-question-circle-o" aria-hidden="true"></i> <font class="sm_hid">Support</font>
</a>
<ul class="dropdown-menu user-dropdown-menu" ng-cloak>
<!-- User image -->
@ -837,6 +840,7 @@ margin-bottom: 10%;"/>
</li>
<!-- Control Sidebar Toggle Button -->
</ul>
</div>
</nav>
</div>
@ -845,7 +849,7 @@ margin-bottom: 10%;"/>
<!-- MENU Start -->
<!-- end navbar-custom -->
</header>
<div id="topnav" class="navbar-custom active" ng-class="{'ng-cloak':hideSideBar}">
<div id="topnav" class="navbar-custom active" ng-class="{'ng-show':hideSideBar}">
<div class="container-fluid">
<div id="navigation" class="active" style="display: block;">
<!-- Navigation Menu-->

5
src/main/ui/static/analysis/templates/settle_estimate_analysis.html
Unescape View File

@ -43,12 +43,13 @@
</div>
</div>
</div>
<div class="box-header" style="border-top: solid #f06010 1px;" ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_0||fut.aliSettleFee_0">
<div class="box-header" style="border-top: solid #f06010 1px;" ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_1487387142||fut.settlementFee_0||fut.aliSettleFee_0">
<span class="text-bold">到账金额详情:</span>
</div>
<div class="box-body" ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_0||fut.aliSettleFee_0">
<div class="box-body" ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_1487387142||fut.settlementFee_0||fut.aliSettleFee_0">
<p class="text-bold col-sm-12" align="left" ng-if="fut.settlementFee_1307485301"> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Merchant ID: 1307485301" />(1307485301)到账金额:<a class="text-green" ng-bind="fut.settlementFee_1307485301|currency:'AUD'"></a></p>
<p class="text-bold col-sm-12" align="left" ng-if="fut.settlementFee_1431999902"> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Merchant ID: 1431999902"/>(1431999902)到账金额:<a class="text-green" ng-bind="fut.settlementFee_1431999902|currency:'AUD'"></a></p>
<p class="text-bold col-sm-12" align="left" ng-if="fut.settlementFee_1487387142"> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Merchant ID: 1487387142"/>(1487387142)到账金额:<a class="text-green" ng-bind="fut.settlementFee_1487387142|currency:'AUD'"></a></p>
<p class="text-bold col-sm-12" align="left" ng-if="fut.aliSettleFee_All"> <img src="/static/images/alipay_sign.png" uib-tooltip="AliPay" alt="Alipay"/> 到账金额:<a class="text-green" ng-bind="fut.aliSettleFee_All|currency:'AUD'"></a></p>
<p class="text-bold col-sm-12" align="left" ng-if="fut.platformGetSettleFee" style="color: #f06010"> <img src="/static/images/r_logo.svg" style="width: 20px;height: 20px;" uib-tooltip="RoyalPay" alt="RoyalPay"/> 总到账金额:<a class="text-green" ng-bind="fut.platformGetSettleFee|currency:'AUD'"></a></p>
</div>

4
src/main/ui/static/commons/templates/ag_detail.html
Unescape View File

@ -11,7 +11,7 @@
</div>
<div class="modal-footer">
<div class="form-inline">
<button class="btn btn-success" type="button" ng-click="agree()">我知道了 | I Know</button>
<small class="pull-left form-control-static" style="color: grey">I Agree 代表同意GST条款，协议立即生效。</small>
<button class="btn btn-success" type="button" ng-click="agree()">I Agree</button>
</div>
</div>

1
src/main/ui/static/config/devtools/templates/wx_settlements.html
Unescape View File

@ -26,6 +26,7 @@
<select ng-model="params.merchant" id="merchant-select" class="form-control">
<option value="1307485301">1307485301</option>
<option value="1431999902">1431999902</option>
<option value="1487387142">1487387142</option>
</select>
</div>
<button class="btn btn-primary" ng-click="loadSettlements()">

13
src/main/ui/static/css/style.css
Unescape View File

@ -2819,13 +2819,24 @@ label {
#topnav #navigation {
display: block
}
#topnav{
display: block;
}
#toggle{
display: none;
}
}
@media (max-width: 991px) {
.container-fluid {
width: 100%
}
#topnav{
display: none;
}
.sm_hid{
display: none;
}
#topnav .navigation-menu {
float: none;
max-height: 400px;

8
src/main/ui/static/dashboard/templates/partner_dashboard.html
Unescape View File

@ -299,11 +299,11 @@
<p class="text-muted m-b-0"><b>{{time_range}}</b></p>
</li>
<li>
<h6 class="">{{avgOrderAndCustomer.old_customers.toFixed(0)||0}}</h6>
<h6 class=""><b>{{avgOrderAndCustomer.old_customers.toFixed(0)||0}}</b></h6>
<p class="text-muted m-b-0"><b>Avg Old Customers</b></p>
</li>
<li>
<h6 class="">{{avgOrderAndCustomer.new_customers.toFixed(0)||0}}</h6>
<h6 class=""><b>{{avgOrderAndCustomer.new_customers.toFixed(0)||0}}</b></h6>
<p class="text-muted m-b-0"><b>Avg New Customers</b></p>
</li>
</ul>
@ -334,7 +334,7 @@
</div>-->
<div class="row">
<div class="col-md-8 col-sm-8 col-xs-12" >
<div class="card m-b-30">
<div class="card m-b-30" style="height: 480px">
<div class="card-body">
<h4 class="mt-0 m-b-15 header-title">
Settlement Logs
@ -378,7 +378,7 @@
<div class="card-body">
<h4 class="mt-0 header-title">交易类型分布-交易量</h4>
<div class="chart" style="height: 400px" echarts="trade_type_chart"
<div class="chart" style="height: 385px" echarts="trade_type_chart"
ng-class="{nodata:trade_type_chart.nodata}"></div>
</div>
</div>

4
src/main/ui/static/payment/partner/partner-manage.js
Unescape View File

@ -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) {

2
src/main/ui/static/payment/partner/templates/add_partner.html
Unescape View File

@ -116,7 +116,7 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">Logo</label>
<label class="control-label col-sm-2">* Logo</label>
<div class="col-sm-8">
<div class="form-control-static">
<button class="btn btn-success" type="button"

24
src/main/ui/static/payment/partner/templates/partner_payment_info.html
Unescape View File

@ -196,18 +196,18 @@
<p>
<a ng-href="{{qrcode.qrcode}}" download><i class="fa fa-download"></i> Download QR Code Image (支付二维码)</a>
</p>
<p>
<a ng-href="/sys/partners/{{partner.client_moniker}}/qrcode_board?currency={{qrConfig.currency}}&preauth={{qrConfig.preauth==true}}&qrcode={{qrConfig.qrcode==true}}&customerrate={{qrConfig.customerrate==true}}"
download><i class="fa fa-download"></i> Download QR Board Image (微信支付水晶立牌)</a>
</p>
<p>
<a ng-href="/sys/partners/{{partner.client_moniker}}/poster" target="_blank"><i class="fa fa-download"></i> Download Poster (微信支付海报)</a>
</p>
<p>
<a ng-href="/sys/partners/{{partner.client_moniker}}/activities/alipayluckmoney/poster" target="_blank">
<i class="fa fa-download"></i> Alipay Lucky Money Poster (支付宝店长红包海报)
</a>
</p>
<!--<p>-->
<!--<a ng-href="/sys/partners/{{partner.client_moniker}}/qrcode_board?currency={{qrConfig.currency}}&preauth={{qrConfig.preauth==true}}&qrcode={{qrConfig.qrcode==true}}&customerrate={{qrConfig.customerrate==true}}"-->
<!--download><i class="fa fa-download"></i> Download QR Board Image (微信支付水晶立牌)</a>-->
<!--</p>-->
<!--<p>-->
<!--<a ng-href="/sys/partners/{{partner.client_moniker}}/poster" target="_blank"><i class="fa fa-download"></i> Download Poster (微信支付海报)</a>-->
<!--</p>-->
<!--<p>-->
<!--<a ng-href="/sys/partners/{{partner.client_moniker}}/activities/alipayluckmoney/poster" target="_blank">-->
<!--<i class="fa fa-download"></i> Alipay Lucky Money Poster (支付宝店长红包海报)-->
<!--</a>-->
<!--</p>-->
<p>
<a ng-href="/sys/partners/{{partner.client_moniker}}/poster/aggregate" target="_blank"><i class="fa fa-download"></i> Download Aggregate Poster (聚合支付海报)</a>
</p>

Write Preview
Loading…
Cancel
Save