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

update conflic for pull master

Browse Source
This commit is contained in:
Aung Myo
2018-02-23 14:58:35 +06:30
parent 8069ac15ca 77a66d726b
commit ac47501e01
19 changed files with 284 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/license.rb
View File

@@ -33,7 +33,7 @@ class License
##Get redis connection from connection pool
redis = Redis.new
cache_license = redis.get(cache_key)
Rails.logger.info "Cache key - " + cache_key.to_s
if cache_license.nil?
##change the d/e key

12
app/models/sale_audit.rb
View File

@@ -24,9 +24,9 @@ class SaleAudit < ApplicationRecord
sale_audit.sale_id = sale_id
sale_audit.action = "SALECOMPLETE"
sale_audit.action_at = DateTime.now.utc
sale_audit.action_by = action_by
sale_audit.action_by = Sale.find(sale_id).cashier_id
sale_audit.remark = remark
sale_audit.approved_by = Time.now
sale_audit.approved_by = action_by
sale_audit.save!
end
@@ -72,9 +72,9 @@ class SaleAudit < ApplicationRecord
sale_audit.sale_id = sale_id
sale_audit.action = "SALEPAYMENT"
sale_audit.action_at = DateTime.now.utc
sale_audit.action_by = action_by
sale_audit.action_by = Sale.find(sale_id).cashier_id
sale_audit.remark = remark
sale_audit.approved_by = Time.now
sale_audit.approved_by = action_by
sale_audit.save!
end
@@ -83,9 +83,9 @@ class SaleAudit < ApplicationRecord
sale_audit.sale_id = sale_id
sale_audit.action = "PAYMAL"
sale_audit.action_at = DateTime.now.utc
sale_audit.action_by = action_by
sale_audit.action_by = Sale.find(sale_id).cashier_id
sale_audit.remark = remark
sale_audit.approved_by = Time.now
sale_audit.approved_by = action_by
sale_audit.save!
end

6
app/models/sale_payment.rb
View File

@@ -8,7 +8,7 @@ class SalePayment < ApplicationRecord
attr_accessor :received_amount, :card_payment_reference, :voucher_no, :giftcard_no, :customer_id, :external_payment_status
def process_payment(invoice, action_by, cash_amount, payment_method)
def process_payment(invoice, action_by, cash_amount, payment_method,remark=nil)
self.sale = invoice
self.received_amount = cash_amount
amount_due = invoice.grand_total
@@ -53,7 +53,7 @@ class SalePayment < ApplicationRecord
end
#record an payment in sale-audit
remark = "Payment #{payment_method}- for Invoice #{invoice.receipt_no} Due [#{amount_due}]| pay amount -> #{cash_amount} | Payment Status ->#{payment_status}"
# remark = "Payment #{payment_method}- for Invoice #{invoice.receipt_no} Due [#{amount_due}]| pay amount -> #{cash_amount} | Payment Status ->#{payment_status}"
sale_audit = SaleAudit.record_payment(invoice.id, remark, action_by)
# update complete order items in oqs
@@ -67,7 +67,7 @@ class SalePayment < ApplicationRecord
return true, self.save
else
#record an payment in sale-audit
remark = "No outstanding Amount - Grand Total [#{invoice.grand_total}] | Due [#{amount_due}] | Paid [#{invoice.amount_received}]"
# remark = "No outstanding Amount - Grand Total [#{invoice.grand_total}] | Due [#{amount_due}] | Paid [#{invoice.amount_received}]"
sale_audit = SaleAudit.record_payment(invoice.id, remark,action_by)
return false, "No outstanding Amount"