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

README.md

@@ -8,28 +8,21 @@ Things you may want to cover:
 ruby 2.4.1p111
 
 * Membership Details
+Osaka =>
+	Auth Token       => wu8YvlLmah0CL => New => v3
+			         => rj0MJ0XI5GsKZehE => Old => v
+			         => code2lab => Old
 
-	Osaka
+	Merchant account => RxzaYyAGzm7VqAZ4hKnv
+	Campaign Id      => {"campaign_type_id": 5}
 
-		Auth Token        => wu8YvlLmah0CL => New 	##note : Old => rj0MJ0XI5GsKZehE
+BITP
+	Auth Token       => pZBHXEFbGNj/G => New  => V3 
+					 => rj0MJ0XI5GsKZehE => Old  => V2
+					 => code2lab => Old
 
-						  => code2lab => Old
-
-		Merchant account  => RxzaYyAGzm7VqAZ4hKnv
-
-	    Campaign Id       => {"campaign_type_id": 5}
-
-
-
-    BITP
-
-		Auth Token        => pZBHXEFbGNj/G => New   ##note : Old => rj0MJ0XI5GsKZehE
-
-						  => code2lab => Old
-
-		Merchant account  => vWSsseoZCzxd6xcNf_uS
-		
-	    Campaign Id       => {"campaign_type_id": 1}
+	Merchant account => vWSsseoZCzxd6xcNf_uS
+    Campaign Id      => {"campaign_type_id": 1}
 
 java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
 
@@ -105,7 +98,12 @@ Change type in mysql
 
 For split bill
 	1) settings/lookups => { type:split_bill, name:SplitBill, value:1 }
-	
+
+For Sidekiq
+    1) If you want to use  sidekiq
+       => Create New Lookups => lookup_type = sidekiq, Name = sidekiq , Value = 1 or 0
+
+For Check CUp status	
 ###please open 	
 sudo cat /etc/sudoers
 ### cope and parse

app/models/order.rb

@@ -290,7 +290,7 @@ class Order < ApplicationRecord
     cup_status   = `#{"sudo service cups status"}`
     print_status = check_cup_status(cup_status)
     sidekiq      = Lookup.find_by_lookup_type("sidekiq")
-
+ 
     if print_status
       if !sidekiq.nil?
         OrderQueueProcessorJob.perform_later(self.id, self.table_id)

app/views/oqs/home/index.html.erb

@@ -1,5 +1,5 @@
 <!-- Column One -->
-<div class="row clearfix" style="margin-top:-50px !important">
+<div class="row clearfix" style="">
   <div class="col-lg-11 col-md-11 col-sm-11">  
     <div class="body p-l-10">
       <div class="row clearfix">
@@ -20,7 +20,6 @@
           <select class="form-control select tables" name="table_id" id="tables">
             <option value="">Select Table</option>
             <% @tables.each do |table|  %>
-              
               <option value="<%= table.id %>" data-id="<%= table.id %>"> <%= table.name %></option>
               
             <% end %> 

config/initializers/action_controller.rb

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