merge with origin master

2017-06-18 12:50:07 +06:30
parent 0e7042f00f e55ab32fad
commit 6d0cfd17ac
12 changed files with 78 additions and 80 deletions
--- a/app/views/settings/order_queue_stations/_form.html.erb
+++ b/app/views/settings/order_queue_stations/_form.html.erb
@@ -9,7 +9,7 @@ div.form-inputs span{
  <div class="form-inputs">
    <%= f.input :station_name %>
    <%= f.input :is_active %>
-    <%= f.input :auto_print %>
+
    <%= f.input :printer_name %>
    <%= f.input :font_size %>
    <%= f.input :print_copy %>
@@ -18,7 +18,7 @@ div.form-inputs span{
    <%= f.input :cut_per_item %>
    <%= f.input :use_alternate_name %>
    <%= f.input :processing_items, as: :hidden %>
-
+    <%= f.input :auto_print %>
  </div>

  <div class="form-actions">