Merge branch 'hotfix' into develop

master
kira 6 years ago
commit 96298f95d4

@ -120,7 +120,7 @@
<p class="form-control-static" ng-bind="order.customer_payment_amount|currency:order.currency+' '"></p> <p class="form-control-static" ng-bind="order.customer_payment_amount|currency:order.currency+' '"></p>
</div> </div>
</div> </div>
<div class="form-group" ng-if="order.status>=5"> <div class="form-group" ng-if="order.status>=5 && order.channel!='hf'">
<label class="control-label col-xs-3">Exchange Rate</label> <label class="control-label col-xs-3">Exchange Rate</label>
<div class="col-xs-9"> <div class="col-xs-9">
<p class="form-control-static" ng-bind="order.exchange_rate"></p> <p class="form-control-static" ng-bind="order.exchange_rate"></p>

@ -211,7 +211,7 @@
<p ng-if="trade.trans_type=='clearing'"> <p ng-if="trade.trans_type=='clearing'">
- -
</p> </p>
<p ng-if="trade.trans_type !='clearing'"> <p ng-if="trade.trans_type !='clearing' && trade.channel!='hf'">
{{trade.exchange_rate}} {{trade.exchange_rate}}
</p> </p>
</td> </td>

@ -194,7 +194,9 @@
</td> </td>
<td ng-bind="trade.display_amount|currency:trade.currency"></td> <td ng-bind="trade.display_amount|currency:trade.currency"></td>
<td ng-bind="trade.clearing_amount|currency:'AUD '"></td> <td ng-bind="trade.clearing_amount|currency:'AUD '"></td>
<td ng-bind="trade.exchange_rate"></td> <td>
<span ng-if="trade.channel!='hf'" ng-bind="trade.exchange_rate"></span>
</td>
<td ng-bind="trade.status|tradeStatus"></td> <td ng-bind="trade.status|tradeStatus"></td>
<td ng-bind="trade.create_time"></td> <td ng-bind="trade.create_time"></td>
<td ng-bind="trade.gateway|tradeGateway"></td> <td ng-bind="trade.gateway|tradeGateway"></td>

@ -98,7 +98,7 @@
</table> </table>
</div> </div>
</div> </div>
<div class="form-group" ng-if="order.status>=5"> <div class="form-group" ng-if="order.status>=5 && order.channel!='hf'">
<label class="control-label col-xs-3">Exchange Rate</label> <label class="control-label col-xs-3">Exchange Rate</label>
<div class="col-xs-9"> <div class="col-xs-9">
<p class="form-control-static" ng-bind="order.exchange_rate"></p> <p class="form-control-static" ng-bind="order.exchange_rate"></p>

@ -332,7 +332,9 @@
<td ng-bind="trade.display_amount|currency:trade.currency"></td> <td ng-bind="trade.display_amount|currency:trade.currency"></td>
<td ng-bind="trade.clearing_amount|currency:'AUD '"></td> <td ng-bind="trade.clearing_amount|currency:'AUD '"></td>
<td ng-bind="trade.settle_amount|currency:'AUD '"></td> <td ng-bind="trade.settle_amount|currency:'AUD '"></td>
<td ng-bind="trade.exchange_rate"></td> <td>
<span ng-if="trade.channel!='hf'" ng-bind="trade.exchange_rate"></span>
</td>
<td ng-bind="trade.status|tradeStatus"></td> <td ng-bind="trade.status|tradeStatus"></td>
<td ng-bind="trade.create_time"></td> <td ng-bind="trade.create_time"></td>
<td ng-bind="trade.gateway|tradeGateway"></td> <td ng-bind="trade.gateway|tradeGateway"></td>

@ -360,7 +360,9 @@
</td> </td>
<td ng-bind="trade.display_amount|currency:trade.currency"></td> <td ng-bind="trade.display_amount|currency:trade.currency"></td>
<td ng-bind="trade.clearing_amount|currency:'AUD'"></td> <td ng-bind="trade.clearing_amount|currency:'AUD'"></td>
<td ng-bind="trade.exchange_rate"></td> <td>
<span ng-if="trade.channel!='hf'" ng-bind="trade.exchange_rate"></span>
</td>
<td ng-bind="trade.status|tradeStatus"></td> <td ng-bind="trade.status|tradeStatus"></td>
<td ng-bind="trade.create_time"></td> <td ng-bind="trade.create_time"></td>
<td ng-bind="trade.gateway|tradeGateway"></td> <td ng-bind="trade.gateway|tradeGateway"></td>

@ -125,7 +125,9 @@
ng-click="showRefundLog(trade.order_id)">(-{{trade.refund_fee}})</a> ng-click="showRefundLog(trade.order_id)">(-{{trade.refund_fee}})</a>
</td> </td>
<td ng-bind="trade.clearing_amount|currency:'AUD '"></td> <td ng-bind="trade.clearing_amount|currency:'AUD '"></td>
<td ng-bind="trade.exchange_rate"></td> <td>
<span ng-if="trade.channel!='hf'" ng-bind="trade.exchange_rate"></span>
</td>
<td ng-bind="trade.status|tradeStatus"></td> <td ng-bind="trade.status|tradeStatus"></td>
<td ng-bind="trade.create_time"></td> <td ng-bind="trade.create_time"></td>
<td ng-bind="trade.gateway|tradeGateway"></td> <td ng-bind="trade.gateway|tradeGateway"></td>

Loading…
Cancel
Save