From 796d511f2e659477be65fcd65c5a048382cf77ae Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 12 Jun 2017 19:02:20 +0630 Subject: [PATCH 1/2] Rebate add --- app/models/sale_payment.rb | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index b8c527af..1acd8b57 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -60,7 +60,7 @@ class SalePayment < ApplicationRecord #record an payment in sale-audit 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" end @@ -217,7 +217,7 @@ class SalePayment < ApplicationRecord self.sale.sale_status = "completed" self.sale.save! table_update_status(sObj) - rebat() + rebat(sObj) end end @@ -233,8 +233,25 @@ class SalePayment < ApplicationRecord end end - def rebat + def rebat(sObj) + food_prices, beverage_prices = SaleItem.calculate_food_beverage(sObj.sale_items) + generic_customer_id = sObj.customer.membership_id + total_amount = sObj.total_amount + receipt_no = sObj.receipt_no + membership = MembershipSetting.find_by_membership_type("paypar_url") + memberaction = MembershipAction.find_by_membership_type("rebate") + campaign_type_id = memberaction.additional_parameter["campaign_type_id"] + app_token = membership.auth_token.to_s + url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + puts url + response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id, + receipt_no: receipt_no}.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + }) + puts response.to_json end private From 4bbf65104084e6205d375c11fb4b567e22d27047 Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 12 Jun 2017 19:31:01 +0630 Subject: [PATCH 2/2] Rebate Bug Fix --- app/models/sale_payment.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 1acd8b57..04668575 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -236,14 +236,13 @@ class SalePayment < ApplicationRecord def rebat(sObj) food_prices, beverage_prices = SaleItem.calculate_food_beverage(sObj.sale_items) generic_customer_id = sObj.customer.membership_id - total_amount = sObj.total_amount + total_amount = food_prices receipt_no = sObj.receipt_no membership = MembershipSetting.find_by_membership_type("paypar_url") memberaction = MembershipAction.find_by_membership_type("rebate") campaign_type_id = memberaction.additional_parameter["campaign_type_id"] app_token = membership.auth_token.to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s - puts url response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id, receipt_no: receipt_no}.to_json, :headers => {