phyusin 7c35fa48e0 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

2018-06-01 17:19:54 +06:30

..

api

Merge branch 'adminbsb_material_ui'

2018-06-01 17:01:18 +06:30

concerns

…

crm

Pull from master

2018-05-22 13:26:23 +06:30

inventory

…

oqs

conflict data

2018-05-28 10:46:04 +06:30

origami

pull from master

2018-06-01 16:43:13 +06:30

reports

remove conflict data

2018-05-29 14:32:37 +06:30

settings

Condition in shop

2018-06-01 17:18:31 +06:30

transactions

transactions for order reservation and api for tax profile

2018-05-28 18:08:30 +06:30

application_controller.rb

…

base_controller.rb

…

base_crm_controller.rb

…

base_inventory_controller.rb

…

base_oqs_controller.rb

…

base_origami_controller.rb

…

base_report_controller.rb

…

base_waiter_controller.rb

…

home_controller.rb

pull from master 23.5.2018

2018-05-23 09:36:49 +06:30

install_controller.rb

…

print_settings_controller.rb

…

sym_control_controller.rb

…