diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index 8f4155ba..613462ee 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -46,7 +46,7 @@ $(function() { var item_list = $('.summary-items'); item_list.empty(); - for(var i in items) { + for(var i in items) { var item_price = 0; if(items[i].price > 0){ item_price = items[i].price; diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb index 3c3bfd0b..8a51617e 100644 --- a/app/controllers/origami/order_reservation_controller.rb +++ b/app/controllers/origami/order_reservation_controller.rb @@ -68,5 +68,4 @@ class Origami::OrderReservationController < BaseOrigamiController render :json => response end - end diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index 2d0e53bb..26f3dad8 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -81,7 +81,7 @@ class OrderReservation < ApplicationRecord @status, @booking = @order.generate - # Order.send_customer_view(@booking) + # Order.send_customer_view(@booking) if @status && @booking @status, @sale = Sale.request_bill(@order,current_user,current_login_employee) diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb index 52e8a517..1b6d07e2 100755 --- a/app/views/origami/surveys/_form.html.erb +++ b/app/views/origami/surveys/_form.html.erb @@ -67,12 +67,12 @@
- <%= f.input :child , input_html: { class: 'col-md-10' }%> + <%= f.input :child , input_html: { class: 'col-md-10' , :onChange => "total_customer();"}%>
- <%= f.input :adult , input_html: { class: 'col-md-10' }%> + <%= f.input :adult , input_html: { class: 'col-md-10' , :onChange => "total_customer();"}%>
@@ -88,7 +88,7 @@ - <%= f.input :total_customer, input_html: { class: 'col-md-11'} %> + <%= f.input :total_customer, input_html: { :readonly => true, class: 'col-md-11'} %> <%= f.input :local , input_html: { class: 'col-md-11' }%>
diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb index 9c62b36f..e07da111 100755 --- a/app/views/print_settings/_form.html.erb +++ b/app/views/print_settings/_form.html.erb @@ -13,14 +13,10 @@ <%= f.input :header_font_size %> <%= f.input :item_font_size %> - <% - if(@server_mode != 'cloud') - %> + <% if(@server_mode != 'cloud') %> <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %> - <% - else - %> - <%= f.input :printer_name, :as => :select, :collection => [], include_blank: false %> + <% else %> + <%= f.input :printer_name %> <% end %> <%= f.input :brand_name %> <%= f.input :printer_type %> diff --git a/config/routes.rb b/config/routes.rb index 753c4cdb..9489009f 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -268,7 +268,7 @@ scope "(:locale)", locale: /en|mm/ do resources :order_reservation get 'order_reservation/get_order/:id' => "order_reservation#get_order",:as => "get_order", :defaults => { :format => 'json' } post 'order_reservation/update', to: "order_reservation#update" , :defaults => { :format => 'json' } - post 'order_reservation/send_status', to: "order_reservation#send_status" + post 'order_reservation/send_status', to: "order_reservation#send_status", :defaults => { :format => 'json' } end #--------- Waiter/Ordering Station ------------#