master
taylor.dang 6 years ago
parent c90d1e2c5a
commit 66ead63d38

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

@ -213,7 +213,7 @@
<p ng-if="trade.trans_type=='clearing'">
-
</p>
<p ng-if="trade.trans_type !='clearing' && trade.channel!='hf'">
<p ng-if="trade.trans_type !='clearing' && (order.channel!='hf'||order.channel!='Rpay')">
{{trade.exchange_rate}}
</p>
</td>

@ -198,7 +198,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'" 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>
<td ng-bind="trade.create_time"></td>

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

@ -336,7 +336,8 @@
<td ng-bind="trade.clearing_amount|currency:'AUD '"></td>
<td ng-bind="trade.settle_amount|currency:'AUD '"></td>
<td>
<span ng-if="trade.channel!='hf'" 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>
<td ng-bind="trade.create_time"></td>

@ -365,7 +365,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'" 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>
<td ng-bind="trade.create_time"></td>

@ -126,7 +126,8 @@
</td>
<td ng-bind="trade.clearing_amount|currency:'AUD '"></td>
<td>
<span ng-if="trade.channel!='hf'" 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>
<td ng-bind="trade.create_time"></td>

Loading…
Cancel
Save