diff --git a/Gemfile b/Gemfile index 479b1325..ad11e93d 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0' gem 'mysql2', '>= 0.3.18', '< 0.5' #Use PosgreSQL -#gem 'pg' +gem 'pg' # redis server for cable # gem 'redis', '~> 3.0' diff --git a/Gemfile.lock b/Gemfile.lock index b191df57..051e1595 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -109,6 +109,7 @@ GEM nokogiri (1.7.2) mini_portile2 (~> 2.1.0) pdf-core (0.7.0) + pg (0.20.0) prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) @@ -244,6 +245,7 @@ DEPENDENCIES kaminari (~> 0.16.3) listen (~> 3.0.5) mysql2 (>= 0.3.18, < 0.5) + pg prawn prawn-table puma (~> 3.0) diff --git a/app/controllers/api/memberships_controller.rb b/app/controllers/api/memberships_controller.rb index 6b125868..210a4ca0 100644 --- a/app/controllers/api/memberships_controller.rb +++ b/app/controllers/api/memberships_controller.rb @@ -1,7 +1,7 @@ class Api::MembershipsController < ActionController::API before :authenticate_token - + #Add Membership to invoice def create diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 295a0d8f..325ac7dd 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -49,7 +49,7 @@ class Crm::CustomersController < ApplicationController date_of_birth = customer_params[:date_of_birth] membership_id = params[:membership_id] - membership = MembershipSetting.find_by_membership_type("smartpay_url") + membership = MembershipSetting.find_by_membership_type("paypar_url") app_token = membership.auth_token.to_s url = membership.gateway_url.to_s + "/api/create_membership_customer".to_s @@ -115,7 +115,7 @@ class Crm::CustomersController < ApplicationController date_of_birth = customer_params[:date_of_birth] id = customer_params[:membership_id] - membership = MembershipSetting.find_by_membership_type("smartpay_url") + membership = MembershipSetting.find_by_membership_type("paypar_url") app_token = membership.auth_token.to_s url = membership.gateway_url.to_s + "/api/update_membership_customer".to_s diff --git a/app/controllers/settings/membership_actions_controller.rb b/app/controllers/settings/membership_actions_controller.rb index 97b6a6ba..6db1a45b 100644 --- a/app/controllers/settings/membership_actions_controller.rb +++ b/app/controllers/settings/membership_actions_controller.rb @@ -4,7 +4,44 @@ class Settings::MembershipActionsController < ApplicationController # GET /settings/membership_actions # GET /settings/membership_actions.json def index - @settings_membership_actions = Settings::MembershipAction.all + type = params[:type] + @sale_id = params[:sale_id] + if type.nil? + @settings_membership_actions = Settings::MembershipAction.all + else + membership_actions_data=Settings::MembershipAction.find_by_membership_type(type) + + 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) + if sale_data.customer_id + customer_data= Customer.find_by_customer_id(sale_data.customer_id) + @membership_id = customer_data.membership_id + @campaign_type_id =1 + if !@membership_id.nil? + membership_setting = MembershipSetting.find_by_membership_type("paypar_url") + 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"] + @out = true, @membership_rebate_balance + else + @out = false, 0 + end + else + @out = false, 0 + end + else + @out =false, 0 + end + # campaign_type_id=1 + # get_account_data = MembershipAction.get_account_data(url) + else + @out = false, 0 + end + render :json => @out.to_json + end + end # GET /settings/membership_actions/1 diff --git a/app/models/customer.rb b/app/models/customer.rb index 6d2bd561..afc17d79 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -13,7 +13,7 @@ class Customer < ApplicationRecord def self.get_member_group - membership = MembershipSetting.find_by_membership_type("smartpay_url") + membership = MembershipSetting.find_by_membership_type("paypar_url") app_token = membership.auth_token.to_s url = membership.gateway_url.to_s + "/api/get_all_member_group".to_s diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index e4ec8c10..3d9855ba 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -66,10 +66,9 @@ class SalePayment < ApplicationRecord end - def self.get_paypar_account(paypar_url,token,membership_id) - url = paypar_url.to_s + "/api/get_membership_data".to_s + def self.get_paypar_account(url,token,membership_id,campaign_type_id) response = HTTParty.get(url, - :body => { app_token: token,membership_id:membership_id}.to_json, + :body => { app_token: token,membership_id:membership_id,campaign_type_id:campaign_type_id}.to_json, :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index bf89660a..abb2388f 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -4,7 +4,7 @@
<% @payment_method_setting.each do |payment_method|%>
-
<%= payment_method.payment_method %>
+
<%= payment_method.payment_method %>
<% end %>
@@ -15,7 +15,7 @@
- +
@@ -136,11 +136,24 @@ $(document).on('click', '.cashier_number', function(event){ $("#REDIMREBATE").click(function(){ $('.rebate-form').removeAttr("hidden"); + gateway_url = $(this).attr("data-url"); + sale_id = $(this).attr("data-sale-id"); + $.ajax({ + type: "GET", + url: "../../../../settings/membership_actions", + data: {type:"redeem_url",gateway_url:gateway_url,sale_id:sale_id}, + success: function(result){ + $("#valid_amount").val(result[1]); + } + }) + + }); $("#redeem").click(function(){ valid_amount = $("#valid_amount").val(); - sale_id = $(this).attr("data-value") + sale_id = $("#REDIMREBATE").attr("data-sale-id"); + alert(sale_id); membership_id = $(this).attr("data-member-value"); redeem_amount = parseInt($("#used_amount").text()); if(redeem_amount<=0){ diff --git a/spec/views/membership_actions/index.json.jbuilder b/spec/views/membership_actions/index.json.jbuilder new file mode 100644 index 00000000..e69de29b