git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Redeem amount validation

Browse Source
This commit is contained in:
Phyo
2017-06-13 12:04:31 +06:30
parent 9e4c8cef68
commit 99d00f6d2a
3 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/origami/redeem_payments_controller.rb
View File

@@ -4,6 +4,7 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
payment_method = params[:payment_method] payment_method = params[:payment_method]
@membership_rebate_balance=0 @membership_rebate_balance=0
sale_data = Sale.find_by_sale_id(@sale_id) 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
if sale_data.customer_id if sale_data.customer_id
customer_data= Customer.find_by_customer_id(sale_data.customer_id) customer_data= Customer.find_by_customer_id(sale_data.customer_id)
@@ -28,8 +29,8 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
else else
@out = false,0 @out = false,0
end end
else else
@out = false, 0 @out = false, 0
end end

36
app/models/sale_payment.rb
View File

@@ -96,7 +96,7 @@ class SalePayment < ApplicationRecord
else else
response = false; response = false;
end end
else else
response =false; response =false;
end end
@@ -241,7 +241,7 @@ class SalePayment < ApplicationRecord
def rebat(sObj) def rebat(sObj)
food_prices, beverage_prices = SaleItem.calculate_food_beverage(sObj.sale_items) food_prices, beverage_prices = SaleItem.calculate_food_beverage(sObj.sale_items)
generic_customer_id = sObj.customer.membership_id 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 paypar = sObj.sale_payments
payparcost = 0 payparcost = 0
paypar.each do |pp| paypar.each do |pp|
@@ -250,24 +250,22 @@ class SalePayment < ApplicationRecord
end end
end end
total_amount = food_prices - payparcost total_amount = food_prices - payparcost
puts "aaaa" if total_amount > 0
puts food_prices receipt_no = sObj.receipt_no
puts payparcost membership = MembershipSetting.find_by_membership_type("paypar_url")
puts total_amount memberaction = MembershipAction.find_by_membership_type("rebate")
receipt_no = sObj.receipt_no campaign_type_id = memberaction.additional_parameter["campaign_type_id"]
membership = MembershipSetting.find_by_membership_type("paypar_url") app_token = membership.auth_token.to_s
memberaction = MembershipAction.find_by_membership_type("rebate") url = membership.gateway_url.to_s + memberaction.gateway_url.to_s
campaign_type_id = memberaction.additional_parameter["campaign_type_id"] response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id,
app_token = membership.auth_token.to_s receipt_no: receipt_no}.to_json,
url = membership.gateway_url.to_s + memberaction.gateway_url.to_s :headers => {
response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id, 'Content-Type' => 'application/json',
receipt_no: receipt_no}.to_json, 'Accept' => 'application/json'
:headers => { })
'Content-Type' => 'application/json',
'Accept' => 'application/json'
})
puts response.to_json puts response.to_json
end
end end
end end

29
app/views/origami/redeem_payments/index.html.erb
View File

@@ -18,6 +18,7 @@
<hr> <hr>
</div> </div>
</div> </div>
<p class="">You can rebate upto <span style="color:red;" id="food_prices"><%= @food_prices %></span></p>
</div> </div>
</div> </div>
@@ -119,22 +120,26 @@ $("#redeem").click(function(){
redeem_amount = parseInt($("#used_amount").text()); redeem_amount = parseInt($("#used_amount").text());
if(redeem_amount<=0 ){ if(redeem_amount<=0 ){
alert("Please type valid amount"); alert("Please type valid amount");
}else if(valid_amount< redeem_amount){ }else if(valid_amount< redeem_amount){
alert(" Insufficient Amount!") alert(" Insufficient Amount!")
}else{ }else{
$.ajax({ if(redeem_amount <= "<%= @food_prices %>"){
type: "POST", $.ajax({
url: "<%=origami_payment_paypar_path%>", type: "POST",
data: {redeem_amount:redeem_amount,membership_id:membership_id,sale_id:sale_id}, url: "<%=origami_payment_paypar_path%>",
success: function(result){ data: {redeem_amount:redeem_amount,membership_id:membership_id,sale_id:sale_id},
if(result.status == true){ success: function(result){
window.location.href = '/origami/sale/'+ sale_id + "/payment" if(result.status == true){
}else{ window.location.href = '/origami/sale/'+ sale_id + "/payment"
alert(result.message); }else{
alert(result.message);
}
} }
} })
}) }else {
alert("Redeem Amount is over!");
}
} }
}); });
</script> </script>