Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage

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

@@ -1,10 +1,10 @@
-window.onbeforeunload = function(e) {
+window.onbeforeunload = function (e) {
     return '页面已过期|Page Expired';
 };
 $(function () {
     var ctrl = {doubled: false, accessed: false};
     $('.coin').click(function () {
-        if(ctrl.accessed && !ctrl.doubled){
+        if (ctrl.accessed && !ctrl.doubled) {
             var coin = $(this);
             coin.addClass('throwing');
             $.ajax({
@@ -15,20 +15,21 @@ $(function () {
                     $('.encourage-dialog .money-amount').html(encourage.actural_amount);
                     $('.encourage-dialog .double-rate').html('X ' + encourage.factor);
                     $('.encourage-dialog .double-text').hide();
-                    setTimeout(function(){
+                    setTimeout(function () {
                         coin.removeClass('throwing');
-                    },1000);
+                    }, 1000);
                 },
                 error: function () {
-                    setTimeout(function(){
+                    setTimeout(function () {
                         coin.removeClass('throwing');
-                    },1000);
+                    }, 1000);
                 }
             });
             ctrl.doubled = true;
         }
 
     });
+
     function loadEncourage() {
         $.ajax({
             url: '/act/encourage_money/orders/' + window.order_id,
@@ -39,28 +40,32 @@ $(function () {
                     $('.encourage-dialog .money-amount').html(encourage.actural_amount);
                     $('.encourage-dialog .double-rate').html('X ' + encourage.factor);
                     $('.encourage-dialog').removeClass('hide');
-                    ctrl.accessed=true;
+                    ctrl.accessed = true;
                 }
             }
         })
     }
+
     loadEncourage();
 
     function loadPoints() {
-        $.ajax({
-            url: '/customers/points/' + window.order_id +'/check',
-            method: 'GET',
-            dataType: 'text',
-            success: function (data) {
-                if (data>0){
-                    $('.points-dialog .points-value').html('+ ' + data);
-                    $('.points-dialog').removeClass('hide');
-                }
+        if ([0, 1, 2, 11].indexOf(window.order_gateway) >= 0) {
+            $.ajax({
+                url: '/customers/points/' + window.order_id + '/check',
+                method: 'GET',
+                dataType: 'text',
+                success: function (data) {
+                    if (data > 0) {
+                        $('.points-dialog .points-value').html('+ ' + data);
+                        $('.points-dialog').removeClass('hide');
+                    }
 
-            },error:function () {
-            }
-        });
+                }, error: function () {
+                }
+            });
+        }
     }
+
     loadPoints();
 
     $('.encourage-dialog .close-circle').click(function () {