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

2018-05-23 17:00:34 +06:30
parent 85b997ddbe 055ca1c95b
commit 917b4e0eed
3 changed files with 3 additions and 2 deletions
--- a/app/controllers/origami/product_commissions_controller.rb
+++ b/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