From fd4bf6912f7063648d461b6adc8d42cff4e5ae3c Mon Sep 17 00:00:00 2001 From: Cherry Date: Wed, 31 May 2017 09:13:01 +0630 Subject: [PATCH 1/5] for checkout new branch --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6916f408..6936e5f1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,9 +48,9 @@ GEM sass (>= 3.4.19) builder (3.2.3) byebug (9.0.6) - coffee-rails (4.2.1) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.2.x) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs @@ -97,7 +97,7 @@ GEM minitest (5.10.2) multi_json (1.12.1) mysql2 (0.4.6) - nio4r (2.0.0) + nio4r (2.1.0) nokogiri (1.7.2) mini_portile2 (~> 2.1.0) pdf-core (0.7.0) From fda69012da5e6afbd9d7fb3162096e3f4492b5a3 Mon Sep 17 00:00:00 2001 From: PhyoTheingi Date: Wed, 31 May 2017 09:36:10 +0630 Subject: [PATCH 2/5] Menu Category path fixing --- app/assets/stylesheets/application.scss | 4 ++++ app/assets/stylesheets/theme.scss | 4 ++++ app/views/layouts/_header.html.erb | 8 ++++---- app/views/settings/menus/index.html.erb | 1 + app/views/settings/menus/show.html.erb | 6 +++--- app/views/settings/simple_menu_items/new.html.erb | 4 ++-- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 1d2da3ef..7aa6d6c5 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -30,3 +30,7 @@ padding:5px; } /*----- Order Processing Items -----*/ + +/*----- Header Bar -----*/ + +/*----- Header Bar -----*/ \ No newline at end of file diff --git a/app/assets/stylesheets/theme.scss b/app/assets/stylesheets/theme.scss index 8640519a..b633b55e 100644 --- a/app/assets/stylesheets/theme.scss +++ b/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; +} \ No newline at end of file diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 372d9674..b73cc5ae 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -26,13 +26,13 @@
    • -
    • <%= link_to "Orders ", settings_menus_path, :tabindex =>"-1" %>
      • -
    • <%= link_to "Sales ", settings_menus_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Orders ", origami_root_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Sales ", crm_root_path, :tabindex =>"-1" %>
    • -
  • + diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb index 0f6d5943..47c031ca 100644 --- a/app/views/settings/menus/index.html.erb +++ b/app/views/settings/menus/index.html.erb @@ -3,6 +3,7 @@
    • Home
      • +
    • Settings
    • Menu
      • <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_path,:class => 'btn btn-primary btn-sm' %> diff --git a/app/views/settings/menus/show.html.erb b/app/views/settings/menus/show.html.erb index 4e126323..34b2c3c0 100644 --- a/app/views/settings/menus/show.html.erb +++ b/app/views/settings/menus/show.html.erb @@ -11,7 +11,7 @@
      -

      Menu Category

      +

      Menu

      @@ -64,9 +64,9 @@ <% @settings_menu.menu_categories.each do |category|%> - + - + diff --git a/app/views/settings/simple_menu_items/new.html.erb b/app/views/settings/simple_menu_items/new.html.erb index bfc07ae3..a9bf5dee 100644 --- a/app/views/settings/simple_menu_items/new.html.erb +++ b/app/views/settings/simple_menu_items/new.html.erb @@ -9,9 +9,9 @@
      - <%= render 'form', settings_menu_item: @settings_menu_item %> + <%= render 'form', settings_simple_menu_item: @settings_menu_item %> From 85b9ffaf209d19463d215265013bbda502e5c8a6 Mon Sep 17 00:00:00 2001 From: Nweni Date: Wed, 31 May 2017 10:04:37 +0630 Subject: [PATCH 3/5] gem lock --- Gemfile | 4 ++-- Gemfile.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index d42da647..d64ba992 100644 --- a/Gemfile +++ b/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 diff --git a/Gemfile.lock b/Gemfile.lock index 6916f408..3627d882 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,11 +96,11 @@ GEM mini_portile2 (2.1.0) minitest (5.10.2) multi_json (1.12.1) - mysql2 (0.4.6) nio4r (2.0.0) 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 +232,7 @@ DEPENDENCIES jbuilder (~> 2.5) jquery-rails listen (~> 3.0.5) - mysql2 (>= 0.3.18, < 0.5) + pg prawn prawn-table puma (~> 3.0) From 1d8b03b6abcc29bc7c02fb1e74dfe07749279fc5 Mon Sep 17 00:00:00 2001 From: Nweni Date: Wed, 31 May 2017 10:26:16 +0630 Subject: [PATCH 4/5] update --- Gemfile | 4 ++-- Gemfile.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index d42da647..d64ba992 100644 --- a/Gemfile +++ b/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 diff --git a/Gemfile.lock b/Gemfile.lock index 6916f408..3627d882 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,11 +96,11 @@ GEM mini_portile2 (2.1.0) minitest (5.10.2) multi_json (1.12.1) - mysql2 (0.4.6) nio4r (2.0.0) 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 +232,7 @@ DEPENDENCIES jbuilder (~> 2.5) jquery-rails listen (~> 3.0.5) - mysql2 (>= 0.3.18, < 0.5) + pg prawn prawn-table puma (~> 3.0) From 7e7b89e1431b4a7884fa987e4efb4413ae38e2db Mon Sep 17 00:00:00 2001 From: Nweni Date: Wed, 31 May 2017 13:40:48 +0630 Subject: [PATCH 5/5] added order_queue_item --- app/models/order_queue_item.rb | 2 ++ .../20170531070951_create_order_queue_items.rb | 13 +++++++++++++ spec/models/order_queue_item_spec.rb | 5 +++++ 3 files changed, 20 insertions(+) create mode 100644 app/models/order_queue_item.rb create mode 100644 db/migrate/20170531070951_create_order_queue_items.rb create mode 100644 spec/models/order_queue_item_spec.rb diff --git a/app/models/order_queue_item.rb b/app/models/order_queue_item.rb new file mode 100644 index 00000000..7f94fbec --- /dev/null +++ b/app/models/order_queue_item.rb @@ -0,0 +1,2 @@ +class OrderQueueItem < ApplicationRecord +end diff --git a/db/migrate/20170531070951_create_order_queue_items.rb b/db/migrate/20170531070951_create_order_queue_items.rb new file mode 100644 index 00000000..1ebc1c94 --- /dev/null +++ b/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 diff --git a/spec/models/order_queue_item_spec.rb b/spec/models/order_queue_item_spec.rb new file mode 100644 index 00000000..d4b7ed66 --- /dev/null +++ b/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
      <%= category.name %><%= link_to category.name, settings_menu_category_path(category) %> <%= category.children.count rescue "-" %><%= link_to category.menu_items.count, settings_menu_category_menu_items_path(category) %><%= category.menu_items.count %> <%= category.order_by %> <%=l category.created_at, format: :short %> <%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu, category) %>