Merge branch 'develop'

master
yangkai 6 years ago
commit 6168190732

@ -132,6 +132,7 @@
<th>Transaction Amount</th> <th>Transaction Amount</th>
<th>Total Commission</th> <th>Total Commission</th>
<th>Send Commission</th> <th>Send Commission</th>
<th>Hold Commission</th>
<th>Prize Type</th> <th>Prize Type</th>
<th>Details</th> <th>Details</th>
</tr> </tr>
@ -148,6 +149,7 @@
<td>{{log.total_amount|currency:'AUD '}}</td> <td>{{log.total_amount|currency:'AUD '}}</td>
<td ng-bind="log.total_prize|currency:'AUD '"></td> <td ng-bind="log.total_prize|currency:'AUD '"></td>
<td ng-bind="log.send_prize|currency:'AUD '"></td> <td ng-bind="log.send_prize|currency:'AUD '"></td>
<td ng-bind="log.hold_prize|currency:'AUD '"></td>
<td> <td>
<span ng-if="log.prize_type==0">BD</span> <span ng-if="log.prize_type==0">BD</span>
<span ng-if="log.prize_type==1">Group</span> <span ng-if="log.prize_type==1">Group</span>

Loading…
Cancel
Save