Min Zeya Phyo 1ea9125f80 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant ...

# Conflicts:
#	Gemfile.lock
#	app/views/layouts/application.html.erb

2017-06-26 21:57:55 +06:30

..

concerns

…

printer

Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant

2017-06-26 18:45:55 +06:30

ability.rb

update crmad ability

2017-06-26 19:22:16 +06:30

account.rb

…

application_record.rb

…

assigned_order_item.rb

…

booking_order.rb

origami

2017-06-20 18:59:34 +06:30

booking.rb

move table

2017-06-22 16:31:41 +06:30

cashier_login_log.rb

…

cashier_terminal.rb

…

crm.rb

…

customer.rb

move table

2017-06-22 16:31:41 +06:30

dining_facility.rb

edit invoice

2017-06-23 17:37:08 +06:30

dining_queue.rb

assign queue and other bug

2017-06-18 00:03:09 +06:30

employee.rb

New Login form

2017-06-26 21:56:13 +06:30

lookup.rb

finished CRM and customer

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

membership_action.rb

…

membership_setting.rb

…

menu_category.rb

…

menu_item_attribute.rb

…

menu_item_instance.rb

…

menu_item_option.rb

…

menu_item.rb

discount updated

2017-06-21 20:30:12 +06:30

menu.rb

…

order_item.rb

add account_id to od_item and sale_item table

2017-06-21 14:49:01 +06:30

order_queue_process_by_zone.rb

…

order_queue_station.rb

update seed for shop and oqs

2017-06-26 19:28:02 +06:30

order.rb

sub total fixed in origami shows

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

payment_method_setting.rb

…

print_setting.rb

…

room_booking.rb

…

room.rb

origami

2017-06-20 18:59:34 +06:30

sale_audit.rb

update customer bolder

2017-06-15 18:18:35 +06:30

sale_item.rb

accounts and discount updated

2017-06-23 17:05:08 +06:30

sale_order.rb

…

sale_payment.rb

credit note payment

2017-06-26 17:49:55 +06:30

sale_tax.rb

daily sale report

2017-06-18 16:38:46 +06:30

sale.rb

update credit

2017-06-26 19:02:36 +06:30

seed_generator.rb

…

set_menu_item.rb

…

settings.rb

…

shop.rb

…

simple_menu_item.rb

…

table_booking.rb

origami

2017-06-20 18:59:34 +06:30

table.rb

origami

2017-06-20 18:59:34 +06:30

tax_profile.rb

…

zone.rb

Zone and OQS

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