diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index 1dced300..59fbd864 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -233,25 +233,23 @@ class Api::OrdersController < Api::ApiController
printer = PrintSetting.all
unique_code="OrderItemPdf"
- if !order_slim_pdf.empty?
- if !printer.empty?
- printer.each do |printer_setting|
- if printer_setting.unique_code == 'OrderItemPdf'
- unique_code="OrderItemPdf"
- elsif printer_setting.unique_code == 'OrderItemSlimPdf'
- unique_code="OrderItemSlimPdf"
- elsif printer_setting.unique_code == 'OrderSetItemPdf'
- unique_code="OrderSetItemPdf"
- elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
- unique_code="OrderItemSlimCustomisePdf"
- elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
- unique_code="OrderItemCustomisePdf"
- elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'
- unique_code="OrderSetItemCustomisePdf"
- end
- end
+ if !printer.empty?
+ printer.each do |printer_setting|
+ if printer_setting.unique_code == 'OrderItemPdf'
+ unique_code="OrderItemPdf"
+ elsif printer_setting.unique_code == 'OrderItemSlimPdf'
+ unique_code="OrderItemSlimPdf"
+ elsif printer_setting.unique_code == 'OrderSetItemPdf'
+ unique_code="OrderSetItemPdf"
+ elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
+ unique_code="OrderItemSlimCustomisePdf"
+ elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
+ unique_code="OrderItemCustomisePdf"
+ elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'
+ unique_code="OrderSetItemCustomisePdf"
+ end
end
- end
+ end
print_settings=PrintSetting.find_by_unique_code(unique_code)
order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index 59341bcb..ac94fd18 100755
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -211,7 +211,7 @@
-
+
@@ -432,6 +432,9 @@ var cashier_type = "<%= @cashier_type %>";
// Pay Discount for Payment
$("#pay-discount").on('click', function(e){
e.preventDefault();
+ if($('#pay-discount').is(":visible")) {
+ $('#pay-discount').prop("disabled",true);
+ }
$("#loading_wrapper").show();
var sale_id = $('#sale-id').text();
var discount_items = JSON.stringify(get_discount_item_rows());
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index f1979aef..986bed5f 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -869,6 +869,10 @@
// Bill Request
$('#request_bills').click(function () {
+ if($('#request_bills').is(":visible")) {
+ $('#request_bills').prop("disabled",true);
+ }
+
var order_id = $('#save_order_id').attr('data-order');
var ajax_url = "/origami/" + order_id + "/request_bills";
$.ajax({
@@ -893,8 +897,11 @@
});
$('#move').on('click', function () {
- var dining_id = "<%= @dining.id %>";
- window.location.href = '/origami/table/' + dining_id + "/movetable";
+ if($('#move').is(":visible")) {
+ $('#move').prop("disabled",true);
+ }
+ var dining_id = "<%= @dining.id %>";
+ window.location.href = '/origami/table/' + dining_id + "/movetable";
})
$('#back').on('click', function () {
diff --git a/app/views/origami/other_charges/index.html.erb b/app/views/origami/other_charges/index.html.erb
index b9dbbc60..bf119be0 100755
--- a/app/views/origami/other_charges/index.html.erb
+++ b/app/views/origami/other_charges/index.html.erb
@@ -308,6 +308,9 @@ var cashier_type = "<%= @cashier_type %>";
// Calculate Other Charges for Payment
$("#charge_other").on('click', function(e){
e.preventDefault();
+ if($('#charge_other').is(":visible")) {
+ $('#charge_other').prop("disabled",true);
+ }
var sale_id = $('#sale-id').text();
var sub_total = $('#order-sub-total').text();
var other_charges_items = JSON.stringify(get_other_item_rows());
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 46ec8fde..9262e05c 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -468,7 +468,7 @@