edit addorder loading to oqs_loading

app/assets/javascripts/addorder.js

@@ -1,9 +1,8 @@
-$(function(){
+$(function() { 
   //click menu sidebar menu category
   $(".product").on("click", function(){
     var url = $(this).attr('data-ref');
     show_product_list(url); 
-    console.log(url)
   }); 
   //show menu item list when click menu category
   function show_product_list(url_item){ 
@@ -635,8 +634,9 @@ $(function(){
 
   // Pay Discount for Payment
   $("#create_order").on('click', function(e){
+    $(this).attr('disabled', 'disabled');
     e.preventDefault();
-    $("#loading_wrapper").show();
+    $("#oqs_loading_wrapper").show();
     var table_id   = $('#table_id').text();
     var booking_id = $('#booking_id').text();
     if (!booking_id.length > 0) {
@@ -651,32 +651,32 @@ $(function(){
 
     var ajax_url = '../addorders/create'; 
     
-
     var params = {'order_source': "cashier", 'order_type': "dine_in",
                   'customer_id': "", 'guest_info': "",
                   'table_id': table_id, 
                   'order_items': order_items };
-
     $.ajax({
       type: "POST",
       url: ajax_url,
       data: params,
       dataType: "json",
       success:function(result){         
-        $("#loading_wrapper").hide(); 
+        $("#oqs_loading_wrapper").hide(); 
         swal({
           title: "Information !",
           text: 'Order has been successfully created',
           confirmButtonColor: "green",
           confirmButtonText: "Yes!",
           closeOnConfirm: false,
-        }, function () {
+        }, function (isConfirm) {
+          if (isConfirm) {
             if(table_type == "Table"){
               window.location.href = "/origami/table/" + table_id
             }
             else {
               window.location.href = "/origami/room/" + table_id
             }  
+          }  
         });                 
       }
     });

app/assets/stylesheets/addorder.scss

@@ -128,8 +128,7 @@ section.content{
 
 /*Loading gif for payment*/
 
-#loading_wrapper{
-
+#oqs_loading_wrapper{
     position: fixed;
     background-color: #C8C8C8 ;
     height: 100%;
@@ -137,9 +136,9 @@ section.content{
     left: 0;
     opacity: 0.6;
     top: 0;
-    z-index: 9999999;
+    z-index: 100;
 }
-#loading{
+#oqs_loading{
     position: relative;
     height: 100%;
     width: 100%;
@@ -147,9 +146,9 @@ section.content{
     background-position:  center center;
     background-repeat: no-repeat;
     opacity: 1;
+    z-index: 101;
     filter: alpha(opacity=100); /* ie */
     -moz-opacity: 1; /* mozilla */       
-        
 }
 
 #count ,#set_count{

app/views/origami/addorders/detail.html.erb

@@ -1,8 +1,9 @@
 <%= stylesheet_link_tag    'addorder', media: 'all', 'data-turbolinks-track': 'reload' %>
 <%= javascript_include_tag 'addorder', 'data-turbolinks-track': 'reload' %> 
-<div id="loading_wrapper" style="display:none;">
-    <div id="loading"></div>
-  </div>
+<div id="oqs_loading_wrapper" style="display:none;">
+  <div id="oqs_loading"></div>
+</div>
+
 <div class="row m-t--20">
     <div class="col-lg-2 col-md-2 col-sm-2">
         <ul class="nav nav-tabs flex-column" role="tablist" >