Yan 06ccdac0c2 Merge branch 'discount'

2017-06-08 09:49:58 +06:30

..

assets

update gem file

2017-06-07 18:09:56 +06:30

channels

origin pull master

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

controllers

change crm booking

2017-06-07 22:17:12 +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

merged crm

2017-06-06 09:41:06 +06:30

mailers

init project commit

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

models

a little change for setup

2017-06-08 09:48:24 +06:30

pdf

change show to print method in req bills controller

2017-06-06 17:01:15 +06:30

reports

more controller for cashier/waiter view

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

views

fixed conflict route and request bill

2017-06-07 22:21:42 +06:30