Merge remote-tracking branch 'origin/develop' into develop

src/main/ui/static/commons/templates/order_detail.html

@@ -120,7 +120,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">
+                <div class="form-group" ng-if="order.status>=5 && order.channel!='hf'">
                     <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>

src/main/ui/static/payment/invoice/templates/invoice.html

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

src/main/ui/static/payment/partner/templates/partner_pay_logs.html

@@ -194,7 +194,9 @@
                     </td>
                     <td ng-bind="trade.display_amount|currency:trade.currency"></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.create_time"></td>
                     <td ng-bind="trade.gateway|tradeGateway"></td>

src/main/ui/static/payment/tradelog/templates/partner_trade_detail_edit.html

@@ -98,7 +98,7 @@
                             </table>
                         </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>
                         <div class="col-xs-9">
                             <p class="form-control-static" ng-bind="order.exchange_rate"></p>

src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html

@@ -332,7 +332,9 @@
                                  <td ng-bind="trade.display_amount|currency:trade.currency"></td>
                                  <td ng-bind="trade.clearing_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.create_time"></td>
                                  <td ng-bind="trade.gateway|tradeGateway"></td>

src/main/ui/static/payment/tradelog/templates/trade_logs.html

@@ -360,7 +360,9 @@
                                 </td>
                                 <td ng-bind="trade.display_amount|currency:trade.currency"></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.create_time"></td>
                                 <td ng-bind="trade.gateway|tradeGateway"></td>

src/main/ui/static/payment/vipcustomer/templates/vipcustomer_detail.html

@@ -125,7 +125,9 @@
                                                ng-click="showRefundLog(trade.order_id)">(-{{trade.refund_fee}})</a>
                                         </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.create_time"></td>
                                         <td ng-bind="trade.gateway|tradeGateway"></td>