From a2e7ebd27a7cb906aa17065f79dc065fc23a0e69 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 14 Feb 2018 15:00:16 +0630
Subject: [PATCH] update payment show

---
 app/views/origami/payments/show.html.erb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index c97e9abe..b6d08ed0 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -13,6 +13,7 @@
             </div>
             <div class="row p-l-5 p-r-5">
               <div class="col-lg-6 col-md-6 col-sm-6"><strong>Table No :</strong> <%=@table_no%></div>
+              <span class="hidden" id="dining"><%if !@dining.nil?%><%= @dining.id%><%end%></span>
               <div class="col-lg-6 col-md-6 col-sm-6 text-left"><strong>Sale ID :</strong> <span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></span></div>
             </div>
             
@@ -369,9 +370,7 @@ var cashier_type = "<%= @cashier_type %>";
     if (sale) {
       var sale_id = sale
     } else {
-      if (cashier_type != "quick_service") {
-        var sale_id = "<%= @dining.id %>";
-      }
+      var sale_id = $('#dining').text();
     }
     //var table_id = $('.tables').attr("data-id");            
      window.location.href = '/origami/' + sale_id +"/"+ cashier_type + "/surveys"
@@ -428,10 +427,7 @@ var cashier_type = "<%= @cashier_type %>";
   });
 
   $('#edit').on('click', function () {
-    if (cashier_type != "quick_service") {
-      console.log(cashier_type)
-    var dining_id = "<%= @dining.id %>"
-  }
+    var dining_id = $('#dining').text();
     var sale_id = $('#sale_id').text();
     if ($(this).attr('active')=== "true") {
       window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type+"/edit";