hide change tax button after first bill
This commit is contained in:
@@ -63,7 +63,7 @@ $(document).on('turbolinks:load', function() {
|
|||||||
' <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
|
' <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
|
||||||
'</div>\n',
|
'</div>\n',
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
$('.datetimepicker').bootstrapMaterialDatePicker({
|
$('.datetimepicker').bootstrapMaterialDatePicker({
|
||||||
format: 'DD-MM-YYYY - HH:mm',
|
format: 'DD-MM-YYYY - HH:mm',
|
||||||
@@ -128,11 +128,11 @@ $(document).on('turbolinks:load', function() {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "/origami/" + unique_id,
|
url: "/origami/" + unique_id,
|
||||||
data: { 'booking_id' : unique_id },
|
data: { 'booking_id' : unique_id },
|
||||||
success:function(result){
|
success:function(result){
|
||||||
for (i = 0; i < result.length; i++) {
|
for (i = 0; i < result.length; i++) {
|
||||||
var data = JSON.stringify(result[i]);
|
var data = JSON.stringify(result[i]);
|
||||||
var parse_data = JSON.parse(data);
|
var parse_data = JSON.parse(data);
|
||||||
var show_date = "";
|
var show_date = "";
|
||||||
|
|
||||||
// Receipt Header
|
// Receipt Header
|
||||||
receipt_no = result[i].receipt_no;
|
receipt_no = result[i].receipt_no;
|
||||||
@@ -140,14 +140,14 @@ $(document).on('turbolinks:load', function() {
|
|||||||
if(result[i].receipt_date != null){
|
if(result[i].receipt_date != null){
|
||||||
receipt_date = new Date(result[i].receipt_date);
|
receipt_date = new Date(result[i].receipt_date);
|
||||||
show_date = receipt_date.getDate() + "-" + receipt_date.getMonth() + "-" + receipt_date.getFullYear() + ' ' + receipt_date.getHours()+ ':' + receipt_date.getMinutes()
|
show_date = receipt_date.getDate() + "-" + receipt_date.getMonth() + "-" + receipt_date.getFullYear() + ' ' + receipt_date.getHours()+ ':' + receipt_date.getMinutes()
|
||||||
}
|
}
|
||||||
|
|
||||||
//Receipt Charges
|
//Receipt Charges
|
||||||
sub_total += parseFloat(parse_data.price);
|
sub_total += parseFloat(parse_data.price);
|
||||||
|
|
||||||
discount_amount = parse_data.discount_amount == null? '0.0' : parse_data.discount_amount;
|
discount_amount = parse_data.discount_amount == null? '0.0' : parse_data.discount_amount;
|
||||||
tax_amount = parse_data.tax_amount;
|
tax_amount = parse_data.tax_amount;
|
||||||
grand_total_amount = parse_data.grand_total_amount;
|
grand_total_amount = parse_data.grand_total_amount;
|
||||||
|
|
||||||
// Ordered Items
|
// Ordered Items
|
||||||
var order_items_rows = "<tr>" +
|
var order_items_rows = "<tr>" +
|
||||||
@@ -234,7 +234,7 @@ $(document).on('turbolinks:load', function() {
|
|||||||
window.location.href = "/origami/cashier/credit_sales/"+sale_id;
|
window.location.href = "/origami/cashier/credit_sales/"+sale_id;
|
||||||
}else{
|
}else{
|
||||||
window.location.href = "/origami/quick_service/credit_sales/"+sale_id;
|
window.location.href = "/origami/quick_service/credit_sales/"+sale_id;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -261,9 +261,9 @@ function checkReceiptNoInFirstBillData(receipt_no,payment) {
|
|||||||
if (payment) {
|
if (payment) {
|
||||||
if (json_data.length>0) {
|
if (json_data.length>0) {
|
||||||
return json_data[0]["payment"];
|
return json_data[0]["payment"];
|
||||||
}else{
|
}else{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
@@ -385,7 +385,7 @@ function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amo
|
|||||||
}else{
|
}else{
|
||||||
payment_type = "Master";
|
payment_type = "Master";
|
||||||
}
|
}
|
||||||
|
|
||||||
$("#loading_wrapper").hide();
|
$("#loading_wrapper").hide();
|
||||||
swal({
|
swal({
|
||||||
title: 'Oops',
|
title: 'Oops',
|
||||||
@@ -512,7 +512,7 @@ if (!String.prototype.formatUnicorn) {
|
|||||||
}
|
}
|
||||||
var t=typeof arguments[0],n="string"==t||"number"==t?Array.prototype.slice.call(arguments):arguments[0];
|
var t=typeof arguments[0],n="string"==t||"number"==t?Array.prototype.slice.call(arguments):arguments[0];
|
||||||
for(var i in n){
|
for(var i in n){
|
||||||
e=e.replace(new RegExp("\\{"+i+"\\}","gi"),n[i]==null?'':n[i]);
|
e=e.replace(new RegExp("\\{"+i+"\\}","gi"),n[i]==null?'':n[i]);
|
||||||
}
|
}
|
||||||
return e;
|
return e;
|
||||||
};
|
};
|
||||||
@@ -523,7 +523,7 @@ if (!String.prototype.formatUnicorn) {
|
|||||||
function timeFormat(date){
|
function timeFormat(date){
|
||||||
var isPM = date.getHours() >= 12;
|
var isPM = date.getHours() >= 12;
|
||||||
var isMidday = date.getHours() == 12;
|
var isMidday = date.getHours() == 12;
|
||||||
var time = [(date.getHours()>10? date.getHours() : '0'+date.getHours()) - (isPM && !isMidday ? 12 : 0),
|
var time = [(date.getHours()>10? date.getHours() : '0'+date.getHours()) - (isPM && !isMidday ? 12 : 0),
|
||||||
(date.getMinutes()>10? date.getMinutes() : '0'+date.getMinutes()) || '00'].join(':') +
|
(date.getMinutes()>10? date.getMinutes() : '0'+date.getMinutes()) || '00'].join(':') +
|
||||||
(isPM ? ' PM' : ' AM');
|
(isPM ? ' PM' : ' AM');
|
||||||
return time;
|
return time;
|
||||||
@@ -589,4 +589,4 @@ function getCreditSales(filter, customer, cashier_type){
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
//End of credit sales function
|
//End of credit sales function
|
||||||
|
|||||||
@@ -42,17 +42,17 @@ class Printer::PrinterWorker
|
|||||||
end
|
end
|
||||||
|
|
||||||
def print(file_path, printer_destination = nil )
|
def print(file_path, printer_destination = nil )
|
||||||
# if printer_destination.nil?
|
if printer_destination.nil?
|
||||||
# printer_destination = self.printer_destination
|
printer_destination = self.printer_destination
|
||||||
# end
|
end
|
||||||
|
|
||||||
# copy = self.print_copies
|
copy = self.print_copies
|
||||||
# #Print only when printer information is not null
|
#Print only when printer information is not null
|
||||||
# if !self.printer_destination.nil?
|
if !self.printer_destination.nil?
|
||||||
# (1..copy).each do
|
(1..copy).each do
|
||||||
# page = Cups::PrintJob.new(file_path, printer_destination)
|
page = Cups::PrintJob.new(file_path, printer_destination)
|
||||||
# page.print
|
page.print
|
||||||
# end
|
end
|
||||||
# end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -814,8 +814,10 @@
|
|||||||
if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
|
if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
|
||||||
if (discount) {
|
if (discount) {
|
||||||
if(checkReceiptNoInFirstBillData(receipt_no,"")){
|
if(checkReceiptNoInFirstBillData(receipt_no,"")){
|
||||||
|
$("button.change_tax").hide();
|
||||||
$("#pay").show();
|
$("#pay").show();
|
||||||
}else{
|
}else{
|
||||||
|
$("button.change_tax").show();
|
||||||
$("#pay").hide();
|
$("#pay").hide();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,12 +20,12 @@ class ActionController::Base
|
|||||||
|
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
# check for license file
|
check for license file
|
||||||
# if check_license
|
if check_license
|
||||||
# current_license(ENV["SX_PROVISION_URL"])
|
current_license(ENV["SX_PROVISION_URL"])
|
||||||
# else
|
else
|
||||||
# redirect_to activate_path
|
redirect_to activate_path
|
||||||
# end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user