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

Merge branch 'loyalty' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-06-08 18:03:59 +06:30
parent 907764b3e4 0bcd612bc2
commit 568c5fbf68
46 changed files with 960 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/card_payments_controller.rb
View File

@@ -5,7 +5,7 @@ class Origami::CardPaymentsController < BaseOrigamiController
@membership_rebate_balance = 0
@membership_id = 0
if !@membership_id.nil?
membership_setting = MembershipSetting.find_by_membership_type("smartpay_url")
membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
membership_data = SalePayment.get_paypar_account(membership_setting.gateway_url,membership_setting.auth_token,@membership_id)
if membership_data["status"]==true
membership_account_data = membership_data["data"];

2
app/controllers/origami/others_payments_controller.rb
View File

@@ -8,7 +8,7 @@ class Origami::OthersPaymentsController < BaseOrigamiController
customer_data= Customer.find_by_customer_id(sale_data.customer_id)
@membership_id = customer_data.membership_id
if !@membership_id.nil?
membership_setting = MembershipSetting.find_by_membership_type("smartpay_url")
membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
membership_data = SalePayment.get_paypar_account(membership_setting.gateway_url,membership_setting.auth_token,@membership_id)
if membership_data["status"]==true
membership_account_data = membership_data["data"];