Nweni 285f5d4cd0 fixed conflict

2018-04-23 18:21:47 +06:30

..

api

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

2018-04-23 16:23:35 +06:30

concerns

change base url settings

2018-04-23 14:41:07 +06:30

crm

Pull from master

2018-03-15 13:48:52 +06:30

inventory

add shop detail info in inventory

2018-02-23 15:29:22 +06:30

oqs

Merge branch 'adminbsb_material_ui'

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

origami

fixed conflict

2018-04-23 18:21:47 +06:30

reports

add dinga payment and new payment type in report

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

settings

menu export import update and print setting update

2018-04-19 15:17:59 +06:30

transactions

add filter in dashboard and Transaction/Sale

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

application_controller.rb

check shop detail

2018-02-27 17:24:56 +06:30

base_controller.rb

Change Dashboard, Account in login, Shop name, Reference no for other charges

2018-02-28 15:31:55 +06:30

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

remove conflict data

2018-03-05 16:24:45 +06:30

print_settings_controller.rb

Edit Print_setting

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

sym_control_controller.rb

Change Dashboard, Account in login, Shop name, Reference no for other charges

2018-02-28 15:31:55 +06:30