From b1480a506659c443fa98f2e94b8956a972e0f5c7 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 12 Sep 2018 17:54:04 +0630 Subject: [PATCH 1/2] update payment link with payment method --- app/controllers/origami/dinga_controller.rb | 11 ++++++----- app/controllers/origami/voucher_controller.rb | 13 +++++++------ app/models/sale_payment.rb | 15 ++++++++------- app/views/origami/home/show.html.erb | 6 ++++-- app/views/origami/rooms/show.html.erb | 5 ++++- 5 files changed, 29 insertions(+), 21 deletions(-) diff --git a/app/controllers/origami/dinga_controller.rb b/app/controllers/origami/dinga_controller.rb index be35a5c1..55705fce 100644 --- a/app/controllers/origami/dinga_controller.rb +++ b/app/controllers/origami/dinga_controller.rb @@ -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"] diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb index 74b35b3c..515bf3a1 100755 --- a/app/controllers/origami/voucher_controller.rb +++ b/app/controllers/origami/voucher_controller.rb @@ -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, diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 97ee07a7..43923134 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -169,14 +169,15 @@ class SalePayment < ApplicationRecord end def self.redeem(paypar_url,token,membership_id,received_amount,sale_id) - membership_actions_data = MembershipAction.find_by_membership_type("redeem"); + # membership_actions_data = MembershipAction.find_by_membership_type("redeem"); + membership_actions_data = PaymentMethodSetting.find_by_payment_method("Redeem") if !membership_actions_data.nil? url = paypar_url.to_s + membership_actions_data.gateway_url.to_s merchant_uid = membership_actions_data.merchant_account_id auth_token = membership_actions_data.auth_token - campaign_type_id = membership_actions_data.additional_parameter["campaign_type_id"] + campaign_type_id = membership_actions_data.additional_parameters["campaign_type_id"] sale_data = Sale.find_by_sale_id(sale_id) if sale_data @@ -227,8 +228,9 @@ class SalePayment < ApplicationRecord end - def self.create_payment(paypar_url,token,membership_id,received_amount,sale_id) - membership_actions_data = MembershipAction.find_by_membership_type("create_payment"); + 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 = PaymentMethodSetting.find_by_payment_method(payment_type) sale_data = Sale.find_by_sale_id(sale_id) customer_data = Customer.find_by_customer_id(sale_data.customer_id) if !membership_actions_data.nil? @@ -236,7 +238,6 @@ class SalePayment < ApplicationRecord url = paypar_url.to_s + membership_actions_data.gateway_url.to_s merchant_uid = membership_actions_data.merchant_account_id auth_token = membership_actions_data.auth_token - if sale_data others = 0 @@ -457,7 +458,7 @@ class SalePayment < ApplicationRecord # account_no = customer_data.membership_id # end membership_setting = MembershipSetting.find_by_membership_type("paypar_url") - membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,account_no,self.received_amount,self.sale.sale_id) + membership_data = SalePayment.create_payment(membership_setting.gateway_url,"PAYMAL",account_no,self.received_amount,self.sale.sale_id) #record an payment in sale-audit remark = "#{membership_data} PayMal Payment- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} " @@ -507,7 +508,7 @@ class SalePayment < ApplicationRecord # end membership_setting = MembershipSetting.find_by_membership_type("paypar_url") - membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,account_no,self.received_amount,self.sale.sale_id) + membership_data = SalePayment.create_payment(membership_setting.gateway_url,"DINGA",account_no,self.received_amount,self.sale.sale_id) #record an payment in sale-audit remark = "#{membership_data} Dinga Payment- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} " diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 24d00575..98e4f6f5 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -359,6 +359,7 @@ <% if !@sale_taxes.empty? %> + Tax: (<% @i = 0 @sale_taxes.each do |ct| %> @@ -368,6 +369,7 @@ <%end%> <%end %>) <% else %> + No Tax <% end %>
<%if !@webview && @changable_tax %> @@ -1104,8 +1106,8 @@ var dining_id = "<%= @dining.id %>"; var sale_id = $("#sale_id").val(); //<%= @obj_sale.sale_id rescue "" %> var ajax_url = "/origami/sale/append_order"; - var tax_type = localStorage.getItem("tax_type"); - console.log(tax_type) + // var tax_type = localStorage.getItem("tax_type"); + var tax_type = $("#check_tax").val(); $.ajax({ type: "POST", url: ajax_url, diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 2af644e6..918758e4 100755 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -393,6 +393,7 @@ <% if !@sale_taxes.empty? %> + Tax: (<% @i = 0 @sale_taxes.each do |ct| %> @@ -402,6 +403,7 @@ <%end%> <%end %>) <% else %> + No Tax <% end %>
<%if !@webview && @changable_tax %> @@ -1168,7 +1170,8 @@ $('#add_invoice').on('click',function(){ var dining_id = "<%= @room.id %>" var sale_id = $("#sale_id").val(); //<%= @obj_sale.sale_id rescue "" %> var ajax_url = "/origami/sale/append_order"; - var tax_type = localStorage.getItem("tax_type"); + // var tax_type = localStorage.getItem("tax_type"); + var tax_type = $("#check_tax").val(); $.ajax({ type: "POST", url: ajax_url, From 85fcd43ac2f7746c0bfaa698c091cf2601601f9a Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 13 Sep 2018 18:03:48 +0630 Subject: [PATCH 2/2] update membershp payment method --- .../settings/membership_actions_controller.rb | 2 +- .../payment_method_settings_controller.rb | 1 + app/models/payment_method_setting.rb | 2 +- app/models/sale_payment.rb | 4 +- .../payment_method_settings/_form.html.erb | 39 +++++++++++++++---- 5 files changed, 37 insertions(+), 11 deletions(-) diff --git a/app/controllers/settings/membership_actions_controller.rb b/app/controllers/settings/membership_actions_controller.rb index a41f7ad2..ea8d903b 100755 --- a/app/controllers/settings/membership_actions_controller.rb +++ b/app/controllers/settings/membership_actions_controller.rb @@ -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 diff --git a/app/controllers/settings/payment_method_settings_controller.rb b/app/controllers/settings/payment_method_settings_controller.rb index 2fccfd67..46ad82d4 100755 --- a/app/controllers/settings/payment_method_settings_controller.rb +++ b/app/controllers/settings/payment_method_settings_controller.rb @@ -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.' } diff --git a/app/models/payment_method_setting.rb b/app/models/payment_method_setting.rb index 4f1de785..a57e8a4d 100755 --- a/app/models/payment_method_setting.rb +++ b/app/models/payment_method_setting.rb @@ -1,4 +1,4 @@ class PaymentMethodSetting < ApplicationRecord # validations - validates_presence_of :payment_method #, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id + validates_presence_of :payment_method , :gateway_communication_type #, :gateway_url, :auth_token, :merchant_account_id end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 43923134..4168f874 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -235,7 +235,7 @@ class SalePayment < ApplicationRecord customer_data = Customer.find_by_customer_id(sale_data.customer_id) if !membership_actions_data.nil? - url = paypar_url.to_s + membership_actions_data.gateway_url.to_s + url = "paypar_url.to_s" + membership_actions_data.gateway_url.to_s merchant_uid = membership_actions_data.merchant_account_id auth_token = membership_actions_data.auth_token @@ -261,7 +261,7 @@ class SalePayment < ApplicationRecord auth_token:auth_token}.to_json end - + puts params # Control for Paypar Cloud begin response = HTTParty.post(url, diff --git a/app/views/settings/payment_method_settings/_form.html.erb b/app/views/settings/payment_method_settings/_form.html.erb index bb5ae59a..96624821 100755 --- a/app/views/settings/payment_method_settings/_form.html.erb +++ b/app/views/settings/payment_method_settings/_form.html.erb @@ -9,15 +9,25 @@
<%= f.input :payment_method %> <%= f.input :is_active %> - <%= f.input :gateway_communication_type %> - <%= f.input :gateway_url %> - <%= f.input :auth_token %> - <%= f.input :merchant_account_id %> - <%= f.input :additional_parameters %> + + <%= f.input :gateway_communication_type,:class=>'gateway_type', collection: [ "Api", "Default", "Device"] %> + <%= f.input :gateway_url ,:class=>'gateway_type', :required => true %> + <%= f.input :auth_token ,:class=>'auth_token', :required => true %> + <%= f.input :merchant_account_id ,:class=>'merchant_id', :required => true%> + <%= f.input :additional_parameters, as: :text %> +
- <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %> + <%= f.submit "Submit",:class => 'btn btn-primary submitBtn btn-lg waves-effect' %>
<% end %> @@ -50,4 +60,19 @@ - + \ No newline at end of file