diff --git a/app/controllers/settings/cashier_terminals_controller.rb b/app/controllers/settings/cashier_terminals_controller.rb index 31e8da04..1d1c5497 100755 --- a/app/controllers/settings/cashier_terminals_controller.rb +++ b/app/controllers/settings/cashier_terminals_controller.rb @@ -16,10 +16,12 @@ class Settings::CashierTerminalsController < ApplicationController # GET /settings/cashier_terminals/new def new @settings_cashier_terminal = CashierTerminal.new + @server_mode = ENV["SERVER_MODE"] end # GET /settings/cashier_terminals/1/edit def edit + @server_mode = ENV["SERVER_MODE"] end # POST /settings/cashier_terminals diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb index adcbc507..2458096e 100755 --- a/app/controllers/settings/order_queue_stations_controller.rb +++ b/app/controllers/settings/order_queue_stations_controller.rb @@ -18,10 +18,12 @@ class Settings::OrderQueueStationsController < ApplicationController # GET /settings/order_queue_stations/new def new @settings_order_queue_station = OrderQueueStation.new + @server_mode = ENV["SERVER_MODE"] end # GET /settings/order_queue_stations/1/edit def edit + @server_mode = ENV["SERVER_MODE"] end # POST /settings/order_queue_stations diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb index e07da111..436035aa 100755 --- a/app/views/print_settings/_form.html.erb +++ b/app/views/print_settings/_form.html.erb @@ -16,7 +16,7 @@ <% if(@server_mode != 'cloud') %> <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %> <% else %> - <%= f.input :printer_name %> + <%= f.input :printer_name, :as => :select, :collection => [], include_blank: false %> <% end %> <%= f.input :brand_name %> <%= f.input :printer_type %> diff --git a/app/views/settings/cashier_terminals/_form.html.erb b/app/views/settings/cashier_terminals/_form.html.erb index d5693561..3ba13d97 100755 --- a/app/views/settings/cashier_terminals/_form.html.erb +++ b/app/views/settings/cashier_terminals/_form.html.erb @@ -12,7 +12,11 @@ <%= f.input :auto_print_receipt %> <%= f.label "Select Zones", :class => 'control-label' %> <%= f.collection_check_boxes :zone_ids , Zone.all, :id, :name , :class => 'checkbox form-group'%> - <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %> + <% 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 %> + <% end %> <%= f.input :font %> <%= f.input :font_size %> <%= f.input :show_tax %> @@ -58,4 +62,20 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb index 0ffa8f9a..adab922a 100755 --- a/app/views/settings/order_queue_stations/_form.html.erb +++ b/app/views/settings/order_queue_stations/_form.html.erb @@ -15,8 +15,11 @@ div.form-inputs span{