From f746c1823816e371dd530897b2e37e7185dd9628 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 7 Jun 2017 18:47:50 +0630
Subject: [PATCH] (important)migrateion files changed

---
 Gemfile.lock                                           |  2 --
 app/models/account.rb                                  |  4 ++--
 app/models/menu_item.rb                                |  2 +-
 app/models/order.rb                                    |  1 -
 db/migrate/20170324135138_create_zones.rb              |  2 +-
 db/migrate/20170325111608_create_menus.rb              |  2 +-
 db/migrate/20170327152733_create_menu_categories.rb    |  2 +-
 ...e_accounts.rb => 20170331024747_create_accounts.rb} |  0
 db/migrate/20170331024749_create_menu_items.rb         |  2 +-
 .../20170402083337_create_menu_item_attributes.rb      |  2 +-
 db/migrate/20170402083525_create_menu_item_options.rb  |  2 +-
 .../20170402084230_create_menu_item_instances.rb       |  2 +-
 db/migrate/20170403135121_create_customers.rb          |  2 +-
 db/migrate/20170403135934_create_orders.rb             |  2 +-
 db/migrate/20170403140820_create_order_items.rb        |  2 +-
 db/migrate/20170403142424_create_dining_facilities.rb  |  2 +-
 .../20170403151731_create_order_queue_stations.rb      |  2 +-
 ...170403152600_create_order_queue_process_by_zones.rb |  2 +-
 .../20170403153001_create_payment_method_settings.rb   |  2 +-
 db/migrate/20170403155230_create_employees.rb          |  2 +-
 db/migrate/20170403155500_create_cashier_terminals.rb  |  2 +-
 db/migrate/20170403155531_create_cashier_login_logs.rb |  2 +-
 db/migrate/20170403160742_create_sales.rb              |  2 +-
 db/migrate/20170403161857_create_sale_items.rb         |  2 +-
 db/migrate/20170403163219_create_sale_taxes.rb         |  2 +-
 db/migrate/20170403163734_create_sale_payments.rb      |  2 +-
 db/migrate/20170403174029_create_sale_orders.rb        |  2 +-
 db/migrate/20170403174111_create_sale_audits.rb        |  2 +-
 db/migrate/20170403174309_create_lookups.rb            |  2 +-
 db/migrate/20170403183755_create_tax_profiles.rb       |  2 +-
 db/migrate/20170404034234_create_bookings.rb           |  2 +-
 db/migrate/20170408105938_create_seed_generators.rb    |  2 +-
 .../20170414071634_create_membership_settings.rb       |  2 +-
 .../20170414090001_create_assigned_order_items.rb      |  2 +-
 db/migrate/20170414110918_create_booking_orders.rb     |  2 +-
 db/migrate/20170421171849_add_company_address_email.rb |  2 +-
 db/migrate/20170507045043_order_items_completed_by.rb  |  2 +-
 db/seeds.rb                                            | 10 +++++-----
 38 files changed, 40 insertions(+), 43 deletions(-)
 rename db/migrate/{20170531024747_create_accounts.rb => 20170331024747_create_accounts.rb} (100%)

diff --git a/Gemfile.lock b/Gemfile.lock
index 533cd08b..ae2a3941 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -124,7 +124,6 @@ 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)
@@ -260,7 +259,6 @@ DEPENDENCIES
   kaminari!
   listen (~> 3.0.5)
   mysql2 (>= 0.3.18, < 0.5)
-  pg
   prawn
   prawn-table
   puma (~> 3.0)
diff --git a/app/models/account.rb b/app/models/account.rb
index a950865c..dc2e7cf8 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -4,6 +4,6 @@ class Account < ApplicationRecord
 	has_many :menu_items
     # belongs_to :lookup , :class_name => "Lookup"
     def self.collection
-	    Account.select("id, title").map { |e| [e.title, e.id] }
-	  end
+    Account.select("id, title").map { |e| [e.title, e.id] }
+  end
 end
diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb
index 5f8b95cf..89967e2e 100644
--- a/app/models/menu_item.rb
+++ b/app/models/menu_item.rb
@@ -4,7 +4,7 @@ class MenuItem < ApplicationRecord
   has_many :menu_item_instances
   belongs_to :parent, :class_name => "MenuItem", foreign_key: "menu_item_id", :optional => true
   has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id"
-  belongs_to :account, :optional => true
+  belongs_to :account
 
   validates_presence_of :item_code, :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item
 
diff --git a/app/models/order.rb b/app/models/order.rb
index 6755ad63..367081c8 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -272,7 +272,6 @@ class Order < ApplicationRecord
           left join sale_orders on sale_orders.order_id = orders.order_id
           left join sales on sales.sale_id = sale_orders.sale_id")
           .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to)
-
           .group("orders.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no,bookings.booking_id,sales.sale_id")
 
   end
diff --git a/db/migrate/20170324135138_create_zones.rb b/db/migrate/20170324135138_create_zones.rb
index 30a92048..00139170 100644
--- a/db/migrate/20170324135138_create_zones.rb
+++ b/db/migrate/20170324135138_create_zones.rb
@@ -1,4 +1,4 @@
-class CreateZones < ActiveRecord::Migration[5.0]
+class CreateZones < ActiveRecord::Migration[5.1]
   def change
     create_table :zones do |t|
       t.string :name, :null => false
diff --git a/db/migrate/20170325111608_create_menus.rb b/db/migrate/20170325111608_create_menus.rb
index a542de50..84efdf2d 100644
--- a/db/migrate/20170325111608_create_menus.rb
+++ b/db/migrate/20170325111608_create_menus.rb
@@ -1,4 +1,4 @@
-class CreateMenus < ActiveRecord::Migration[5.0]
+class CreateMenus < ActiveRecord::Migration[5.1]
   def change
     create_table :menus do |t|
       t.string :name
diff --git a/db/migrate/20170327152733_create_menu_categories.rb b/db/migrate/20170327152733_create_menu_categories.rb
index 9315e61e..59e3a8c9 100644
--- a/db/migrate/20170327152733_create_menu_categories.rb
+++ b/db/migrate/20170327152733_create_menu_categories.rb
@@ -1,4 +1,4 @@
-class CreateMenuCategories < ActiveRecord::Migration[5.0]
+class CreateMenuCategories < ActiveRecord::Migration[5.1]
   def change
     create_table :menu_categories do |t|
       t.references :menu, foreign_key: true
diff --git a/db/migrate/20170531024747_create_accounts.rb b/db/migrate/20170331024747_create_accounts.rb
similarity index 100%
rename from db/migrate/20170531024747_create_accounts.rb
rename to db/migrate/20170331024747_create_accounts.rb
diff --git a/db/migrate/20170331024749_create_menu_items.rb b/db/migrate/20170331024749_create_menu_items.rb
index 81baa5ab..a67156c5 100644
--- a/db/migrate/20170331024749_create_menu_items.rb
+++ b/db/migrate/20170331024749_create_menu_items.rb
@@ -1,4 +1,4 @@
-class CreateMenuItems < ActiveRecord::Migration[5.0]
+class CreateMenuItems < ActiveRecord::Migration[5.1]
   def change
     create_table :menu_items do |t|
       t.string :item_code, :null => false
diff --git a/db/migrate/20170402083337_create_menu_item_attributes.rb b/db/migrate/20170402083337_create_menu_item_attributes.rb
index b2c3b0fd..302202a6 100644
--- a/db/migrate/20170402083337_create_menu_item_attributes.rb
+++ b/db/migrate/20170402083337_create_menu_item_attributes.rb
@@ -1,4 +1,4 @@
-class CreateMenuItemAttributes < ActiveRecord::Migration[5.0]
+class CreateMenuItemAttributes < ActiveRecord::Migration[5.1]
   def change
     create_table :menu_item_attributes do |t|
       t.string :attribute_type, :null => false
diff --git a/db/migrate/20170402083525_create_menu_item_options.rb b/db/migrate/20170402083525_create_menu_item_options.rb
index a9e9734a..841b66a0 100644
--- a/db/migrate/20170402083525_create_menu_item_options.rb
+++ b/db/migrate/20170402083525_create_menu_item_options.rb
@@ -1,4 +1,4 @@
-class CreateMenuItemOptions < ActiveRecord::Migration[5.0]
+class CreateMenuItemOptions < ActiveRecord::Migration[5.1]
   def change
     create_table :menu_item_options do |t|
       t.string :name, :null => false
diff --git a/db/migrate/20170402084230_create_menu_item_instances.rb b/db/migrate/20170402084230_create_menu_item_instances.rb
index d5effcbf..c79cb322 100644
--- a/db/migrate/20170402084230_create_menu_item_instances.rb
+++ b/db/migrate/20170402084230_create_menu_item_instances.rb
@@ -1,4 +1,4 @@
-class CreateMenuItemInstances < ActiveRecord::Migration[5.0]
+class CreateMenuItemInstances < ActiveRecord::Migration[5.1]
   def change
     create_table :menu_item_instances do |t|
       t.references :menu_item, :foreign_key => true, :null => false
diff --git a/db/migrate/20170403135121_create_customers.rb b/db/migrate/20170403135121_create_customers.rb
index 8094f035..1bfd1bfc 100644
--- a/db/migrate/20170403135121_create_customers.rb
+++ b/db/migrate/20170403135121_create_customers.rb
@@ -1,4 +1,4 @@
-class CreateCustomers < ActiveRecord::Migration[5.0]
+class CreateCustomers < ActiveRecord::Migration[5.1]
   def change
     create_table :customers, :id => false do |t|
       t.string :customer_id, :limit => 16, :primary_key => true #custom foreign_key to prevent conflict during sync
diff --git a/db/migrate/20170403135934_create_orders.rb b/db/migrate/20170403135934_create_orders.rb
index a80e2760..4439bdba 100644
--- a/db/migrate/20170403135934_create_orders.rb
+++ b/db/migrate/20170403135934_create_orders.rb
@@ -1,4 +1,4 @@
-class CreateOrders < ActiveRecord::Migration[5.0]
+class CreateOrders < ActiveRecord::Migration[5.1]
   def change
     create_table :orders, :id => false do |t|
       t.string :order_id, :limit => 16, :primary_key => true #custom foreign_key to prevent conflict during sync
diff --git a/db/migrate/20170403140820_create_order_items.rb b/db/migrate/20170403140820_create_order_items.rb
index 32760907..b0f43c32 100644
--- a/db/migrate/20170403140820_create_order_items.rb
+++ b/db/migrate/20170403140820_create_order_items.rb
@@ -1,4 +1,4 @@
-class CreateOrderItems < ActiveRecord::Migration[5.0]
+class CreateOrderItems < ActiveRecord::Migration[5.1]
   def change
     create_table :order_items, :id => false do |t|
       t.string :order_items_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing
diff --git a/db/migrate/20170403142424_create_dining_facilities.rb b/db/migrate/20170403142424_create_dining_facilities.rb
index 788747d8..599151c6 100644
--- a/db/migrate/20170403142424_create_dining_facilities.rb
+++ b/db/migrate/20170403142424_create_dining_facilities.rb
@@ -1,4 +1,4 @@
-class CreateDiningFacilities < ActiveRecord::Migration[5.0]
+class CreateDiningFacilities < ActiveRecord::Migration[5.1]
   def change
     create_table :dining_facilities do |t|
       t.references :zone, foreign_key: true
diff --git a/db/migrate/20170403151731_create_order_queue_stations.rb b/db/migrate/20170403151731_create_order_queue_stations.rb
index f5c84269..6ad93bb1 100644
--- a/db/migrate/20170403151731_create_order_queue_stations.rb
+++ b/db/migrate/20170403151731_create_order_queue_stations.rb
@@ -1,4 +1,4 @@
-class CreateOrderQueueStations < ActiveRecord::Migration[5.0]
+class CreateOrderQueueStations < ActiveRecord::Migration[5.1]
   def change
     create_table :order_queue_stations do |t|
       t.string  :station_name, :null => false
diff --git a/db/migrate/20170403152600_create_order_queue_process_by_zones.rb b/db/migrate/20170403152600_create_order_queue_process_by_zones.rb
index d6b7d207..8f0ee73c 100644
--- a/db/migrate/20170403152600_create_order_queue_process_by_zones.rb
+++ b/db/migrate/20170403152600_create_order_queue_process_by_zones.rb
@@ -1,4 +1,4 @@
-class CreateOrderQueueProcessByZones < ActiveRecord::Migration[5.0]
+class CreateOrderQueueProcessByZones < ActiveRecord::Migration[5.1]
   def change
     create_table :order_queue_process_by_zones do |t|
       t.references :order_queue_station, :null => false
diff --git a/db/migrate/20170403153001_create_payment_method_settings.rb b/db/migrate/20170403153001_create_payment_method_settings.rb
index 2fea9098..981d42d3 100644
--- a/db/migrate/20170403153001_create_payment_method_settings.rb
+++ b/db/migrate/20170403153001_create_payment_method_settings.rb
@@ -1,4 +1,4 @@
-class CreatePaymentMethodSettings < ActiveRecord::Migration[5.0]
+class CreatePaymentMethodSettings < ActiveRecord::Migration[5.1]
   def change
     create_table :payment_method_settings do |t|
       t.string :payment_method, :null => false
diff --git a/db/migrate/20170403155230_create_employees.rb b/db/migrate/20170403155230_create_employees.rb
index a283ec95..c4bf65ac 100644
--- a/db/migrate/20170403155230_create_employees.rb
+++ b/db/migrate/20170403155230_create_employees.rb
@@ -1,4 +1,4 @@
-class CreateEmployees < ActiveRecord::Migration[5.0]
+class CreateEmployees < ActiveRecord::Migration[5.1]
   def change
     create_table :employees do |t|
       t.string :name, :null => false
diff --git a/db/migrate/20170403155500_create_cashier_terminals.rb b/db/migrate/20170403155500_create_cashier_terminals.rb
index dc5a5eb5..274c7914 100644
--- a/db/migrate/20170403155500_create_cashier_terminals.rb
+++ b/db/migrate/20170403155500_create_cashier_terminals.rb
@@ -1,4 +1,4 @@
-class CreateCashierTerminals < ActiveRecord::Migration[5.0]
+class CreateCashierTerminals < ActiveRecord::Migration[5.1]
   def change
     create_table :cashier_terminals do |t|
       t.string :name, :null => false
diff --git a/db/migrate/20170403155531_create_cashier_login_logs.rb b/db/migrate/20170403155531_create_cashier_login_logs.rb
index 176c5cae..0887f3bd 100644
--- a/db/migrate/20170403155531_create_cashier_login_logs.rb
+++ b/db/migrate/20170403155531_create_cashier_login_logs.rb
@@ -1,4 +1,4 @@
-class CreateCashierLoginLogs < ActiveRecord::Migration[5.0]
+class CreateCashierLoginLogs < ActiveRecord::Migration[5.1]
   def change
     create_table :cashier_login_logs, :id => false, :primary_key => :cashier_login_log_id do |t|
       t.string :cashier_login_log_id, :limit => 16, :null => false, :index => true, :unique => true #custom primary key - to ensure consistence for cloud syncing
diff --git a/db/migrate/20170403160742_create_sales.rb b/db/migrate/20170403160742_create_sales.rb
index c2bb718a..7e4850f1 100644
--- a/db/migrate/20170403160742_create_sales.rb
+++ b/db/migrate/20170403160742_create_sales.rb
@@ -1,4 +1,4 @@
-class CreateSales < ActiveRecord::Migration[5.0]
+class CreateSales < ActiveRecord::Migration[5.1]
   def change
     create_table :sales, :id => false do |t|
       t.string :sale_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing
diff --git a/db/migrate/20170403161857_create_sale_items.rb b/db/migrate/20170403161857_create_sale_items.rb
index aaf1dac3..cb07db08 100644
--- a/db/migrate/20170403161857_create_sale_items.rb
+++ b/db/migrate/20170403161857_create_sale_items.rb
@@ -1,4 +1,4 @@
-class CreateSaleItems < ActiveRecord::Migration[5.0]
+class CreateSaleItems < ActiveRecord::Migration[5.1]
   def change
     create_table :sale_items, :id => false do |t|
       t.string :sale_item_id, :limit => 16, :primary_key => true#custom primary key - to ensure consistence for cloud syncing
diff --git a/db/migrate/20170403163219_create_sale_taxes.rb b/db/migrate/20170403163219_create_sale_taxes.rb
index 3d28381a..ef52c9dc 100644
--- a/db/migrate/20170403163219_create_sale_taxes.rb
+++ b/db/migrate/20170403163219_create_sale_taxes.rb
@@ -1,4 +1,4 @@
-class CreateSaleTaxes < ActiveRecord::Migration[5.0]
+class CreateSaleTaxes < ActiveRecord::Migration[5.1]
   def change
     create_table :sale_taxes, :id => false do |t|
       t.string :sale_tax_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing
diff --git a/db/migrate/20170403163734_create_sale_payments.rb b/db/migrate/20170403163734_create_sale_payments.rb
index 3badca93..0e2f308a 100644
--- a/db/migrate/20170403163734_create_sale_payments.rb
+++ b/db/migrate/20170403163734_create_sale_payments.rb
@@ -1,4 +1,4 @@
-class CreateSalePayments < ActiveRecord::Migration[5.0]
+class CreateSalePayments < ActiveRecord::Migration[5.1]
   def change
     create_table :sale_payments, :id => false do |t|
       t.string :sale_payment_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing
diff --git a/db/migrate/20170403174029_create_sale_orders.rb b/db/migrate/20170403174029_create_sale_orders.rb
index 3da13e60..e2b3fe40 100644
--- a/db/migrate/20170403174029_create_sale_orders.rb
+++ b/db/migrate/20170403174029_create_sale_orders.rb
@@ -1,4 +1,4 @@
-class CreateSaleOrders < ActiveRecord::Migration[5.0]
+class CreateSaleOrders < ActiveRecord::Migration[5.1]
   def change
     create_table :sale_orders, :id => false do |t|
       t.primary_key :sale_order_id #custom primary key - to ensure consistence for cloud syncing
diff --git a/db/migrate/20170403174111_create_sale_audits.rb b/db/migrate/20170403174111_create_sale_audits.rb
index e8197c4b..e1dcfffd 100644
--- a/db/migrate/20170403174111_create_sale_audits.rb
+++ b/db/migrate/20170403174111_create_sale_audits.rb
@@ -1,4 +1,4 @@
-class CreateSaleAudits < ActiveRecord::Migration[5.0]
+class CreateSaleAudits < ActiveRecord::Migration[5.1]
   def change
     create_table :sale_audits, :id => false do |t|
       t.string :sale_audit_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing
diff --git a/db/migrate/20170403174309_create_lookups.rb b/db/migrate/20170403174309_create_lookups.rb
index a825cc8f..2fbd3fa7 100644
--- a/db/migrate/20170403174309_create_lookups.rb
+++ b/db/migrate/20170403174309_create_lookups.rb
@@ -1,4 +1,4 @@
-class CreateLookups < ActiveRecord::Migration[5.0]
+class CreateLookups < ActiveRecord::Migration[5.1]
   def change
     create_table :lookups do |t|
       t.string :lookup_type, :null => false
diff --git a/db/migrate/20170403183755_create_tax_profiles.rb b/db/migrate/20170403183755_create_tax_profiles.rb
index 7f9893d5..1f9dfceb 100644
--- a/db/migrate/20170403183755_create_tax_profiles.rb
+++ b/db/migrate/20170403183755_create_tax_profiles.rb
@@ -1,4 +1,4 @@
-class CreateTaxProfiles < ActiveRecord::Migration[5.0]
+class CreateTaxProfiles < ActiveRecord::Migration[5.1]
   def change
     create_table :tax_profiles do |t|
       t.string :name, :null => false
diff --git a/db/migrate/20170404034234_create_bookings.rb b/db/migrate/20170404034234_create_bookings.rb
index f41e8fb4..89795a83 100644
--- a/db/migrate/20170404034234_create_bookings.rb
+++ b/db/migrate/20170404034234_create_bookings.rb
@@ -1,4 +1,4 @@
-class CreateBookings < ActiveRecord::Migration[5.0]
+class CreateBookings < ActiveRecord::Migration[5.1]
   def change
     create_table :bookings, :id => false do |t|
       t.string :booking_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing
diff --git a/db/migrate/20170408105938_create_seed_generators.rb b/db/migrate/20170408105938_create_seed_generators.rb
index eb58749a..14e62fe1 100644
--- a/db/migrate/20170408105938_create_seed_generators.rb
+++ b/db/migrate/20170408105938_create_seed_generators.rb
@@ -1,4 +1,4 @@
-class CreateSeedGenerators < ActiveRecord::Migration[5.0]
+class CreateSeedGenerators < ActiveRecord::Migration[5.1]
   def change
     create_table :seed_generators do |t|
       t.string :model, :null => false, :default => "sale"
diff --git a/db/migrate/20170414071634_create_membership_settings.rb b/db/migrate/20170414071634_create_membership_settings.rb
index e15bf082..fca5cce4 100644
--- a/db/migrate/20170414071634_create_membership_settings.rb
+++ b/db/migrate/20170414071634_create_membership_settings.rb
@@ -1,4 +1,4 @@
-class CreateMembershipSettings < ActiveRecord::Migration[5.0]
+class CreateMembershipSettings < ActiveRecord::Migration[5.1]
   def change
     create_table :membership_settings do |t|
       t.string :membership_type, :null => false, :default => "internal"
diff --git a/db/migrate/20170414090001_create_assigned_order_items.rb b/db/migrate/20170414090001_create_assigned_order_items.rb
index 02b95017..3eaf58cf 100644
--- a/db/migrate/20170414090001_create_assigned_order_items.rb
+++ b/db/migrate/20170414090001_create_assigned_order_items.rb
@@ -1,4 +1,4 @@
-class CreateAssignedOrderItems < ActiveRecord::Migration[5.0]
+class CreateAssignedOrderItems < ActiveRecord::Migration[5.1]
   def change
     create_table :assigned_order_items, :id => false do |t|
       t.string :assigned_order_item_id, :limit => 16, :primary_key => true #custom primary key - to ensure consistence for cloud syncing
diff --git a/db/migrate/20170414110918_create_booking_orders.rb b/db/migrate/20170414110918_create_booking_orders.rb
index e9bf7cc0..25e24b43 100644
--- a/db/migrate/20170414110918_create_booking_orders.rb
+++ b/db/migrate/20170414110918_create_booking_orders.rb
@@ -1,4 +1,4 @@
-class CreateBookingOrders < ActiveRecord::Migration[5.0]
+class CreateBookingOrders < ActiveRecord::Migration[5.1]
   def change
     create_table :booking_orders, :id => false do |t|
       #t.string :booking_order_id, :limit => 16, :null => false, :index => true, :unique => true #custom primary key - to ensure consistence for cloud syncing
diff --git a/db/migrate/20170421171849_add_company_address_email.rb b/db/migrate/20170421171849_add_company_address_email.rb
index fb0e81f1..81667406 100644
--- a/db/migrate/20170421171849_add_company_address_email.rb
+++ b/db/migrate/20170421171849_add_company_address_email.rb
@@ -1,4 +1,4 @@
-class AddCompanyAddressEmail < ActiveRecord::Migration[5.0]
+class AddCompanyAddressEmail < ActiveRecord::Migration[5.1]
   def change
   end
 end
diff --git a/db/migrate/20170507045043_order_items_completed_by.rb b/db/migrate/20170507045043_order_items_completed_by.rb
index a00fdbb4..c6c791c0 100644
--- a/db/migrate/20170507045043_order_items_completed_by.rb
+++ b/db/migrate/20170507045043_order_items_completed_by.rb
@@ -1,4 +1,4 @@
-class OrderItemsCompletedBy < ActiveRecord::Migration[5.0]
+class OrderItemsCompletedBy < ActiveRecord::Migration[5.1]
   def change
     add_column :order_items, :completed_by, :string
     add_column :order_items, :completed_at, :datetime
diff --git a/db/seeds.rb b/db/seeds.rb
index 78d927a4..0d5d2804 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -141,9 +141,9 @@ admin_employee = Employee.create({name: "Administrator", role: "Administrator",
 food = Account.create({title: "Food", account_type: "0"})
 beverage = Account.create({title: "Beverage", account_type: "1"})
 
-shop = Shop.create(
-  {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon", 
-    country: "Myanmar", phone_no: "09123456789", reservation_no: "bip000001", license: "license", 
-    activated_at: "2017-06-06", license_data: "license_data", base_currency: "Ks", id_prefix: "abc"}
-  )
+# shop = Shop.create(
+#   {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon", 
+#     country: "Myanmar", phone_no: "09123456789", reservation_no: "bip000001", license: "license", 
+#     activated_at: "2017-06-06", license_data: "license_data", base_currency: "Ks", id_prefix: "abc"}
+#   )