Phyo 184dcb53a1 Conflict fix din settings_backend

2017-06-19 15:24:15 +06:30

..

concerns

…

printer

Update

2017-06-17 13:32:16 +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

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

2017-06-18 12:10:30 +06:30

dining_facility.rb

oqs updated

2017-06-18 00:45:39 +06:30

dining_queue.rb

assign queue and other bug

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

employee.rb

Zone and OQS

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

lookup.rb

…

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

merge with settings_backend

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

order.rb

merge with origin master

2017-06-18 12:50:07 +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

Conflict fix din settings_backend

2017-06-19 15:24:15 +06:30

sale_order.rb

…

sale_payment.rb

Conflict fix din settings_backend

2017-06-19 15:24:15 +06:30

sale_tax.rb

…

sale.rb

uncomment for sale taxes

2017-06-18 13:18: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

Zone and OQS

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