Yan 1cbbe9d672 Merge branch 'discount'

2017-06-08 18:58:28 +06:30

..

concerns

…

printer

finished customer to sale assign in crm

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

settings

payment_setting

2017-06-08 17:57:29 +06:30

account.rb

fixed conflict

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

application_record.rb

…

assigned_order_item.rb

…

booking_order.rb

…

booking.rb

…

cashier_login_log.rb

…

cashier_terminal.rb

…

customer.rb

finished customer and join membership in crm

2017-06-07 16:38:24 +06:30

dining_facility.rb

…

employee.rb

…

lookup.rb

…

membership_setting.rb

…

menu_category.rb

…

menu_item_attribute.rb

…

menu_item_instance.rb

…

menu_item_option.rb

…

menu_item.rb

(important)migrateion files changed

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

menu.rb

…

order_item.rb

…

order_queue_process_by_zone.rb

…

order_queue_station.rb

…

order.rb

comment for cable and add print seed

2017-06-08 18:57:53 +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

update discount

2017-06-08 18:02:40 +06:30

sale_order.rb

…

sale_payment.rb

payment_setting

2017-06-08 17:57:29 +06:30

sale_tax.rb

…

sale.rb

editing discout

2017-06-08 15:21:53 +06:30

seed_generator.rb

…

set_menu_item.rb

…

settings.rb

…

shop.rb

…

simple_menu_item.rb

…

table_booking.rb

…

table.rb

…

tax_profile.rb

…

zone.rb

…