sale_id not tally for show details
This commit is contained in:
@@ -1161,7 +1161,7 @@
|
|||||||
|
|
||||||
$('#edit').on('click', function () {
|
$('#edit').on('click', function () {
|
||||||
var dining_id = "<%= @dining.id %>"
|
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") {
|
if ($(this).attr('active')=== "true") {
|
||||||
window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type +"/edit";
|
window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type +"/edit";
|
||||||
}else{
|
}else{
|
||||||
@@ -1172,7 +1172,7 @@
|
|||||||
|
|
||||||
$('#commissions').on('click', function () {
|
$('#commissions').on('click', function () {
|
||||||
var dining_id = "<%= @dining.id %>"
|
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";
|
window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/load_commissioners";
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -1195,7 +1195,7 @@
|
|||||||
closeOnConfirm: false
|
closeOnConfirm: false
|
||||||
}, function (isConfirm) {
|
}, function (isConfirm) {
|
||||||
if (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 ajax_url = "/origami/sale/" + sale_id + '/cashier/void';
|
||||||
var remark = $("#remark").val();
|
var remark = $("#remark").val();
|
||||||
|
|
||||||
@@ -1303,7 +1303,7 @@
|
|||||||
closeOnConfirm: false
|
closeOnConfirm: false
|
||||||
}, function (isConfirm) {
|
}, function (isConfirm) {
|
||||||
if (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';
|
var url = "/origami/sale/" + sale_id + '/cashier/waste_and_spoilage';
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@@ -1334,7 +1334,7 @@
|
|||||||
createAccessCode(code);
|
createAccessCode(code);
|
||||||
if (type == "edit") {
|
if (type == "edit") {
|
||||||
var dining_id = "<%= @dining.id rescue "" %> ";
|
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";
|
window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type +"/edit";
|
||||||
}else if(type == "void"){
|
}else if(type == "void"){
|
||||||
$('#AccessCodeModal').modal('hide');
|
$('#AccessCodeModal').modal('hide');
|
||||||
@@ -1369,7 +1369,7 @@
|
|||||||
var cashier_type = 'cashier';
|
var cashier_type = 'cashier';
|
||||||
var sale_id = $('#sale_id').text();
|
var sale_id = $('#sale_id').text();
|
||||||
var dining_id = "<%= @dining.id rescue "" %> ";
|
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");
|
localStorage.removeItem("tax_type");
|
||||||
swal({
|
swal({
|
||||||
title: "Alert",
|
title: "Alert",
|
||||||
|
|||||||
@@ -1259,7 +1259,7 @@ $('#add_invoice').on('click',function(){
|
|||||||
|
|
||||||
$('#edit').on('click',function(){
|
$('#edit').on('click',function(){
|
||||||
var dining_id = "<%= @room.id %>"
|
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";
|
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 () {
|
$('#commissions').on('click', function () {
|
||||||
var dining_id = "<%= @room.id %>"
|
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";
|
window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/load_commissioners";
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -1383,7 +1383,7 @@ $('#add_invoice').on('click',function(){
|
|||||||
closeOnConfirm: false
|
closeOnConfirm: false
|
||||||
}, function (isConfirm) {
|
}, function (isConfirm) {
|
||||||
if (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';
|
var url = "/origami/sale/" + sale_id + '/cashier/waste_and_spoilage';
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@@ -1420,7 +1420,7 @@ $('#add_invoice').on('click',function(){
|
|||||||
createAccessCode(code);
|
createAccessCode(code);
|
||||||
if (type == "edit") {
|
if (type == "edit") {
|
||||||
var dining_id = "<%= @room.id rescue ""%>";
|
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";
|
window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/cashier/edit";
|
||||||
}else if(type == "void"){
|
}else if(type == "void"){
|
||||||
$('#AccessCodeModal').modal('hide');
|
$('#AccessCodeModal').modal('hide');
|
||||||
|
|||||||
@@ -80,7 +80,7 @@
|
|||||||
count += 1
|
count += 1
|
||||||
sub_total = sub_total + sale_item.price
|
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
|
# Can't check for discount
|
||||||
# unless sale_item.price == 0
|
# unless sale_item.price == 0
|
||||||
|
|||||||
Reference in New Issue
Block a user