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

2017-06-12 14:15:16 +06:30

..

assets

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

2017-06-12 14:15:16 +06:30

channels

…

controllers

fixed conflict

2017-06-12 13:27:33 +06:30

forms

…

helpers

merge with master

2017-06-12 10:01:36 +06:30

jobs

updated default who changed oqs in queue job

2017-06-08 19:26:47 +06:30

mailers

…

models

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

2017-06-12 14:15:16 +06:30

pdf

to do req_bill_format and status changed after pay

2017-06-12 00:45:26 +06:30

reports

…

views

updated for food and beverage bugs

2017-06-12 14:11:13 +06:30