fixed conflict

Gemfile

@@ -9,8 +9,8 @@ end
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.1.0'
 # Use mysql as the database for Active Record
-gem 'mysql2', '>= 0.3.18', '< 0.5'
-#gem 'pg'
+#gem 'mysql2', '>= 0.3.18', '< 0.5'
+gem 'pg'
 # Use Puma as the app server
 gem 'puma', '~> 3.0'
 # Use SCSS for stylesheets

Gemfile.lock

@@ -101,6 +101,7 @@ GEM
     nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
     pdf-core (0.7.0)
+    pg (0.20.0)
     prawn (2.2.2)
       pdf-core (~> 0.7.0)
       ttfunk (~> 1.5)
@@ -232,7 +233,7 @@ DEPENDENCIES
   jbuilder (~> 2.5)
   jquery-rails
   listen (~> 3.0.5)
-  mysql2 (>= 0.3.18, < 0.5)
+  pg
   prawn
   prawn-table
   puma (~> 3.0)

app/assets/stylesheets/application.scss

@@ -30,3 +30,7 @@
   padding:5px;
 }
 /*----- Order Processing Items -----*/
+
+/*----- Header Bar -----*/
+
+/*----- Header Bar -----*/

app/assets/stylesheets/theme.scss

@@ -6037,3 +6037,7 @@ h1 small,
   padding-top:20px;
   padding-bottom:20px;
 }
+
+.navbar-nav > li > a {
+  padding-top: 0px !important;
+}

app/models/order_queue_item.rb

@@ -0,0 +1,2 @@
+class OrderQueueItem < ApplicationRecord
+end

app/views/layouts/_header.html.erb

@@ -26,13 +26,13 @@
         <li class="navbar-nav mr-auto dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Transactions</a>
           <ul class="dropdown-menu">
-            <li><%= link_to "Orders ", settings_menus_path, :tabindex =>"-1" %></li>
-            <li><%= link_to "Sales ", settings_menus_path, :tabindex =>"-1" %></li>
+            <li><%= link_to "Orders ", origami_root_path, :tabindex =>"-1" %></li>
+            <li><%= link_to "Sales ", crm_root_path, :tabindex =>"-1" %></li>
           </ul>
         </li>
-        <li class="navbar-nav mr-auto">
+        <!-- <li class="navbar-nav mr-auto">
           Reports
-        </li>
+        </li> -->
      </ul>
 
    </div>

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

@@ -3,6 +3,7 @@
 <div class="page-header">
  <ul class="breadcrumb">
   <li><a href="<%=  %>">Home</a></li>
+  <li>Settings</li>
   <li>Menu</li>
   <span style="float: right">
     <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_path,:class => 'btn btn-primary btn-sm' %>

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

@@ -11,7 +11,7 @@
 <br/>
 <div class="card">
   <div class="card-block">
-    <h4 class="card-title">Menu Category</h4>
+    <h4 class="card-title">Menu</h4>
     <table class="table">
       <thead>
         <tr>
@@ -64,9 +64,9 @@
       <tbody>
          <% @settings_menu.menu_categories.each do |category|%>
           <tr>
-            <td><%= category.name %></td>
+            <td><%= link_to category.name, settings_menu_category_path(category) %></td>
             <td><%= category.children.count  rescue "-" %></td>
-            <td><%= link_to category.menu_items.count, settings_menu_category_menu_items_path(category) %></td>
+            <td><%= category.menu_items.count %></td>
             <td><%= category.order_by %></td>
             <td><%=l category.created_at, format: :short %></td>
             <td><%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu, category) %></td>

app/views/settings/simple_menu_items/new.html.erb

@@ -9,9 +9,9 @@
 		<div class="page-header">
 		 <ul class="breadcrumb">
 		   	<li><a href="<%= root_path %>">Home</a></li>
-  			<li><a href="<%= settings_menu_items_path %>">Menu Items</a></li>
+  			<li><!-- <a href="<%= settings_menu_items_path %>"> -->Menu Items<!-- </a> --></li>
 		  	<li>New</li>
 		 </ul>
 		</div>
-    <%= render 'form', settings_menu_item: @settings_menu_item %>
+    <%= render 'form', settings_simple_menu_item: @settings_menu_item %>
 </div>

db/migrate/20170531070951_create_order_queue_items.rb

@@ -0,0 +1,13 @@
+class CreateOrderQueueItems < ActiveRecord::Migration[5.1]
+  def change
+    create_table :order_queue_items do |t|
+      t.string     :item_code, :null => false, :index => true
+      t.references :order_queue_station, foreign_key: true
+      t.references :order, foreign_key: true
+      t.boolean :print_status
+      t.boolean :delivery_status
+      t.boolean :queue_status
+      t.timestamps
+    end
+  end
+end

spec/models/order_queue_item_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe OrderQueueItem, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end