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,
|