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

app/controllers/concerns/license_verification.rb

@@ -13,7 +13,7 @@ module LicenseVerification
       if (!@license.nil?)
         # logger.info "Location - " + @license.name        
         ActiveRecord::Base.establish_connection(website_connection(@license))    
-        authenticate_session_token    
+        # authenticate_session_token    
         # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
       else
         # reconnect_default_db
@@ -29,6 +29,7 @@ module LicenseVerification
       #   redirect_to activate_path
       # end      
     end
+    authenticate_session_token
   end
 
   def authenticate_session_token
@@ -38,8 +39,12 @@ module LicenseVerification
       #Rails.logger.debug "token - " + token.to_s
 
       @user = Employee.authenticate_by_token(token)
-      if !@user      
+      if @user
+        return true
+        #Maybe log - login?
+      else 
         flash[:notice] = 'Invalid Access!'
+        # return false
       end
     end
   end

app/controllers/concerns/login_verification.rb

@@ -2,10 +2,25 @@ module LoginVerification
   extend ActiveSupport::Concern
 
   included do
-    before_action :authenticate
+    before_action :authenticate_session_token
     helper_method :current_company,:current_login_employee
   end
 
+  #this is base api base controller to need to inherit.
+  #all token authentication must be done here
+  #response format must be set to JSON
+  def current_company
+    begin
+     return Company.first
+    rescue
+      return nil
+    end
+
+  end
+
+  def current_login_employee
+    @employee = Employee.find_by_token_session(session[:session_token])
+  end
 
   protected
   # Authenticate the user with token based authentication
@@ -25,6 +40,7 @@ module LoginVerification
         #Maybe log - login?
       else 
         flash[:notice] = 'Invalid Access!'
+        # return false
       end
     end
   end
@@ -33,23 +49,6 @@ module LoginVerification
     redirect_to root_path
   end
 
-
-  #this is base api base controller to need to inherit.
-  #all token authentication must be done here
-  #response format must be set to JSON
-  def current_company
-    begin
-     return Company.first
-    rescue
-      return nil
-    end
-
-  end
-
-  def current_login_employee
-    @employee = Employee.find_by_token_session(session[:session_token])
-  end
-
   private
   def check_license
     License.check_license_file 

app/controllers/home_controller.rb

@@ -5,7 +5,7 @@ class HomeController < ApplicationController
   def index
     # @employees = Employee.all_emp_except_waiter.order("name asc")
     @employees = Employee.all.order("name asc")
-     @login_form = LoginForm.new()
+    @login_form = LoginForm.new()
     render "layouts/login_dashboard", layout: false
   end
 
@@ -56,7 +56,7 @@ class HomeController < ApplicationController
          render :index
       end
     else
-      redirect_to origami_root_path, :notice => "Username and Password doesn't match!"
+      redirect_to root_path, :notice => "Username and Password doesn't match!"
     end
 
   end

app/controllers/origami/payments_controller.rb

@@ -87,7 +87,7 @@ class Origami::PaymentsController < BaseOrigamiController
       #end rounding adjustment
 
       sale_payment = SalePayment.new
-      sale_payment.process_payment(saleObj, @user, cash, "cash")
+      sale_payment.process_payment(saleObj, @usercurrent_user.name, cash, "cash")
 
       render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error "})
       rebate_amount = nil
@@ -300,6 +300,7 @@ class Origami::PaymentsController < BaseOrigamiController
     cash          = params[:cash]
     sale_id       = params[:sale_id]
     sub_total       = params[:sub_total]
+    remark       = params[:remark]
     member_info   = nil
     rebate_amount = nil
     current_balance = nil
@@ -313,7 +314,7 @@ class Origami::PaymentsController < BaseOrigamiController
       end
       
       sale_payment = SalePayment.new
-      sale_payment.process_payment(saleObj, @user, cash, "foc")
+      sale_payment.process_payment(saleObj, current_user.name, cash, "foc" ,remark)
 
       # For Cashier by Zone
       bookings = Booking.where("sale_id='#{sale_id}'")

app/controllers/origami/void_controller.rb

@@ -3,7 +3,7 @@ class Origami::VoidController < BaseOrigamiController
   def overall_void
 
     sale_id = params[:sale_id]
-
+    remark  = params[:remark]
     if Sale.exists?(sale_id)
       sale = Sale.find_by_sale_id(sale_id)
       if sale.discount_type == "member_discount"
@@ -64,8 +64,8 @@ class Origami::VoidController < BaseOrigamiController
       end
 
       # FOr Sale Audit 
-      action_by = current_user.id
-      remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
+      action_by = current_user.name
+      # remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
       sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, action_by,remark,"SALEVOID" )
 
       # For Print