Phyo 0138ae2efa Fix Conflict

2017-08-16 18:38:41 +06:30

..

20170324135138_create_zones.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170325111608_create_menus.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170327152733_create_menu_categories.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170331024747_create_accounts.rb

Add extra fields to accounts

2017-06-19 12:21:54 +06:30

20170331024749_create_menu_items.rb

fixed conflict

2017-06-08 09:57:33 +06:30

20170402083337_create_menu_item_attributes.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170402083525_create_menu_item_options.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170402084230_create_menu_item_instances.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170403135934_create_orders.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170403140820_create_order_items.rb

add alt name to order and sale items and update seeds

2017-06-30 16:00:03 +06:30

20170403142424_create_dining_facilities.rb

Zone and OQS

2017-06-17 18:00:59 +06:30

20170403151731_create_order_queue_stations.rb

oqs updated

2017-06-20 13:33:41 +06:30

20170403152600_create_order_queue_process_by_zones.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170403153001_create_payment_method_settings.rb

update sale order talble

2017-06-09 13:13:20 +06:30

20170403155230_create_employees.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170403155500_create_cashier_terminals.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170403155531_create_cashier_login_logs.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170403161857_create_sale_items.rb

add alt name to order and sale items and update seeds

2017-06-30 16:00:03 +06:30

20170403163219_create_sale_taxes.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170403163734_create_sale_payments.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170403174029_create_sale_orders.rb

update sale order talble

2017-06-09 13:13:20 +06:30

20170403174111_create_sale_audits.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170403174309_create_lookups.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170403183755_create_tax_profiles.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170404034234_create_bookings.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170408105938_create_seed_generators.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170414071634_create_membership_settings.rb

update control member for osaka

2017-07-12 19:43:56 +06:30

20170414090001_create_assigned_order_items.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170414110918_create_booking_orders.rb

(important)migrateion files changed

2017-06-07 18:47:50 +06:30

20170530072247_create_shops.rb

update rounding adj for osaka

2017-07-26 16:35:34 +06:30

20170611084537_create_membership_actions.rb

fixed jsonb to json to support both mysql and postgres

2017-06-12 07:40:40 +06:30

20170622050926_create_customers.rb

dining_charges

2017-08-11 13:34:30 +06:30

20170626191519_create_shift_sales.rb

add req and fix for shift

2017-07-07 17:19:14 +06:30

20170627035218_create_payment_journals.rb

shift open/close

2017-06-29 13:35:09 +06:30

20170627085117_dining_queues.rb

update queue migration

2017-06-27 15:25:13 +06:30

20170628103624_create_print_settings.rb

update print setting migration and delete unnessary font

2017-06-28 17:12:09 +06:30

20170701101420_create_sales.rb

update for shift and deving member dis

2017-07-07 14:56:05 +06:30

20170811052036_create_dining_charges.rb

room charges

2017-08-15 11:14:38 +06:30

20170814041543_remove_d_bcols_from_print_settings.rb

removeDBcolsanddbparams

2017-08-14 14:26:16 +06:30

20170815044557_create_promotion.rb

Promotion CRUD

2017-08-16 18:36:23 +06:30

20170815051517_create_promotion_product.rb

DB for promtion, promotion product,product

2017-08-16 11:00:37 +06:30

20170816042256_settings_products.rb

CRUDforProducts

2017-08-16 18:19:20 +06:30