Merge branch 'develop'

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

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

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

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

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

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

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

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

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

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

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

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

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

src/main/ui/static/templates/payment/success.css

@@ -352,7 +352,7 @@
 }
 .points-dialog .dialog-content{
     margin: auto;
-    width: 80%;
+    width: 90%;
     display: block;
     position: relative;
     margin-top: 100px;
@@ -383,12 +383,12 @@
     width: 100%;
     font-size: 14px;
     color: rgb(157, 255, 221);
-    margin-bottom: 24px;
+    margin-bottom: 10px;
 }
 
 .points-content .coin{
-    width: 80px;
+    width: 50px;
-    height: 80px;
+    height: 50px;
     position: relative;
     background: url(/static/images/star.png) no-repeat;
     background-size: contain;