diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb index 5fd386e8..b68fd30a 100644 --- a/app/controllers/origami/redeem_payments_controller.rb +++ b/app/controllers/origami/redeem_payments_controller.rb @@ -4,6 +4,7 @@ class Origami::RedeemPaymentsController < BaseOrigamiController payment_method = params[:payment_method] @membership_rebate_balance=0 sale_data = Sale.find_by_sale_id(@sale_id) + @food_prices, @beverage_prices = SaleItem.calculate_food_beverage(sale_data.sale_items) if sale_data if sale_data.customer_id customer_data= Customer.find_by_customer_id(sale_data.customer_id) @@ -28,8 +29,8 @@ class Origami::RedeemPaymentsController < BaseOrigamiController else @out = false,0 end - - + + else @out = false, 0 end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 526ef03c..894592b5 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -96,7 +96,7 @@ class SalePayment < ApplicationRecord else response = false; end - + else response =false; end @@ -241,7 +241,7 @@ class SalePayment < ApplicationRecord def rebat(sObj) food_prices, beverage_prices = SaleItem.calculate_food_beverage(sObj.sale_items) generic_customer_id = sObj.customer.membership_id - if generic_customer_id != nil || generic_customer_id != "" + if generic_customer_id != nil || generic_customer_id != "" || generic_customer_id != 0 paypar = sObj.sale_payments payparcost = 0 paypar.each do |pp| @@ -250,24 +250,22 @@ class SalePayment < ApplicationRecord end end total_amount = food_prices - payparcost - puts "aaaa" - puts food_prices - puts payparcost - puts total_amount - receipt_no = sObj.receipt_no - membership = MembershipSetting.find_by_membership_type("paypar_url") - memberaction = MembershipAction.find_by_membership_type("rebate") - campaign_type_id = memberaction.additional_parameter["campaign_type_id"] - app_token = membership.auth_token.to_s - url = membership.gateway_url.to_s + memberaction.gateway_url.to_s - response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id, - receipt_no: receipt_no}.to_json, - :headers => { - 'Content-Type' => 'application/json', - 'Accept' => 'application/json' - }) + if total_amount > 0 + receipt_no = sObj.receipt_no + membership = MembershipSetting.find_by_membership_type("paypar_url") + memberaction = MembershipAction.find_by_membership_type("rebate") + campaign_type_id = memberaction.additional_parameter["campaign_type_id"] + app_token = membership.auth_token.to_s + url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id, + receipt_no: receipt_no}.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + }) - puts response.to_json + puts response.to_json + end end end diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb index 4daa672b..ae714bea 100644 --- a/app/views/origami/redeem_payments/index.html.erb +++ b/app/views/origami/redeem_payments/index.html.erb @@ -18,6 +18,7 @@
+

You can rebate upto <%= @food_prices %>

@@ -119,22 +120,26 @@ $("#redeem").click(function(){ redeem_amount = parseInt($("#used_amount").text()); if(redeem_amount<=0 ){ alert("Please type valid amount"); - + }else if(valid_amount< redeem_amount){ alert(" Insufficient Amount!") }else{ - $.ajax({ - type: "POST", - url: "<%=origami_payment_paypar_path%>", - data: {redeem_amount:redeem_amount,membership_id:membership_id,sale_id:sale_id}, - success: function(result){ - if(result.status == true){ - window.location.href = '/origami/sale/'+ sale_id + "/payment" - }else{ - alert(result.message); + if(redeem_amount <= "<%= @food_prices %>"){ + $.ajax({ + type: "POST", + url: "<%=origami_payment_paypar_path%>", + data: {redeem_amount:redeem_amount,membership_id:membership_id,sale_id:sale_id}, + success: function(result){ + if(result.status == true){ + window.location.href = '/origami/sale/'+ sale_id + "/payment" + }else{ + alert(result.message); + } } - } - }) + }) + }else { + alert("Redeem Amount is over!"); + } } });