update member discount

This commit is contained in:
Aung Myo
2017-07-12 10:13:19 +06:30
parent 772bec9ba3
commit 32bc3c5229
2 changed files with 13 additions and 8 deletions

View File

@@ -179,9 +179,13 @@ class Origami::DiscountsController < BaseOrigamiController
rescue SocketError rescue SocketError
response = { status: false, message: "Can't open membership server "} response = { status: false, message: "Can't open membership server "}
end end
# {"status":true,"discount_earned":360.0,"is_bonus":false}
# {"status":false,"message":"Can't open membership server "}
puts "ssssssssss" puts "ssssssssss"
puts response.to_json puts response.to_json["status"]
puts response["status"]
table_id = sale.bookings[0].dining_facility_id table_id = sale.bookings[0].dining_facility_id
table_type = DiningFacility.find(table_id).type table_type = DiningFacility.find(table_id).type
@@ -189,11 +193,12 @@ class Origami::DiscountsController < BaseOrigamiController
# Re-calc All Amount in Sale # Re-calc All Amount in Sale
if response["status"] == true if response["status"] == true
sale.compute_by_sale_items(sale_id, sale.sale_items, response["discount_earned"]) sale.compute_by_sale_items(sale_id, sale.sale_items, response["discount_earned"])
end
result = {:status=> "Success", :table_id => table_id,:table_type => table_type } result = {:status=> "Success", :table_id => table_id,:table_type => table_type }
# if response["status"] == false end
# result = {:status=> "Success", :table_id => table_id,:table_type => table_type,:url_status => response[:status],:url_message => response[:message] } if response[:status] == false
# end result = {:status=> response[:message], :table_id => table_id,:table_type => table_type }
end
# result = {:status=> response["message"], :table_id => table_id,:table_type => table_type }
render :json => result.to_json render :json => result.to_json
end end

View File

@@ -502,8 +502,8 @@ $(document).ready(function(){
data: params, data: params,
success:function(result){ success:function(result){
if (result.url_status == false) { if (result.status == "Success") {
status = result.url_message status = result.status
type = 'red' type = 'red'
btn_color = 'btn-red' btn_color = 'btn-red'
}else{ }else{