Yan 38ae8f8f86 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into staging

2017-06-16 13:45:23 +06:30

..

concerns

…

printer

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

2017-06-16 13:45:23 +06:30

account.rb

…

application_record.rb

…

assigned_order_item.rb

…

booking_order.rb

…

booking.rb

…

cashier_login_log.rb

…

cashier_terminal.rb

…

crm.rb

…

customer.rb

payment bill added and origami bug fixed

2017-06-14 19:41:32 +06:30

dining_facility.rb

…

dining_queue.rb

update void and complete sale

2017-06-16 10:20:20 +06:30

employee.rb

…

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

…

menu.rb

…

order_item.rb

fix get_order_items_details method in order_item and add taxes in receipt

2017-06-15 17:57:58 +06:30

order_queue_process_by_zone.rb

…

order_queue_station.rb

…

order.rb

merge with master

2017-06-16 09:59:35 +06:30

payment_method_setting.rb

…

print_setting.rb

…

room_booking.rb

…

room.rb

…

sale_audit.rb

update customer bolder

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

sale_item.rb

merge with master

2017-06-12 18:24:57 +06:30

sale_order.rb

…

sale_payment.rb

Payment via card Bug fix

2017-06-15 09:49:44 +06:30

sale_tax.rb

…

sale.rb

fix get_order_items_details method in order_item and add taxes in receipt

2017-06-15 17:57:58 +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

…