fixed conflix after pull split bill

2018-02-19 14:21:26 +06:30
parent 476f7425a2 9594689f1c
commit c064f9d6f5
24 changed files with 977 additions and 275 deletions
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -251,8 +251,8 @@ $('#back').on('click',function(){

 function warnBeforeRedirect(linkURL) {
    swal({
-      title: "Oops", 
-      text: "Are you sure you want to Logout ?", 
+      title: "Alert!", 
+      text: "Are you sure you want to close cashier?", 
      type: "warning",
      showCancelButton: true
    }, function() {