merge master

This commit is contained in:
Yan
2018-04-05 16:10:59 +06:30
45 changed files with 671 additions and 161 deletions

View File

@@ -10,6 +10,9 @@
<%= f.input :unique_code %>
<%= f.input :template %>
<%= f.input :font %>
<%= f.input :header_font_size %>
<%= f.input :item_font_size %>
<%
if(@server_mode != 'cloud')
%>
@@ -19,7 +22,6 @@
%>
<%= f.input :printer_name, :as => :select, :collection => [], include_blank: false %>
<% end %>
<%= f.input :brand_name %>
<%= f.input :printer_type %>
<%= f.input :api_settings %>