diff --git a/app/assets/javascripts/origami/redeem_payments.coffee b/app/assets/javascripts/origami/redeem_payments.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/origami/redeem_payments.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/origami/redeem_payments.scss b/app/assets/stylesheets/origami/redeem_payments.scss new file mode 100644 index 00000000..8fdd1e53 --- /dev/null +++ b/app/assets/stylesheets/origami/redeem_payments.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the origami/redeem_payments controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb new file mode 100644 index 00000000..732f969e --- /dev/null +++ b/app/controllers/origami/redeem_payments_controller.rb @@ -0,0 +1,41 @@ +class Origami::RedeemPaymentsController < BaseOrigamiController + def index + sale_id = params[:sale_id] + payment_method = params[:payment_method] + @membership_rebate_balance=0 + sale_data = Sale.find_by_sale_id(sale_id) + if sale_data + if sale_data.customer_id + customer_data= Customer.find_by_customer_id(sale_data.customer_id) + if customer_data + @membership_id = customer_data.membership_id + @campaign_type_id =1 + if !@membership_id.nil? + membership_setting = MembershipSetting.find_by_membership_type("paypar_url") + puts 'Hello Hello' + puts membership_setting.to_json + member_actions =MembershipAction.find_by_membership_type("get_account_balance") + puts member_actions.to_json + url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s + puts 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,@membership_id + end + else + @out = false, 0 + end + else + @out = false, 0 + end + else + @out = false, 0 + end + else + @out = false, 0 + end + @out = false, 0 + end +end diff --git a/app/controllers/settings/membership_actions_controller.rb b/app/controllers/settings/membership_actions_controller.rb index 50aad862..ad7311f2 100644 --- a/app/controllers/settings/membership_actions_controller.rb +++ b/app/controllers/settings/membership_actions_controller.rb @@ -4,46 +4,7 @@ class Settings::MembershipActionsController < ApplicationController # GET /settings/membership_actions # GET /settings/membership_actions.json def index - 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) - 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"] - @out = true, @membership_rebate_balance,@membership_id - 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 - + @settings_membership_actions = MembershipAction.all end # GET /settings/membership_actions/1 @@ -53,7 +14,7 @@ class Settings::MembershipActionsController < ApplicationController # GET /settings/membership_actions/new def new - @settings_membership_action = Settings::MembershipAction.new + @settings_membership_action = MembershipAction.new end # GET /settings/membership_actions/1/edit @@ -63,11 +24,11 @@ class Settings::MembershipActionsController < ApplicationController # POST /settings/membership_actions # POST /settings/membership_actions.json def create - @settings_membership_action = Settings::MembershipAction.new(settings_membership_action_params) + @settings_membership_action = MembershipAction.new(settings_membership_action_params) respond_to do |format| if @settings_membership_action.save - format.html { redirect_to @settings_membership_action, notice: 'Membership action was successfully created.' } + format.html { redirect_to settings_membership_actions_path, notice: 'Membership action was successfully created.' } format.json { render :show, status: :created, location: @settings_membership_action } else format.html { render :new } @@ -81,7 +42,7 @@ class Settings::MembershipActionsController < ApplicationController def update respond_to do |format| if @settings_membership_action.update(settings_membership_action_params) - format.html { redirect_to @settings_membership_action, notice: 'Membership action was successfully updated.' } + format.html { redirect_to settings_membership_action_path, notice: 'Membership action was successfully updated.' } format.json { render :show, status: :ok, location: @settings_membership_action } else format.html { render :edit } @@ -103,11 +64,11 @@ class Settings::MembershipActionsController < ApplicationController private # Use callbacks to share common setup or constraints between actions. def set_settings_membership_action - @settings_membership_action = Settings::MembershipAction.find(params[:id]) + @settings_membership_action = MembershipAction.find(params[:id]) end # Never trust parameters from the scary internet, only allow the white list through. def settings_membership_action_params - params.require(:settings_membership_action).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by, :additional_parameter) + params.require(:membership_action).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by, :additional_parameter) end end diff --git a/app/helpers/origami/redeem_payments_helper.rb b/app/helpers/origami/redeem_payments_helper.rb new file mode 100644 index 00000000..7e9151cb --- /dev/null +++ b/app/helpers/origami/redeem_payments_helper.rb @@ -0,0 +1,2 @@ +module Origami::RedeemPaymentsHelper +end diff --git a/app/models/settings/membership_action.rb b/app/models/settings/membership_action.rb deleted file mode 100644 index 814e4b97..00000000 --- a/app/models/settings/membership_action.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Settings::MembershipAction < ApplicationRecord -end diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 5cf1bfd4..6ea1ae5e 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -4,174 +4,20 @@
<% @payment_method_setting.each do |payment_method|%>
-
<%= payment_method.payment_method %>
+
<%= payment_method.payment_method %>
<% end %>
- -
- -
-
-
-
-
-
1
-
2
-
3
-
-
-
-
1000
-
-
-
-
-
-
4
-
5
-
6
-
-
-
-
5000
-
-
-
-
-
-
7
-
8
-
9
-
-
-
-
10000
-
-
-
-
-
-
0
-
.
-
00
-
-
-
-
50000
-
-
-
-
-
-
-
DEL
-
CLR
-
-
-
-
PAY
-
-
-
-
- -
diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb new file mode 100644 index 00000000..5e336ac4 --- /dev/null +++ b/app/views/origami/redeem_payments/index.html.erb @@ -0,0 +1,157 @@ +
+ +
+
+
+
+
+ + +
+
+
+
+
+ +
0.0
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
1
+
2
+
3
+
+
+
+
1000
+
+
+
+
+
+
4
+
5
+
6
+
+
+
+
5000
+
+
+
+
+
+
7
+
8
+
9
+
+
+
+
10000
+
+
+
+
+
+
0
+
.
+
00
+
+
+
+
50000
+
+
+
+
+
+
+
DEL
+
CLR
+
+
+
+
PAY
+
+
+
+
+ +
+
+
+ +
+ diff --git a/app/views/settings/membership_actions/_form.html.erb b/app/views/settings/membership_actions/_form.html.erb index 9f4a2cd5..3084d4ac 100644 --- a/app/views/settings/membership_actions/_form.html.erb +++ b/app/views/settings/membership_actions/_form.html.erb @@ -1,4 +1,4 @@ -<%= simple_form_for(@settings_membership_action) do |f| %> +<%= simple_form_for([:settings,@settings_membership_action]) do |f| %> <%= f.error_notification %>
diff --git a/app/views/settings/membership_actions/edit.html.erb b/app/views/settings/membership_actions/edit.html.erb index 3373d008..cd5cb98a 100644 --- a/app/views/settings/membership_actions/edit.html.erb +++ b/app/views/settings/membership_actions/edit.html.erb @@ -2,5 +2,5 @@ <%= render 'form', settings_membership_action: @settings_membership_action %> -<%= link_to 'Show', @settings_membership_action %> | +<%= link_to 'Show', settings_membership_action_path(@settings_membership_action) %> | <%= link_to 'Back', settings_membership_actions_path %> diff --git a/app/views/settings/membership_actions/index.html.erb b/app/views/settings/membership_actions/index.html.erb index 80b4420e..635fd34c 100644 --- a/app/views/settings/membership_actions/index.html.erb +++ b/app/views/settings/membership_actions/index.html.erb @@ -28,9 +28,9 @@ <%= settings_membership_action.merchant_account_id %> <%= settings_membership_action.created_by %> <%= settings_membership_action.additional_parameter %> - <%= link_to 'Show', settings_membership_action %> + <%= link_to 'Show', settings_membership_action_path(settings_membership_action) %> <%= link_to 'Edit', edit_settings_membership_action_path(settings_membership_action) %> - <%= link_to 'Destroy', settings_membership_action, method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to 'Destroy', settings_membership_action_path(settings_membership_action), method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index 6d7be02e..91acd6a3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -85,6 +85,7 @@ Rails.application.routes.draw do post 'paypar_payment_process' => 'paypar_payments#create' get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index" get 'sale/:sale_id/payment/others_payment' => "others_payments#index" + get 'sale/:sale_id/payment/others_payment/:payment_method' => "redeem_payments#index" end diff --git a/db/migrate/20170608104900_create_settings_membership_actions.rb b/db/migrate/20170611084537_create_membership_actions.rb similarity index 64% rename from db/migrate/20170608104900_create_settings_membership_actions.rb rename to db/migrate/20170611084537_create_membership_actions.rb index 2b9dd85d..55f9bcb2 100644 --- a/db/migrate/20170608104900_create_settings_membership_actions.rb +++ b/db/migrate/20170611084537_create_membership_actions.rb @@ -1,7 +1,7 @@ -class CreateSettingsMembershipActions < ActiveRecord::Migration[5.1] +class CreateMembershipActions < ActiveRecord::Migration[5.1] def change - create_table :settings_membership_actions do |t| - t.string :membership_type + create_table :membership_actions do |t| + t.string :membership_type t.boolean :is_active t.string :gateway_communication_type t.string :gateway_url @@ -11,6 +11,7 @@ class CreateSettingsMembershipActions < ActiveRecord::Migration[5.1] t.string :additional_parameter t.timestamps + t.timestamps end end end diff --git a/spec/controllers/origami/redeem_payments_controller_spec.rb b/spec/controllers/origami/redeem_payments_controller_spec.rb new file mode 100644 index 00000000..22e705d7 --- /dev/null +++ b/spec/controllers/origami/redeem_payments_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Origami::RedeemPaymentsController, type: :controller do + +end diff --git a/spec/helpers/origami/redeem_payments_helper_spec.rb b/spec/helpers/origami/redeem_payments_helper_spec.rb new file mode 100644 index 00000000..580d73ff --- /dev/null +++ b/spec/helpers/origami/redeem_payments_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Origami::RedeemPaymentsHelper. For example: +# +# describe Origami::RedeemPaymentsHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Origami::RedeemPaymentsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end