git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
phyusin
2018-05-23 17:00:34 +06:30
parent 85b997ddbe 055ca1c95b
commit 917b4e0eed
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/product_commissions_controller.rb
View File

@@ -91,7 +91,7 @@ class Origami::ProductCommissionsController < BaseOrigamiController
# @commission = Commission.where('product_code = ? AND is_active = ?', @menu_item.item_code, true).take # @commission = Commission.where('product_code = ? AND is_active = ?', @menu_item.item_code, true).take
Commission.all.each do |com| Commission.all.each do |com|
if com.product_code.include? @menu_item.item_code && com.active == true if com.product_code.include? @menu_item.item_code && com.is_active == true
@commission = Commission.find(com.id) @commission = Commission.find(com.id)
break break
end end

2
config/initializers/action_controller.rb
View File

@@ -19,7 +19,7 @@ class ActionController::Base
render :json => [{ status: false, message: 'Invalid Access!'}] render :json => [{ status: false, message: 'Invalid Access!'}]
end end
else else
#check for license file # check for license file
if check_license if check_license
current_license(ENV["SX_PROVISION_URL"]) current_license(ENV["SX_PROVISION_URL"])
else else

1
db/migrate/20170403155230_create_employees.rb
View File

@@ -3,6 +3,7 @@ class CreateEmployees < ActiveRecord::Migration[5.1]
create_table :employees do |t| create_table :employees do |t|
t.string :name, :null => false t.string :name, :null => false
t.string :role, :null => false, :default => "cashier" t.string :role, :null => false, :default => "cashier"
t.boolean :is_active, :default => true
t.string :emp_id, :null => false t.string :emp_id, :null => false
t.string :password_digest, :null => false t.string :password_digest, :null => false
t.string :token_session t.string :token_session