Yan 57b9c44349 merge with master

2018-05-03 17:57:49 +06:30

..

assets

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

2018-05-03 17:43:57 +06:30

channels

add alert for new,send_to_kitchen and ready_to_delivery

2018-05-03 17:22:59 +06:30

controllers

merge with master

2018-05-03 17:57:49 +06:30

forms

UI change

2017-10-23 11:38:10 +06:30

helpers

Topup payment

2018-03-16 17:50:45 +06:30

inputs

UI change

2017-10-23 11:38:10 +06:30

jobs

update no table oqs print

2018-02-21 16:11:05 +06:30

mailers

UI change

2017-10-23 11:38:10 +06:30

models

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

2018-05-03 17:23:11 +06:30

pdf

remove conflict

2018-05-03 17:43:12 +06:30

reports

UI change

2017-10-23 11:38:10 +06:30

uploaders

Pull from master

2018-05-03 09:31:36 +06:30

views

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

2018-05-03 17:43:57 +06:30