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

update customer and ability

Browse Source
This commit is contained in:
Aung Myo
2018-01-12 09:23:41 +06:30
parent 410cacf279
commit 6399188696
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/ability.rb
View File

@@ -104,11 +104,11 @@ class Ability
can :index, :other_charge can :index, :other_charge
can :create, :other_charge can :create, :other_charge
can :index, :discount # can :index, :discount
can :create, :discount # can :create, :discount
can :remove_discount_items, :discount # can :remove_discount_items, :discount
can :remove_all_discount, :discount # can :remove_all_discount, :discount
can :member_discount, :discount # can :member_discount, :discount
can :first_bill, :payment can :first_bill, :payment
can :show, :payment can :show, :payment

8
app/models/customer.rb
View File

@@ -146,9 +146,10 @@ class Customer < ApplicationRecord
if sale.customer.membership_id if sale.customer.membership_id
response = self.rebat(Sale.find(sale.sale_id)) response = self.rebat(Sale.find(sale.sale_id))
#record an payment in sale-audit #record an payment in sale-audit
if !response.nil?
remark = "UPdate Rebate Response - #{response} for Customer #{sale.customer_id} Sale Id [#{sale.sale_id}]| pay amount -> #{sale.amount_received} " remark = "UPdate Rebate Response - #{response} for Customer #{sale.customer_id} Sale Id [#{sale.sale_id}]| pay amount -> #{sale.amount_received} "
sale_audit = SaleAudit.record_paymal(sale.sale_id, remark, 1) sale_audit = SaleAudit.record_paymal(sale.sale_id, remark, 1)
end
if response["status"] == true if response["status"] == true
status = sale.update_attributes(rebate_status: "true") status = sale.update_attributes(rebate_status: "true")
end end
@@ -159,8 +160,9 @@ class Customer < ApplicationRecord
def self.rebat(sObj) def self.rebat(sObj)
rebate_prices,campaign_method = SaleItem.calculate_rebate_by_account(sObj.sale_items) rebate_prices,campaign_method = SaleItem.calculate_rebate_by_account(sObj.sale_items)
generic_customer_id = sObj.customer.membership_id generic_customer_id = sObj.customer.membership_id
if generic_customer_id.present?
if generic_customer_id.present?
paypar = sObj.sale_payments paypar = sObj.sale_payments
payparcost = 0 payparcost = 0
credit = 0 credit = 0
@@ -171,6 +173,7 @@ class Customer < ApplicationRecord
end end
if pp.payment_method == "creditnote" if pp.payment_method == "creditnote"
credit = 1 credit = 1
sObj.update_attributes(rebate_status: nil)
end end
end end
# overall_dis = SaleItem.get_overall_discount(sObj.id) # overall_dis = SaleItem.get_overall_discount(sObj.id)
@@ -287,6 +290,7 @@ class Customer < ApplicationRecord
end end
end end
else else
puts "no Response"
response = { "status": "no_member", "message": "Not membership"} response = { "status": "no_member", "message": "Not membership"}
end end
end end