diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 55e649ed..2c3d970a 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -196,9 +196,9 @@ <% if @member_discount%> -
+ <%end %> diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb index 67b34798..08c00c90 100644 --- a/app/views/settings/order_queue_stations/_form.html.erb +++ b/app/views/settings/order_queue_stations/_form.html.erb @@ -11,7 +11,7 @@ div.form-inputs span{ <%= f.input :is_active %> <%= f.input :printer_name %> - <%= f.input :font_size %> + <%= f.input :print_copy %> <%= f.hidden_field :processing_items %> <%= f.label "Select Zones", :class => 'control-label' %> diff --git a/app/views/settings/order_queue_stations/edit.html.erb b/app/views/settings/order_queue_stations/edit.html.erb index 27cf2fc8..7301418c 100644 --- a/app/views/settings/order_queue_stations/edit.html.erb +++ b/app/views/settings/order_queue_stations/edit.html.erb @@ -1,6 +1,4 @@ -
diff --git a/app/views/settings/order_queue_stations/index.html.erb b/app/views/settings/order_queue_stations/index.html.erb index 287fb10b..71e36853 100644 --- a/app/views/settings/order_queue_stations/index.html.erb +++ b/app/views/settings/order_queue_stations/index.html.erb @@ -16,14 +16,16 @@ Station name + Printer name Is active Auto Print Print copy - Printer name Cut per item - Use alternate name + Alternate name Created by - + Created At + Updated At + Action @@ -31,13 +33,16 @@ <% @settings_order_queue_stations.each do |settings_order_queue_station| %> <%= link_to settings_order_queue_station.station_name, settings_order_queue_station_path(settings_order_queue_station) %> + <%= settings_order_queue_station.printer_name %> <%= settings_order_queue_station.is_active %> <%= settings_order_queue_station.auto_print %> <%= settings_order_queue_station.print_copy %> - <%= settings_order_queue_station.printer_name %> + <%= settings_order_queue_station.cut_per_item %> <%= settings_order_queue_station.use_alternate_name %> <%= settings_order_queue_station.created_by %> + <%= settings_order_queue_station.created_at.strftime("%m-%d-%Y") %> + <%= settings_order_queue_station.updated_at.strftime("%m-%d-%Y") %> <%= link_to 'Assign Processing Items', new_settings_order_queue_station_processing_item_path(settings_order_queue_station) %> <%= link_to 'Edit', edit_settings_order_queue_station_path(settings_order_queue_station) %> diff --git a/app/views/settings/order_queue_stations/show.html.erb b/app/views/settings/order_queue_stations/show.html.erb index 97c5dd4c..55d331f6 100644 --- a/app/views/settings/order_queue_stations/show.html.erb +++ b/app/views/settings/order_queue_stations/show.html.erb @@ -9,7 +9,7 @@
-

Menu Item Option

+

Order Queue Station

diff --git a/app/views/settings/processing_items/_form.html.erb b/app/views/settings/processing_items/_form.html.erb index 61ee6438..6613f4b6 100644 --- a/app/views/settings/processing_items/_form.html.erb +++ b/app/views/settings/processing_items/_form.html.erb @@ -2,6 +2,10 @@ <%= f.error_notification %> <%= f.input :processing_items, as: :hidden %> Select Menu Items

+
+ <%= f.button :submit, class:'pull-right', label: "Add Menu Items to Queue Station" %> +
+

<% @menu_categories.each do |category|%> diff --git a/db/sym_master.sql b/db/sym_master.sql index 84822ba5..95251c4c 100644 --- a/db/sym_master.sql +++ b/db/sym_master.sql @@ -128,9 +128,9 @@ insert into sym_trigger_router (trigger_id,router_id,initial_load_order,last_update_time,create_time) values('accounts','sx_2_store', 100, current_timestamp, current_timestamp); --- insert into sym_trigger_router --- (trigger_id,router_id,initial_load_order,initial_load_select,last_update_time,create_time) --- values('accounts','sx_2_one_store',100,'store_id=''$(externalId)''',current_timestamp,current_timestamp); +insert into sym_trigger_router +(trigger_id,router_id,initial_load_order,last_update_time,create_time) +values('accounts','store_2_sx', 100, current_timestamp, current_timestamp); insert into sym_trigger_router (trigger_id,router_id,initial_load_order,last_update_time,create_time) @@ -144,15 +144,15 @@ insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,sc values ('000','sx','000',1,null,null,null,null,null,current_timestamp,null,0,0,'000'); insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) values ('001','store','001',1,null,null,null,null,null,current_timestamp,null,0,0,'000'); -insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) - values ('002','store','002',1,null,null,null,null,null,current_timestamp,null,0,0,'000'); +-- insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) +-- values ('002','store','002',1,null,null,null,null,null,current_timestamp,null,0,0,'000'); insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) values ('000','acd36ce830d1fda466eec921433f38',0,current_timestamp,0,current_timestamp,'000'); insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) values ('001','acd36ce830d1fda466eec921433f38',1,null,1,null,'000'); -insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) - values ('002','acd36ce830d1fda466eec921433f38',1,null,1,null,'000'); +-- insert into sym_node_security (node_id,node_password,registration_enabled,registration_time,initial_load_enabled,initial_load_time,created_at_node_id) +-- values ('002','acd36ce830d1fda466eec921433f38',1,null,1,null,'000'); insert into sym_node_identity values ('000');