Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop

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>

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

@@ -346,7 +346,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>

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

@@ -442,7 +442,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+' '}}

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}}