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

Merge branch 'r-1902001-01' of gitlab.com:code2lab/SXRestaurant into r-1902001-01

Browse Source
This commit is contained in:
Zoey
2019-05-16 14:11:22 +06:30
parent da7c344179 acb81aa2ab
commit 2006cbb5ab
14 changed files with 241 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/sale_payment.rb
View File

@@ -178,7 +178,8 @@ class SalePayment < ApplicationRecord
def self.redeem(paypar_url,token,membership_id,received_amount,sale_id)
# membership_actions_data = MembershipAction.find_by_membership_type("redeem");
membership_actions_data = PaymentMethodSetting.find_by_payment_method("Redeem")
puts "This is membership_actions_data"
puts membership_actions_data.to_json
if !membership_actions_data.nil?
url = paypar_url.to_s + membership_actions_data.gateway_url.to_s