Merge branch 'master' into license

This commit is contained in:
Yan
2017-11-20 13:54:54 +06:30
23 changed files with 369 additions and 556 deletions

View File

@@ -39,7 +39,7 @@ class SaleItem < ApplicationRecord
# Check for actual sale items
sale_items.each do |si|
if si.account_id == a.id
if si.account_id == a.id
account_price[:price] = account_price[:price] + si.price
end
end

View File

@@ -407,9 +407,6 @@ class SalePayment < ApplicationRecord
rescue SocketError
response = { "status": false, "message": "Can't connect server"}
end
puts response.to_json
puts payparcost
puts overall_dis
redeem_amount = payparcost + overall_dis
total_percentage = 0