+ Order at 12:23, Kyaw Lwin |
+ Printed at 12:23 |
+ Completed at 12:43
+
+
+
+
+
+
+
+
9. Table 4 - Beef Steak [x3]
+
Well Done, Fries, Salad
+
Order at 12:23, Kyaw Lwin
+
+
+
+
+
9. Table 4 - Beef Steak [x3]
+
Well Done, Fries, Salad
+
Order at 12:23, Kyaw Lwin
+
+
+
+
+
@@ -28,6 +63,9 @@
Medium, Fries, Salad
Order at 12:23, Kyaw Lwin
+
@@ -35,6 +73,9 @@
Well Done, Fries, Salad
Order at 12:23, Kyaw Lwin
+
@@ -42,6 +83,9 @@
Well Done, Fries, Salad
Order at 12:23, Kyaw Lwin
+
@@ -49,6 +93,9 @@
Well Done, Fries, Salad
Order at 12:23, Kyaw Lwin
+
@@ -56,6 +103,9 @@
Well Done, Fries, Salad
Order at 12:23, Kyaw Lwin
+
@@ -63,6 +113,9 @@
Well Done, Fries, Salad
Order at 12:23, Kyaw Lwin
+
@@ -70,6 +123,9 @@
Well Done, Fries, Salad
Order at 12:23, Kyaw Lwin
+
@@ -77,6 +133,9 @@
Well Done, Fries, Salad
Order at 12:23, Kyaw Lwin
+
@@ -307,9 +366,6 @@
-
-
-
diff --git a/bin/setup b/bin/setup
index e620b4da..52f875da 100755
--- a/bin/setup
+++ b/bin/setup
@@ -18,10 +18,10 @@ chdir APP_ROOT do
system! 'gem install bundler --conservative'
system('bundle check') || system!('bundle install')
- # puts "\n== Copying sample files =="
- # unless File.exist?('config/database.yml')
- # cp 'config/database.yml.sample', 'config/database.yml'
- # end
+ puts "\n== Copying sample files =="
+ unless File.exist?('config/database.yml')
+ cp 'config/database.yml.sample', 'config/database.yml'
+ end
puts "\n== Preparing database =="
system! 'bin/rails db:setup'
diff --git a/config/database.yml.sample b/config/database.yml.sample
new file mode 100644
index 00000000..02c6afe3
--- /dev/null
+++ b/config/database.yml.sample
@@ -0,0 +1,83 @@
+# ## SQLIte3 --- Setup
+#
+# # SQLite version 3.x
+# # gem install sqlite3
+# #
+# # Ensure the SQLite 3 gem is defined in your Gemfile
+# # gem 'sqlite3'
+# #
+# default: &default
+# adapter: sqlite3
+# pool: 5
+# timeout: 5000
+#
+# development:
+# <<: *default
+# database: db/development.sqlite3
+#
+# # Warning: The database defined as "test" will be erased and
+# # re-generated from your development database when you run "rake".
+# # Do not set this db to the same as development or production.
+# test:
+# <<: *default
+# database: db/test.sqlite3
+#
+# production:
+# <<: *default
+# database: db/production.sqlite3
+
+# Mysql --- Setup
+# MySQL. Versions 5.0 and up are supported.
+#
+# Install the MySQL driver
+# gem install mysql2
+#
+# Ensure the MySQL gem is defined in your Gemfile
+# gem 'mysql2'
+#
+# And be sure to use new-style password hashing:
+# http://dev.mysql.com/doc/refman/5.7/en/old-client.html
+#
+default: &default
+ adapter: mysql2
+ encoding: utf8
+ pool: 5
+ username: root
+ password:
+ socket: /tmp/mysql.sock
+
+development:
+ <<: *default
+ database: SXRestaurants_development
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+ <<: *default
+ database: SXRestaurants_test
+
+# As with config/secrets.yml, you never want to store sensitive information,
+# like your database password, in your source code. If your source code is
+# ever seen by anyone, they now have access to your database.
+#
+# Instead, provide the password as a unix environment variable when you boot
+# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
+# for a full rundown on how to provide these environment variables in a
+# production deployment.
+#
+# On Heroku and other platform providers, you may have a full connection URL
+# available as an environment variable. For example:
+#
+# DATABASE_URL="mysql2://myuser:mypass@localhost/somedatabase"
+#
+# You can use this database configuration with:
+#
+# production:
+# url: <%= ENV['DATABASE_URL'] %>
+#
+production:
+ <<: *default
+ database: SXRestaurants_production
+ username: SXRestaurants
+ password: <%= ENV['SXRESTAURANTS_DATABASE_PASSWORD'] %>
diff --git a/config/routes.rb b/config/routes.rb
index d00c7453..26fe9935 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -61,15 +61,16 @@ Rails.application.routes.draw do
namespace :origami do
root "home#index"
get "/:booking_id" => "home#show" do #origami/:booking_id will show
- resources :payment, only: [:create ] #add payment by payment_method
- resources :discount, only: [:create ] #add discount type
+ resources :payments, only: [:index, :create ] #add payment by payment_method
+ resources :discounts, only: [:index, :create ] #add discount type
+ resources :customers, only: [:index, :create ] #add customer type
end
end
- #--------- Waiter ------------#
- namespace :waiter do
+ #--------- Waiter/Ordering Station ------------#
+ namespace :oishi do
#zones
#tables
#orders
@@ -77,6 +78,7 @@ Rails.application.routes.draw do
#--------- Customer Relationship Management ------------#
namespace :crm do
+ root "home#index" #queue number
#customers
resources :customers
#membership
@@ -104,6 +106,8 @@ Rails.application.routes.draw do
resources :menu_categories do
#menu_items
resources :menu_items
+ resources :simple_menu_items
+ resources :set_menu_items
end
resources :menu_items do
@@ -135,17 +139,19 @@ Rails.application.routes.draw do
end
+ #mount_compendium at: '/report' #, controller: 'reports'
+
#--------- Reports ------------#
- namespace :reports do
- #dashboard
- #sales
- #orders
- #shifts
- resources :shifts do
- resources :orders
- resources :sales
- end
- end
+ # namespace :reports do
+ # #dashboard
+ # #sales
+ # #orders
+ # #shifts
+ # resources :shifts do
+ # resources :orders
+ # resources :sales
+ # end
+ # end
diff --git a/db/migrate/20170507045043_order_items_completed_by.rb b/db/migrate/20170507045043_order_items_completed_by.rb
new file mode 100644
index 00000000..a00fdbb4
--- /dev/null
+++ b/db/migrate/20170507045043_order_items_completed_by.rb
@@ -0,0 +1,6 @@
+class OrderItemsCompletedBy < ActiveRecord::Migration[5.0]
+ def change
+ add_column :order_items, :completed_by, :string
+ add_column :order_items, :completed_at, :datetime
+ end
+end
diff --git a/db/order_inputs_from_emenu b/db/order_inputs_from_emenu
index d0db0c47..9b97615b 100644
--- a/db/order_inputs_from_emenu
+++ b/db/order_inputs_from_emenu
@@ -4,22 +4,18 @@
"item_instance_code"=>"II0021",
"quantity"=>1,
"options"=>[]},
-
{"order_item_id"=>2,
"item_instance_code"=>"II0042",
"quantity"=>1, "parent_order_item_id"=>1,
"options"=>[]},
-
{"order_item_id"=>3,
"item_instance_code"=>"II0053",
"quantity"=>1,
"parent_order_item_id"=>1,
"options"=>["mild spicy"]},
-
{"order_item_id"=>4,
"item_instance_code"=>"II0031",
"quantity"=>1, "options"=>[]},
-
{"order_item_id"=>5,
"item_instance_code"=>"II0073",
"quantity"=>1, "parent_order_item_id"=>4, "options"=>[]}]