Merge branch 'r-1902001-01' of gitlab.com:code2lab/SXRestaurant into r-1902001-01

app/views/crm/customers/index.html.erb

@@ -29,7 +29,9 @@
           </div>
           </div>
           <div class="row p-l-20 p-t-20">
-
+            <div id="oqs_loading_wrapper" style="display:none;">
+    <div id="oqs_loading"></div>
+  </div>
             <div class="col-lg-8 col-md-8 col-sm-8 col-xs-8">
               <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
                 <div class="row clearfix">
@@ -156,6 +158,7 @@
 
 <script type="text/javascript">
   $(document).ready(function () {
+    $("#oqs_loading_wrapper").show();
     localStorage.setItem("member_card",false);
     /*$('.datepicker').datepicker({
         format : 'dd-mm-yyyy',
@@ -176,6 +179,7 @@
       },100);
     });
 
+
     // QR Code Reader
     $("#qr_code").on('click', function(e){
         var code = "";
@@ -358,4 +362,8 @@
   $("#sxModal .btn_cancel").on('click',function(){
     $("#sxModal").hide();
   });
+  $('#filter_form').submit(function() {
+    $("#oqs_loading_wrapper").show();
+   return true
+  });
 </script>