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

update commitssion

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,12 +90,15 @@ class Origami::ProductCommissionsController < BaseOrigamiController
@menu_item = MenuItem.find_by_item_code(@sale_item.product_code) @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 = Commission.where('product_code = ? AND is_active = ?', @menu_item.item_code, true).take
Commission.all.each do |com| Commission.all.active.each do |com|
if com.product_code.include? @menu_item.item_code && com.is_active == true puts com.product_code != "[]"
if com.product_code != "[]"
if com.product_code.to_s.include? @menu_item.item_code
@commission = Commission.find(com.id) @commission = Commission.find(com.id)
break break
end end
end end
end
@commissioner = Commissioner.where('id = ? AND is_active = ?', commissioner_id, true).take @commissioner = Commissioner.where('id = ? AND is_active = ?', commissioner_id, true).take
@product_commission = ProductCommission.where('sale_item_id = ?', @sale_item.id).take @product_commission = ProductCommission.where('sale_item_id = ?', @sale_item.id).take
if !@commission.nil? && @commissioner.commission_id == @commission.commission_id if !@commission.nil? && @commissioner.commission_id == @commission.commission_id

2
app/models/commission.rb
View File

@@ -10,7 +10,7 @@ class Commission < ApplicationRecord
# validations # validations
validates_presence_of :name, :commission_type, :amount validates_presence_of :name, :commission_type, :amount
scope :active, -> {where(is_active: true)}
private private
def generate_custom_id def generate_custom_id
self.commission_id = SeedGenerator.generate_id(self.class.name, 'COM') self.commission_id = SeedGenerator.generate_id(self.class.name, 'COM')