diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index c86c0284..c97e9abe 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -19,7 +19,8 @@
             <div class="row p-l-5 p-r-5">
               <div class="col-lg-6 col-md-6 col-sm-6"><strong>Customer :</strong> <%= @sale_data.customer.name%> <span class="hidden" id="membership_id"><%= @sale_data.customer.membership_id%></span>
                 <span class="hidden" id="member_discount"><%= @member_discount%></span></div>
-              <div class="col-lg-6 col-md-6 col-sm-6 text-left"><strong>Checkin Time : </strong> <%= @checkin_time.utc.getlocal.strftime("%I:%M %p") %></div>
+              <div class="col-lg-6 col-md-6 col-sm-6 text-left"><strong>Checkin Time : </strong> <%if !@checkin_time.nil?%><%= @checkin_time.utc.getlocal.strftime("%I:%M %p") %>
+              <%end%></div>
             </div>
           </div>
         </div>
@@ -368,7 +369,9 @@ var cashier_type = "<%= @cashier_type %>";
     if (sale) {
       var sale_id = sale
     } else {
-      var sale_id = "<%= @dining.id %>";
+      if (cashier_type != "quick_service") {
+        var sale_id = "<%= @dining.id %>";
+      }
     }
     //var table_id = $('.tables').attr("data-id");            
      window.location.href = '/origami/' + sale_id +"/"+ cashier_type + "/surveys"
@@ -425,7 +428,10 @@ var cashier_type = "<%= @cashier_type %>";
   });
 
   $('#edit').on('click', function () {
+    if (cashier_type != "quick_service") {
+      console.log(cashier_type)
     var dining_id = "<%= @dining.id %>"
+  }
     var sale_id = $('#sale_id').text();
     if ($(this).attr('active')=== "true") {
       window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type+"/edit";