Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into HEAD

app/controllers/home_controller.rb

@@ -100,7 +100,7 @@ class HomeController < ApplicationController
     @sales = Sale.receipt_date_between(@from, @to).completed
 
     if current_user.present? && !(current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account'  || current_user.role == 'supervisor')
-      if shift = ShiftSale.current_open_shift(current_user.id)
+      if shift = ShiftSale.current_open_shift(current_user)
         @orders = @orders.where(shift_sale_id: shift.id)
         @sales = @sales.where(shift_sale_id: shift.id)
       end

app/controllers/origami/payments_controller.rb

@@ -192,7 +192,7 @@ class Origami::PaymentsController < BaseOrigamiController
         end
 
         #card_balance amount for Paymal payment
-        card_balance_amount, transaction_ref = SaleAudit.getCardBalanceAmount(sale_id)
+        card_balance_amount,transaction_ref = SaleAudit.getCardBalanceAmount(sale_id)
 
         # get printer info
         print_settings = PrintSetting.find_by_unique_code(unique_code)

app/controllers/origami/shifts_controller.rb

@@ -126,7 +126,7 @@ class Origami::ShiftsController < BaseOrigamiController
           if find_close_cashier_print[0][1].to_i > 0
 
 
-            printer.print_close_cashier(print_settings,cashier_terminal,current_shop, @sale_items, @total_other_charges_info, current_shop,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges,@total_waste,@total_spoile,@total_credit_payments)
+            printer.print_close_cashier(print_settings,cashier_terminal, @shift, @sale_items, @total_other_charges_info, current_shop,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges,@total_waste,@total_spoile,@total_credit_payments)
           end
       end
     end

app/controllers/settings/employees_controller.rb

@@ -1,6 +1,6 @@
 class Settings::EmployeesController < ApplicationController
   load_and_authorize_resource
-  before_action :set_employee, only: [:show, :edit, :update, :destroy]
+  before_action :set_employee, only: [:show, :edit, :update, :destroy, :change_auth_token]
 
 
   # GET /employees
@@ -38,6 +38,13 @@ class Settings::EmployeesController < ApplicationController
         format.html { render :new }
       end
     end
+  end 
+
+  def change_app_token
+    @employee.app_token = @employee.generate_app_token #SecureRandom.hex(10)
+    @employee.save
+    flash[:notice] = 'Auth Token was successfully updated.' 
+    redirect_to settings_employee_url(@employee)
   end
 
   # PATCH/PUT /employees/1
@@ -71,6 +78,6 @@ class Settings::EmployeesController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def employee_params
-      params.require(:employee).permit(:name, :role, :is_active, :emp_id, :password,:order_queue_station_id, :image_path)
+      params.require(:employee).permit(:name, :role, :is_active, :emp_id, :password,:order_queue_station_id, :image_path, :app_id, :app_token)
     end
 end