merge with august_spring

2017-09-06 18:32:45 +06:30
parent a9d31935a1 2e53b72574
commit a50becb365
50 changed files with 1761 additions and 986 deletions
--- a/db/migrate/20170823081748_create_in_duties.rb
+++ b/db/migrate/20170823081748_create_in_duties.rb
@@ -1,7 +1,9 @@
-class CreateInJuties < ActiveRecord::Migration[5.1]
+class CreateInDuties < ActiveRecord::Migration[5.1]
  def change
-    create_table :in_juties do |t|
+    create_table :in_duties do |t|
      t.integer :dinning_id
+      t.string :booking_id
+      t.string :sale_id
      t.json :commissioner_ids
      t.datetime :in_time
      t.datetime :out_time