diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb index af5ce55f..b145ff63 100644 --- a/app/controllers/origami/paypar_payments_controller.rb +++ b/app/controllers/origami/paypar_payments_controller.rb @@ -8,7 +8,7 @@ class Origami::PayparPaymentsController < BaseOrigamiController saleObj = Sale.find(sale_id) sale_payment = SalePayment.new status,msg =sale_payment.process_payment(saleObj, @user, redeem_amount,payment_method) - + if status == true @out = true, "Success!" else @@ -19,4 +19,4 @@ class Origami::PayparPaymentsController < BaseOrigamiController end end -end \ No newline at end of file +end diff --git a/app/controllers/settings/membership_actions_controller.rb b/app/controllers/settings/membership_actions_controller.rb index 6db1a45b..0d1f8b78 100644 --- a/app/controllers/settings/membership_actions_controller.rb +++ b/app/controllers/settings/membership_actions_controller.rb @@ -14,13 +14,15 @@ class Settings::MembershipActionsController < ApplicationController if !membership_actions_data.nil? url = params[:gateway_url].to_s + membership_actions_data.gateway_url.to_s puts url.to_json - sale_data = Sale.find_by_sale_id(@sale_id) + sale_data = Sale.find_by_sale_id(@sale_id) if sale_data.customer_id customer_data= Customer.find_by_customer_id(sale_data.customer_id) + puts customer_data.to_json @membership_id = customer_data.membership_id @campaign_type_id =1 if !@membership_id.nil? membership_setting = MembershipSetting.find_by_membership_type("paypar_url") + puts membership_setting membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) if membership_data["status"]==true @membership_rebate_balance=membership_data["balance"] @@ -41,7 +43,7 @@ class Settings::MembershipActionsController < ApplicationController end render :json => @out.to_json end - + end # GET /settings/membership_actions/1 diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 77c06904..f76d5146 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -1,15 +1,15 @@
- +
<% @payment_method_setting.each do |payment_method|%>
<%= payment_method.payment_method %>
- <% end %> + <% end %>
- +
+
0.0

-
+
@@ -86,16 +86,16 @@
-
PAY
+
PAY
- +
- +
\ No newline at end of file +