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

Browse Source
This commit is contained in:
Yan
2017-12-08 14:59:01 +06:30
parent f57dd8ba38 e8626e78f5
commit c8767dae99
5 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/sale_payment.rb
View File

@@ -269,6 +269,10 @@ class SalePayment < ApplicationRecord
membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
membership_data = SalePayment.redeem(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id)
#record an payment in sale-audit
remark = "#{membership_data} Redeem- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, "Cashier")
if membership_data["status"]==true
self.payment_method = "paypar"
self.payment_amount = self.received_amount
@@ -321,7 +325,11 @@ class SalePayment < ApplicationRecord
if MembershipSetting.find_by_rebate(1) && is_foc == 0
response = rebat(sObj)
#record an payment in sale-audit
remark = "#{response} Redeem- for Customer #{self.sale.customer_id} | Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, "Cashier")
if !response.nil?
if response["status"] == true
self.sale.rebate_status = 'true'