From 32bc3c5229ee776b99c96cb998490616bea5d7d9 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 12 Jul 2017 10:13:19 +0630
Subject: [PATCH] update member discount

---
 app/controllers/origami/discounts_controller.rb | 17 +++++++++++------
 app/views/origami/discounts/index.html.erb      |  4 ++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index e0596166..c0d93e15 100644
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -179,21 +179,26 @@ class Origami::DiscountsController < BaseOrigamiController
     rescue SocketError
       response = { status: false, message: "Can't open membership server "}
     end
+    # {"status":true,"discount_earned":360.0,"is_bonus":false}
+    # {"status":false,"message":"Can't open membership server "}
+
 
     puts "ssssssssss"
-    puts response.to_json
+    puts response.to_json["status"]
+    puts response["status"]
     
     table_id = sale.bookings[0].dining_facility_id
     table_type = DiningFacility.find(table_id).type
 
     # Re-calc All Amount in Sale
     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"])
+        result = {:status=> "Success", :table_id => table_id,:table_type => table_type }
+    end
+    if response[:status] == false
+        result = {:status=> response[:message], :table_id => table_id,:table_type => table_type }
     end   
-      result = {:status=> "Success", :table_id => table_id,:table_type => table_type }
-    # if response["status"] == false       
-    #      result = {:status=> "Success", :table_id => table_id,:table_type => table_type,:url_status => response[:status],:url_message => response[:message] }
-    # end
+      # result = {:status=> response["message"], :table_id => table_id,:table_type => table_type }
     
     render :json => result.to_json
   end
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index 248223ed..d59c74d4 100644
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -502,8 +502,8 @@ $(document).ready(function(){
 			    data: params,
 			    success:function(result){
 
-			    	if (result.url_status == false) {
-			    		status = result.url_message
+			    	if (result.status == "Success") {
+			    		status = result.status
 			    		type   = 'red'
 			    		btn_color = 'btn-red'
 			    	}else{