Aung Myo 35b9a9e02a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs

2017-09-27 11:26:27 +06:30

..

concerns

…

printer

merge with august spring but merge fail

2017-08-31 15:58:01 +06:30

ability.rb

…

account.rb

…

application_record.rb

…

assigned_order_item.rb

update oqs action cable for order cahnnel and oqs channel

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

booking_order.rb

…

booking.rb

…

cashier_login_log.rb

…

cashier_terminal.rb

…

commission.rb

commission report

2017-08-29 18:36:46 +06:30

commissioner.rb

commission update -> change route under settings

2017-08-28 09:46:36 +06:30

crm.rb

…

customer.rb

…

dining_charge.rb

Dininng Charges Free time Count Change

2017-09-08 13:45:52 +06:30

dining_facility.rb

…

dining_queue.rb

…

employee.rb

…

in_duty.rb

rename in_juty to in_duty

2017-09-06 11:18:02 +06:30

inventory_definition.rb

inventory

2017-08-30 14:19:24 +06:30

item_set.rb

…

lookup.rb

…

membership_action.rb

…

membership_setting.rb

…

menu_category.rb

update addorder available and max qty

2017-09-27 11:26:13 +06:30

menu_instance_item_set.rb

…

menu_item_attribute.rb

update form attr name to attr id to instances

2017-08-31 11:41:38 +06:30

menu_item_instance.rb

stock_check report template

2017-09-06 18:27:58 +06:30

menu_item_option.rb

…

menu_item_set.rb

…

menu_item.rb

CRUD Update for Promotion

2017-08-30 18:22:22 +06:30

menu.rb

…

order_item.rb

add item instance code to order item

2017-08-28 14:19:40 +06:30

order_queue_process_by_zone.rb

…

order_queue_station.rb

…

order.rb

update oqs action cable for order cahnnel and oqs channel

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

payment_journal.rb

…

payment_method_setting.rb

…

print_setting.rb

…

product_commission.rb

calculate commission in sale_edit, void, foc

2017-09-04 12:09:04 +06:30

product.rb

…

promotion_product.rb

…

promotion.rb

fix promotion date format

2017-09-18 17:36:17 +06:30

room_booking.rb

…

room.rb

…

sale_audit.rb

…

sale_item.rb

update member discount

2017-09-14 17:36:00 +06:30

sale_order.rb

…

sale_payment.rb

update member discount

2017-09-14 17:36:00 +06:30

sale_tax.rb

…

sale.rb

fix dining charge calc

2017-09-11 15:47:32 +06:30

seed_generator.rb

…

set_menu_item.rb

…

settings.rb

…

shift_sale.rb

…

shop.rb

…

simple_menu_item.rb

…

stock_check_item.rb

stock check report

2017-09-07 10:30:20 +06:30

stock_check.rb

stock check report

2017-09-07 10:30:20 +06:30

stock_journal.rb

inventory

2017-08-30 14:19:24 +06:30

table_booking.rb

…

table.rb

…

tax_profile.rb

…

zone.rb

…