diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index 7b6b7eac..ae6c877e 100755 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -78,7 +78,7 @@ class OrderQueueStation < ApplicationRecord end end end - + if oqs.auto_print if oqs_order_items.length > 0 print_slip(oqs, order, oqs_order_items) diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 97c4d216..ff155525 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -316,14 +316,15 @@ if ($("#server_mode").val() != "cloud") { // first bill not used in cloud if (member_id && member_discount) { + if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){ $("#credit_payment").hide(); } else{ $("#credit_payment").show(); } - if(parseInt(jQuery.inArray("MPU", payment_type)) > 0 || parseInt(jQuery.inArray("VISA", payment_type)) > 0 || parseInt(jQuery.inArray("JCB", payment_type)) > 0 || parseInt(jQuery.inArray("Master", payment_type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) > 0 || parseInt(jQuery.inArray("Redeem", payment_type)) > 0){ - $("#card_payment").show(); + if(parseInt(jQuery.inArray("MPU", payment_type)) !=-1 || parseInt(jQuery.inArray("VISA", payment_type)) !=-1 || parseInt(jQuery.inArray("JCB", payment_type)) !=-1 || parseInt(jQuery.inArray("Master", payment_type)) !=-1 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) !=-1 || parseInt(jQuery.inArray("Redeem", payment_type)) !=-1){ + $("#card_payment").show(); } else{ $("#card_payment").hide(); }