From 6236e06558618d2eabe3e27c168e8f40b43469d6 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 23 May 2018 16:33:20 +0630 Subject: [PATCH] update commitssion --- .../origami/product_commissions_controller.rb | 11 +++++++---- app/models/commission.rb | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/controllers/origami/product_commissions_controller.rb b/app/controllers/origami/product_commissions_controller.rb index 1156827a..7872573b 100755 --- a/app/controllers/origami/product_commissions_controller.rb +++ b/app/controllers/origami/product_commissions_controller.rb @@ -90,10 +90,13 @@ class Origami::ProductCommissionsController < BaseOrigamiController @menu_item = MenuItem.find_by_item_code(@sale_item.product_code) # @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.is_active == true - @commission = Commission.find(com.id) - break + Commission.all.active.each do |com| + puts com.product_code != "[]" + if com.product_code != "[]" + if com.product_code.to_s.include? @menu_item.item_code + @commission = Commission.find(com.id) + break + end end end @commissioner = Commissioner.where('id = ? AND is_active = ?', commissioner_id, true).take diff --git a/app/models/commission.rb b/app/models/commission.rb index e331eb59..32aa8a04 100755 --- a/app/models/commission.rb +++ b/app/models/commission.rb @@ -10,7 +10,7 @@ class Commission < ApplicationRecord # validations validates_presence_of :name, :commission_type, :amount - + scope :active, -> {where(is_active: true)} private def generate_custom_id self.commission_id = SeedGenerator.generate_id(self.class.name, 'COM')