Min Zeya Phyo eb74eb2a2d Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant ...

# Conflicts:
#	app/models/order_item.rb

2017-06-04 16:37:13 +06:30

..

assets

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

2017-06-03 15:05:25 +06:30

channels

origin pull master

2017-06-03 13:44:10 +06:30

controllers

update

2017-06-04 14:46:00 +06:30

forms

move login_from from model folder to form folder

2017-06-04 16:28:29 +06:30

helpers

origin pull master

2017-06-03 13:44:10 +06:30

jobs

fixed conflict

2017-06-04 13:12:02 +06:30

mailers

init project commit

2017-03-24 19:58:23 +06:30

models

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

2017-06-04 16:37:13 +06:30

pdf

Finished Request Bill print function

2017-06-03 17:04:17 +06:30

reports

more controller for cashier/waiter view

2017-05-10 01:10:21 +06:30

views

setting update

2017-06-04 15:55:06 +06:30