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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2018-09-14 10:21:18 +06:30
parent 9ac2044337 5a832c2c37
commit 3708391829
9 changed files with 66 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/origami/dinga_controller.rb
View File

@@ -35,12 +35,13 @@ class Origami::DingaController < BaseOrigamiController
if !@membership_id.nil?
membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
if membership_setting.gateway_url
member_actions =MembershipAction.find_by_membership_type("get_account_balance")
if member_actions.gateway_url
# payment_data =MembershipAction.find_by_membership_type("get_account_balance")
payment_data = PaymentMethodSetting.find_by_payment_method("DINGA")
if payment_data.gateway_url
@campaign_type_id = nil
url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
merchant_uid= member_actions.merchant_account_id
auth_token = member_actions.auth_token.to_s
url = membership_setting.gateway_url.to_s + payment_data.gateway_url.to_s
merchant_uid= payment_data.merchant_account_id
auth_token = payment_data.auth_token.to_s
membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token)
if membership_data["status"]==true
@membership_rebate_balance=membership_data["balance"]

13
app/controllers/origami/voucher_controller.rb
View File

@@ -37,12 +37,13 @@ class Origami::VoucherController < BaseOrigamiController
membership_id = customer_data.membership_id
membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
if membership_setting.gateway_url
member_actions =MembershipAction.find_by_membership_type("get_account_balance") #need to modify here
if member_actions.gateway_url
campaign_type_id = member_actions.additional_parameter["campaign_type_id"]
url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
merchant_uid= member_actions.merchant_account_id
auth_token = member_actions.auth_token.to_s
# payment_data =MembershipAction.find_by_membership_type("get_account_balance") #need to modify here
payment_data = PaymentMethodSetting.find_by_payment_method("Voucher")
if payment_data.gateway_url
campaign_type_id = payment_data.additional_parameters["campaign_type_id"]
url = membership_setting.gateway_url.to_s + payment_data.gateway_url.to_s
merchant_uid= payment_data.merchant_account_id
auth_token = payment_data.auth_token.to_s
# membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token)
# if membership_data["status"]==true
# app_token: token,membership_id:membership_id,

2
app/controllers/settings/membership_actions_controller.rb
View File

@@ -72,6 +72,6 @@ class Settings::MembershipActionsController < ApplicationController
# Never trust parameters from the scary internet, only allow the white list through.
def settings_membership_action_params
params.require(:membership_action).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by)
params.require(:membership_action).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by,:additional_parameters)
end
end

1
app/controllers/settings/payment_method_settings_controller.rb
View File

@@ -41,6 +41,7 @@ class Settings::PaymentMethodSettingsController < ApplicationController
# PATCH/PUT /settings/payment_method_settings/1
# PATCH/PUT /settings/payment_method_settings/1.json
def update
puts settings_payment_method_setting_params
respond_to do |format|
if @settings_payment_method_setting.update(settings_payment_method_setting_params)
format.html { redirect_to settings_payment_method_setting_path(@settings_payment_method_setting), notice: 'Payment method setting was successfully updated.' }