update

app/views/origami/discounts/index.html.erb

@@ -196,9 +196,9 @@
 	    <button id="remove-all" class="btn btn-warning btn-block action-btn">Remove All</button>
 		<button id="pay-discount" class="btn btn-danger btn-block action-btn">Enter</button>
 		<% if @member_discount%>
-			<hr />		
+			<!-- <hr />		
 			<button id="member-discount" class="btn btn-success btn-block action-btn
-			<%= @sale_data.customer.membership_id ? " " : "disabled"%>">Member Discount</button>
+			<%= @sale_data.customer.membership_id ? " " : "disabled"%>">Member Discount</button> -->
 		<%end %>
     </div>
   </div>

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 :font_size %> -->
     <%= f.input :print_copy %>
     <%= f.hidden_field :processing_items %>
     <%= f.label "Select Zones", :class => 'control-label' %>

app/views/settings/order_queue_stations/edit.html.erb

@@ -1,6 +1,4 @@
-<!-- <h1>Editing Settings Order Queue Station</h1>
 
-<%= render 'form', settings_order_queue_station: @settings_order_queue_station %> -->
 
 <div class="span12">
 		<div class="page-header">

app/views/settings/order_queue_stations/index.html.erb

@@ -16,14 +16,16 @@
     <thead>
       <tr>
         <th>Station name</th>
+        <th>Printer name</th>
         <th>Is active</th>
         <th>Auto Print</th>
         <th>Print copy</th>
-        <th>Printer name</th>
         <th>Cut per item</th>
-        <th>Use alternate name</th>
+        <th>Alternate name</th>
         <th>Created by</th>
-        <th colspan="3"></th>
+        <th> Created  At</th>
+        <th>Updated  At</th>
+        <th>Action</th>
       </tr>
     </thead>
 
@@ -31,13 +33,16 @@
       <% @settings_order_queue_stations.each do |settings_order_queue_station| %>
         <tr>
           <td><%= link_to settings_order_queue_station.station_name, settings_order_queue_station_path(settings_order_queue_station) %></td>
+          <td><%= settings_order_queue_station.printer_name %></td>
           <td><%= settings_order_queue_station.is_active %></td>
           <td><%= settings_order_queue_station.auto_print %></td>
           <td><%= settings_order_queue_station.print_copy %></td>
-          <td><%= settings_order_queue_station.printer_name %></td>
+          
           <td><%= settings_order_queue_station.cut_per_item %></td>
           <td><%= settings_order_queue_station.use_alternate_name %></td>
           <td><%= settings_order_queue_station.created_by %></td>
+          <td><%= settings_order_queue_station.created_at.strftime("%m-%d-%Y") %></td>
+          <td><%= settings_order_queue_station.updated_at.strftime("%m-%d-%Y") %></td>
           <td><%= link_to 'Assign Processing Items', new_settings_order_queue_station_processing_item_path(settings_order_queue_station) %></td>
           <td><%= link_to 'Edit', edit_settings_order_queue_station_path(settings_order_queue_station) %></td>
         </tr>

app/views/settings/order_queue_stations/show.html.erb

@@ -9,7 +9,7 @@
 </div>
 <div class="card">
   <div class="card-block">
-    <h4 class="card-title">Menu Item Option</h4>
+    <h4 class="card-title">Order Queue Station</h4>
     <table class="table">
       <thead>
         <tr>

app/views/settings/processing_items/_form.html.erb

@@ -2,6 +2,10 @@
   <%= f.error_notification %>
   <%= f.input :processing_items, as: :hidden %>
   <strong>Select Menu Items</strong><br/><br/>
+  <div class="form-actions">
+    <%= f.button :submit, class:'pull-right',  label: "Add Menu Items to Queue Station" %>
+  </div>
+  <br><br>
   <div class="row">
     <% @menu_categories.each do |category|%>
 

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');