master
kira 6 years ago
parent 1fce5a3dc2
commit 3e823958fa

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>au.com.royalpay.payment</groupId> <groupId>au.com.royalpay.payment</groupId>
<artifactId>payment-parent</artifactId> <artifactId>payment-parent</artifactId>
<version>0.2.0-dev</version> <version>0.2.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

@ -22,10 +22,11 @@
pmt_custom_reports r pmt_custom_reports r
on r.order_id = o.order_id on r.order_id = o.order_id
and o.client_id = #{client_id} and o.client_id = #{client_id}
and o.channel = 'Alipay'
<where> <where>
<if test="channel!=null"> <!--<if test="channel!=null">-->
and o.channel = #{channel} <!--and o.channel = #{channel}-->
</if> <!--</if>-->
<if test="date!=null"> <if test="date!=null">
and DATE(t.transaction_time) = #{date} and DATE(t.transaction_time) = #{date}
</if> </if>

@ -932,7 +932,7 @@ margin-bottom: 10%;"/>
</a> </a>
</li> </li>
<li> <li ng-if="currentUser.client.client_moniker=='WOWW'">
<a ui-sref="custom"> <a ui-sref="custom">
Declare Custom Declare Custom
</a> </a>

@ -42,7 +42,6 @@
}] }]
} }
}).result.then(function () { }).result.then(function () {
alert(1);
$scope.loadList(1); $scope.loadList(1);
}) })

@ -21,7 +21,7 @@
<div class="box box-warning"> <div class="box box-warning">
<div class="box-header"> <div class="box-header">
<div class="form-horizontal col-sm-8"> <div class="form-horizontal col-sm-8">
<div class="form-group"> <!-- <div class="form-group">
<label class="control-label col-xs-4 col-sm-3">Channel</label> <label class="control-label col-xs-4 col-sm-3">Channel</label>
<div class="col-xs-8 col-sm-6"> <div class="col-xs-8 col-sm-6">
<p class="form-control-static"> <p class="form-control-static">
@ -33,7 +33,7 @@
ng-click="params.channel='Alipay';loadList()">Alipay</a> | ng-click="params.channel='Alipay';loadList()">Alipay</a> |
</p> </p>
</div> </div>
</div> </div>-->
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-4 col-sm-3">Report Status</label> <label class="control-label col-xs-4 col-sm-3">Report Status</label>
<div class="col-xs-8 col-sm-6"> <div class="col-xs-8 col-sm-6">

Loading…
Cancel
Save