From 72734c8bff65b726c74a9ea6141edebd2939619d Mon Sep 17 00:00:00 2001 From: Thein Lin Kyaw Date: Fri, 29 May 2020 21:42:27 +0630 Subject: [PATCH] use membership actions for PAYMAL create payment --- app/models/sale_payment.rb | 3 +-- lib/tasks/shop_create.rake | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index d73ece45..657c53e8 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -293,9 +293,8 @@ class SalePayment < ApplicationRecord end def self.create_payment(paypar_url,payment_type,membership_id,received_amount,sale_id) - # membership_actions_data = MembershipAction.find_by_membership_type("create_payment"); + membership_actions_data = MembershipAction.find_by_membership_type("create_payment") sale_data = Sale.find_by_sale_id(sale_id) - membership_actions_data = PaymentMethodSetting.find_by_payment_method(payment_type) customer_data = Customer.find_by_customer_id(sale_data.customer_id) if !membership_actions_data.nil? diff --git a/lib/tasks/shop_create.rake b/lib/tasks/shop_create.rake index 735d7339..e39b3534 100644 --- a/lib/tasks/shop_create.rake +++ b/lib/tasks/shop_create.rake @@ -216,11 +216,10 @@ namespace :shop do {membership_type:"get_member_campaign",is_active:1,gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:5},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G",shop_code: args.shop_code}, {membership_type:"search_paypar_account_no",is_active:1,gateway_url:"/api/generic_customer/get_membership_customer_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G",shop_code: args.shop_code}, {membership_type:"void",is_active:1,gateway_url:"/api/payments/payment_void",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G",shop_code: args.shop_code}, - {membership_type:"search_paypar_security_code",is_active:1,gateway_url:"/api/generic_customer/get_membership_customer_security_code",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G",shop_code: args.shop_code}]) + {membership_type:"search_paypar_security_code",is_active:1,gateway_url:"/api/generic_customer/get_membership_customer_security_code",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G",shop_code: args.shop_code}, + {membership_type:"create_payment",is_active:1, gateway_url:"/api/create_payment",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G",shop_code: args.shop_code}]) Rails.logger.info " Finished member_actions Set Up Data" - payment_methods = PaymentMethodSetting.create({payment_method:"PAYMAL",gateway_url: "/api/create_payment",merchant_account_id:"pZBHXEFbGNj/G",shop_code: args.shop_code}) - Rails.logger.info " Finished payment_methods Set Up Data" Rails.logger.info " Finished System Default Set Up Data" end end