Aung Myo dc51beae43 fixed conflictfile

2017-06-12 15:01:19 +06:30

..

concerns

…

printer

to do req_bill_format and status changed after pay

2017-06-12 00:45:26 +06:30

account.rb

fixed conflict

2017-06-07 22:29:43 +06:30

application_record.rb

…

assigned_order_item.rb

fixed for pm key changed

2017-06-05 18:52:19 +06:30

booking_order.rb

fixed for pm key changed

2017-06-05 18:52:19 +06:30

booking.rb

fixed conflict

2017-06-06 09:43:16 +06:30

cashier_login_log.rb

…

cashier_terminal.rb

…

crm.rb

queue and crm view updated

2017-06-09 09:29:25 +06:30

customer.rb

finished CRM and customer

2017-06-12 14:23:20 +06:30

dining_facility.rb

Update

2017-06-12 13:26:09 +06:30

dining_queue.rb

finished CRM and customer

2017-06-12 14:23:20 +06:30

employee.rb

…

lookup.rb

finished CRM and customer

2017-06-12 14:23:20 +06:30

membership_action.rb

change route

2017-06-11 13:55:14 +06:30

membership_setting.rb

…

menu_category.rb

Delete Fix for parent child process in Menu

2017-06-05 18:31:56 +06:30

menu_item_attribute.rb

…

menu_item_instance.rb

Delete Fix for parent child process in Menu

2017-06-05 18:31:56 +06:30

menu_item_option.rb

…

menu_item.rb

(important)migrateion files changed

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

menu.rb

Delete Fix for parent child process in Menu

2017-06-05 18:31:56 +06:30

order_item.rb

merged crm

2017-06-06 09:41:06 +06:30

order_queue_process_by_zone.rb

…

order_queue_station.rb

…

order.rb

fixed conflictfile

2017-06-12 15:01:19 +06:30

payment_method_setting.rb

…

print_setting.rb

…

room_booking.rb

…

room.rb

…

sale_audit.rb

update sale_payment database

2017-06-07 14:45:03 +06:30

sale_item.rb

updated for food and beverage bugs

2017-06-12 14:11:13 +06:30

sale_order.rb

update

2017-06-09 13:52:36 +06:30

sale_payment.rb

update table status

2017-06-12 14:23:18 +06:30

sale_tax.rb

fixed for pm key changed

2017-06-05 18:52:19 +06:30

sale.rb

update

2017-06-09 13:52:36 +06:30

seed_generator.rb

update

2017-06-09 13:52:36 +06:30

set_menu_item.rb

…

settings.rb

…

shop.rb

…

simple_menu_item.rb

…

table_booking.rb

…

table.rb

…

tax_profile.rb

…

zone.rb

…