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

app/controllers/origami/product_commissions_controller.rb

@@ -91,7 +91,7 @@ class Origami::ProductCommissionsController < BaseOrigamiController
     # @commission = Commission.where('product_code = ? AND is_active = ?', @menu_item.item_code, true).take
      
     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)
         break
       end

db/migrate/20170403155230_create_employees.rb

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