From 5718465f3fc1ac047cbb27916eddf273d68f3991 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Thu, 20 Sep 2018 19:38:02 +0800
Subject: [PATCH] rpay

---
 .../ui/static/payment/partner/templates/partner_pay_logs.html   | 2 +-
 .../static/payment/tradelog/templates/partner_trade_logs.html   | 2 +-
 src/main/ui/static/payment/tradelog/templates/trade_logs.html   | 2 +-
 .../payment/vipcustomer/templates/vipcustomer_detail.html       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
index 38df75df9..630f9d6ab 100644
--- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
+++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
@@ -198,7 +198,7 @@
                     <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') || (trade.channel!='Rpay')" 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>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index eb1d35318..b69d79e45 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -336,7 +336,7 @@
                                  <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') || (trade.channel!='Rpay')" 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>
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 957cc9da3..977125376 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -365,7 +365,7 @@
                                 <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') || (trade.channel!='Rpay')" 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>
diff --git a/src/main/ui/static/payment/vipcustomer/templates/vipcustomer_detail.html b/src/main/ui/static/payment/vipcustomer/templates/vipcustomer_detail.html
index dde8ad87b..23c9510c8 100644
--- a/src/main/ui/static/payment/vipcustomer/templates/vipcustomer_detail.html
+++ b/src/main/ui/static/payment/vipcustomer/templates/vipcustomer_detail.html
@@ -126,7 +126,7 @@
                                         </td>
                                         <td ng-bind="trade.clearing_amount|currency:'AUD '"></td>
                                         <td>
-                                            <span ng-if="(trade.channel!='hf') || (trade.channel!='Rpay')" 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>