diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index aef82ecf..0cae743a 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -1161,7 +1161,7 @@
 
     $('#edit').on('click', function () {
         var dining_id = "<%= @dining.id %>"
-        var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+        var sale_id = $("#sale_id").val(); //"<%= @obj_sale.sale_id rescue "" %>"
         if ($(this).attr('active')=== "true") {
            window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type +"/edit";
         }else{
@@ -1172,7 +1172,7 @@
 
     $('#commissions').on('click', function () {
         var dining_id = "<%= @dining.id %>"
-        var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+        var sale_id = $("#sale_id").val(); //"<%= @obj_sale.sale_id rescue "" %>"
         window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/load_commissioners";
     });
 
@@ -1195,7 +1195,7 @@
             closeOnConfirm: false
         }, function (isConfirm) {
           if (isConfirm) {
-            var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+            var sale_id = $("#sale_id").val();//"<%= @obj_sale.sale_id rescue "" %>"
             var ajax_url = "/origami/sale/" + sale_id + '/cashier/void';
             var remark  = $("#remark").val();
 
@@ -1303,7 +1303,7 @@
             closeOnConfirm: false
         }, function (isConfirm) {
           if (isConfirm) {
-            var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+            var sale_id = $("#sale_id").val(); //"<%= @obj_sale.sale_id rescue "" %>"
             var url = "/origami/sale/" + sale_id + '/cashier/waste_and_spoilage';
             $.ajax({
                 type: 'POST',
@@ -1334,7 +1334,7 @@
               createAccessCode(code);
                if (type == "edit") {
                 var dining_id = "<%= @dining.id rescue "" %> ";
-                  var sale_id   = "<%= @obj_sale.sale_id rescue "" %>";
+                  var sale_id   = $("#sale_id").val(); //"<%= @obj_sale.sale_id rescue "" %>";
                   window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type +"/edit";
                }else if(type == "void"){
                  $('#AccessCodeModal').modal('hide');
@@ -1369,7 +1369,7 @@
     var cashier_type = 'cashier';
     var sale_id = $('#sale_id').text();
     var dining_id = "<%= @dining.id rescue "" %> ";
-    var sale_id   = "<%= @obj_sale.sale_id rescue "" %>";
+    var sale_id   = $("#sale_id").val(); //"<%= @obj_sale.sale_id rescue "" %>";
     localStorage.removeItem("tax_type");
     swal({
       title: "Alert",
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 59546349..0bea82d4 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -1259,7 +1259,7 @@ $('#add_invoice').on('click',function(){
 
   $('#edit').on('click',function(){
     var dining_id = "<%= @room.id %>"
-    var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+    var sale_id = $('#sale_id').val(); //"<%= @obj_sale.sale_id rescue "" %>"
     window.location.href = '/origami/table/'+ dining_id + "/sale/"+ sale_id + "/cashier/edit";
   });
 
@@ -1318,7 +1318,7 @@ $('#add_invoice').on('click',function(){
 
   $('#commissions').on('click', function () {
         var dining_id = "<%= @room.id %>"
-        var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+        var sale_id = $('#sale_id').val(); //"<%= @obj_sale.sale_id rescue "" %>"
         window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/load_commissioners";
     });
 
@@ -1383,7 +1383,7 @@ $('#add_invoice').on('click',function(){
             closeOnConfirm: false
         }, function (isConfirm) {
           if (isConfirm) {
-            var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+            var sale_id = $('#sale_id').val(); //"<%= @obj_sale.sale_id rescue "" %>"
             var url = "/origami/sale/" + sale_id + '/cashier/waste_and_spoilage';
             $.ajax({
                 type: 'POST',
@@ -1420,7 +1420,7 @@ $('#add_invoice').on('click',function(){
               createAccessCode(code);
                if (type == "edit") {
                 var dining_id = "<%= @room.id rescue ""%>";
-                  var sale_id   = "<%= @obj_sale.sale_id rescue "" %>";
+                  var sale_id   = $('#sale_id').val(); //"<%= @obj_sale.sale_id rescue "" %>";
                   window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/cashier/edit";
                }else if(type == "void"){
                  $('#AccessCodeModal').modal('hide');
diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb
index d16f9581..a95c5398 100644
--- a/app/views/origami/table_invoices/show.html.erb
+++ b/app/views/origami/table_invoices/show.html.erb
@@ -80,7 +80,7 @@
                     count += 1
                   sub_total = sub_total + sale_item.price
                %>
-               <input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>">
+               <input type="hidden" id="sale_id" value="<%= @sale.sale_id %>">
                <%
                # Can't check for discount
                 # unless sale_item.price == 0