phyusin 2ac629f6e0 conflict

2018-04-11 18:01:46 +06:30

..

api

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

2018-04-11 17:20:29 +06:30

concerns

doemal or other api token added

2018-04-11 17:20:17 +06:30

crm

…

inventory

…

oqs

Merge branch 'adminbsb_material_ui'

2018-04-07 16:45:45 +06:30

origami

conflict

2018-04-11 18:01:46 +06:30

reports

add dinga payment and new payment type in report

2018-04-09 09:40:08 +06:30

settings

menu import export update

2018-04-10 16:21:43 +06:30

transactions

add filter in dashboard and Transaction/Sale

2018-03-26 16:42:17 +06:30

application_controller.rb

…

base_controller.rb

…

base_crm_controller.rb

check current user session

2018-03-20 14:32:08 +06:30

base_inventory_controller.rb

check current user session

2018-03-20 14:32:08 +06:30

base_oqs_controller.rb

check current user session

2018-03-20 14:32:08 +06:30

base_origami_controller.rb

remove skip auth from api and check user modified

2018-04-09 09:58:22 +06:30

base_report_controller.rb

check current user session

2018-03-20 14:32:08 +06:30

base_waiter_controller.rb

check current user session

2018-03-20 14:32:08 +06:30

home_controller.rb

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

2018-04-09 09:48:35 +06:30

install_controller.rb

…

print_settings_controller.rb

Edit Print_setting

2018-04-06 13:47:59 +06:30

sym_control_controller.rb

…