update commitssion

This commit is contained in:
Aung Myo
2018-05-23 16:33:20 +06:30
parent 055ca1c95b
commit 6236e06558
2 changed files with 8 additions and 5 deletions

View File

@@ -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

View File

@@ -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')