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

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

@@ -142,7 +142,7 @@ $(function() {
     });
 
     // QR Code Reader
-    $("#qr_code").on('sclick', function(e){
+    $("#qr_code").on('click', function(e){
         var code = "";        
         setTimeout(function(){
            code=getQRCode();

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

@@ -368,6 +368,7 @@
       setTimeout(function(){
         code=getQRCode();  
         setQRCode(code);
+      }, 100);
 
       customer_mamber_card_no = $("#search").val();
       
@@ -392,11 +393,9 @@
               customer_name = data[0].name;
               update_sale(customer_id, customer_name,sale_id);
             }
-
           }
         });   
       }            
-      },100);
   });
 
   // Read qrcode from java

app/views/origami/payments/show.html.erb

@@ -1134,6 +1134,9 @@ var customer_name = "<%= @customer.name %>";
     var membership_type = '';    
     setTimeout(function(){
       code=getQRCode(); 
+      $("#qr_code").val(code);
+    });
+
     if(sale_id != 0 && code != ""){    
       $.ajax({
         type: "POST",
@@ -1154,13 +1157,11 @@ var customer_name = "<%= @customer.name %>";
         }
       });                
     }             
-    },100);
   });
 
   // Read qrcode from java
   function getQRCode(){
     return code2lab.readQRCode();    
-    $("#qr_code").val(code);  
   }
 
   function update_sale(membership_id, customer_id, customer_name, sale_id) {

config/initializers/action_controller.rb

@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      if check_license
+      # if check_license
-        current_license(ENV["SX_PROVISION_URL"])
+      #   current_license(ENV["SX_PROVISION_URL"])
-      else
+      # else
-        redirect_to activate_path
+      #   redirect_to activate_path
-      end      
+      # end      
     end    
   end