phyusin 50f5094efc remove conflict

2018-07-16 10:58:12 +06:30

..

api

…

concerns

…

crm

add dashboard settings and customer create

2018-07-13 18:00:49 +06:30

inventory

…

oqs

…

origami

remove conflict

2018-07-16 10:58:12 +06:30

reports

change credit payment query

2018-07-13 14:44:29 +06:30

settings

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

2018-07-16 09:54:09 +06:30

transactions

…

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

add dashboard settings and customer create

2018-07-13 18:00:49 +06:30

install_controller.rb

…

print_settings_controller.rb

…

sym_control_controller.rb

…