From 28e6bcc2f1726ba8993182bc051bc55b12fe5176 Mon Sep 17 00:00:00 2001
From: liuxinxin <xinxin.liu@geekforbest.com>
Date: Wed, 4 Dec 2019 15:22:25 +0800
Subject: [PATCH] [R] R Services fix

---
 src/main/ui/static/invoice/templates/invoice_assistant.html     | 2 +-
 .../ui/static/payment/tradelog/templates/balance_report.html    | 2 +-
 .../static/payment/tradelog/templates/partner_trade_logs.html   | 2 +-
 src/main/ui/static/payment/tradelog/templates/trade_logs.html   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html
index ce19512fe..db2d8efe6 100644
--- a/src/main/ui/static/invoice/templates/invoice_assistant.html
+++ b/src/main/ui/static/invoice/templates/invoice_assistant.html
@@ -212,7 +212,7 @@
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
                                     <img src="/static/images/rpayplus_sign.png"
                                          uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
-                                    {{trade.order_id2}}<span ng-if="trade.source!='system' && trade.incremental_surcharge != null"><i class="fa fa-question-circle-o"  uib-tooltip-html="trade.htmlTooltip"></i></span>
+                                    {{trade.order_id2}}<span ng-if="trade.source!='system' && trade.source!=null && trade.incremental_surcharge != null"><i class="fa fa-question-circle-o"  uib-tooltip-html="trade.htmlTooltip"></i></span>
                                 </td>
                                 <td ng-bind="trade.currency"></td>
                                 <td ng-bind="trade.display_amount"></td>
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index a7068a157..1c788a8e1 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -335,7 +335,7 @@
                                          uib-tooltip="Yeepay" ng-if="trade.channel=='Yeepay'"/>
                                     <img src="/static/images/lakalapay_sign.png"
                                          uib-tooltip="LakalaPay" ng-if="trade.channel=='LakalaPay'"/>
-                                    {{trade.order_id2}}<span ng-if="trade.source!='system' && trade.incremental_surcharge != null"><i class="fa fa-question-circle-o"  uib-tooltip-html="trade.htmlTooltip"></i></span>
+                                    {{trade.order_id2}}<span ng-if="trade.source!='system' && trade.source!=null && trade.incremental_surcharge != null"><i class="fa fa-question-circle-o"  uib-tooltip-html="trade.htmlTooltip"></i></span>
                                 </td>
                                 <td ng-bind="trade.currency"></td>
                                 <td ng-bind="trade.display_amount"></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 b1c4aa8ad..3c423f3d9 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
@@ -431,7 +431,7 @@
                                      <img src="/static/images/rpayplus_sign.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                      <img src="/static/images/yeepay_sign.png" uib-tooltip="Yeepay" ng-if="trade.channel=='Yeepay'"/>
                                      <img src="/static/images/lakalapay_sign.png" uib-tooltip="LakalaPay" ng-if="trade.channel=='LakalaPay'"/>
-                                     {{trade.order_id}}<span ng-if="trade.source!='system' && trade.incremental_surcharge != null"><i class="fa fa-question-circle-o"  uib-tooltip-html="trade.htmlTooltip"></i></span>
+                                     {{trade.order_id}}<span ng-if="trade.source!='system' && trade.source!=null && trade.incremental_surcharge != null"><i class="fa fa-question-circle-o"  uib-tooltip-html="trade.htmlTooltip"></i></span>
                                  </td>
                                  <td>
                                      {{trade.total_amount|currency:trade.currency+' '}}
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 61f08ded5..f9c13b131 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -486,7 +486,7 @@
                                          uib-tooltip="Yeepay" ng-if="trade.channel=='Yeepay'"/>
                                     <img src="/static/images/lakalapay_sign.png"
                                          uib-tooltip="LakalaPay" ng-if="trade.channel=='LakalaPay'"/>
-                                    {{trade.order_id}}<span ng-if="trade.source!='system' && trade.incremental_surcharge != null"><i class="fa fa-question-circle-o"  uib-tooltip-html="trade.htmlTooltip"></i></span>
+                                    {{trade.order_id}}<span ng-if="trade.source!='system'&& trade.source!=null && trade.incremental_surcharge != null"><i class="fa fa-question-circle-o"  uib-tooltip-html="trade.htmlTooltip"></i></span>
                                 </td>
                                 <td>
                                     {{trade.total_amount|currency:trade.currency}}