Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into cloud

2018-01-12 17:11:48 +06:30
parent f214be8847 a8a86e3202
commit 89bdf83891
2 changed files with 38 additions and 23 deletions
--- a/app/views/origami/shifts/show.html.erb
+++ b/app/views/origami/shifts/show.html.erb
@@ -168,6 +168,17 @@
            }
            else if(payment_type == "CUP"){
              $("#loading_wrapper").hide();
+              swal({
+                title: 'Information!',
+                text: 'Settlement is successfully.',
+                type: 'success',
+                html: true,
+                closeOnConfirm: false,
+                closeOnCancel: false,
+                allowOutsideClick: false
+              }, function () {
+                window.location.href = '/origami/shift/close';
+              });
              // reqCBBankAlipaySettlement();
            }
            // else if(payment_type == "Alipay"){