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

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

Browse Source
This commit is contained in:
Yan
2017-10-31 13:41:36 +06:30
parent 89381eb72b 1239b308f9
commit cd11841df1
21 changed files with 319 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/models/product_commission.rb
View File

@@ -38,16 +38,18 @@ class ProductCommission < ApplicationRecord
commission = Commission.where('product_code = ? AND is_active = ?', menu_item.id, true).take
product_commission = ProductCommission.where('sale_item_id = ?', saleItemObj.id).take
return if commission.nil?
product_commission.qty = saleItemObj.qty
if commission.commission_type == 'Percentage'
product_commission.price = saleItemObj.unit_price * (commission.amount / 100.0)
product_commission.amount = product_commission.price * saleItemObj.qty
elsif commission.commission_type == 'Net Amount'
product_commission.price = commission.amount
product_commission.amount = product_commission.price * saleItemObj.qty
if !product_commission.nil?
return if commission.nil?
product_commission.qty = saleItemObj.qty
if commission.commission_type == 'Percentage'
product_commission.price = saleItemObj.unit_price * (commission.amount / 100.0)
product_commission.amount = product_commission.price * saleItemObj.qty
elsif commission.commission_type == 'Net Amount'
product_commission.price = commission.amount
product_commission.amount = product_commission.price * saleItemObj.qty
end
product_commission.save
end
product_commission.save
puts 'Edit Product Commission Success'
end

18
app/models/sale_audit.rb
View File

@@ -30,11 +30,11 @@ class SaleAudit < ApplicationRecord
sale_audit.save!
end
def record_audit_discount(sale_id, discount_by, approved_by, reason)
def self.record_audit_discount(sale_id, discount_by, approved_by, reason,type)
#sale_audit
sale_audit = SaleAudit.new()
sale_audit.sale_id = sale_id
sale_audit.action = "SALEDISCOUNT"
sale_audit.action = type
sale_audit.action_at = DateTime.now.utc
sale_audit.action_by = discount_by
sale_audit.approved_by = approved_by
@@ -43,7 +43,7 @@ class SaleAudit < ApplicationRecord
#sale_audit.
end
def record_audit_foc(sale_id, cashier_id, approved_by, reason)
def self.record_audit_foc(sale_id, cashier_id, approved_by, reason)
#sale_audit
sale_audit = SaleAudit.new()
sale_audit.sale_id = sale_id
@@ -55,6 +55,18 @@ class SaleAudit < ApplicationRecord
sale_audit.save!
end
def self.record_audit_for_edit(sale_id, cashier_id, approved_by, reason,type)
#sale_audit
sale_audit = SaleAudit.new()
sale_audit.sale_id = sale_id
sale_audit.action = type
sale_audit.action_at = DateTime.now.utc
sale_audit.action_by = cashier_id
sale_audit.approved_by = approved_by
sale_audit.remark = reason
sale_audit.save!
end
def self.record_payment(sale_id, remark, action_by)
sale_audit = SaleAudit.new()
sale_audit.sale_id = sale_id