Yan
fd857146e8
fix for shift sale query and prepare rounding adj
2017-06-29 15:20:40 +06:30
Aung Myo
f60c145c00
update queue
2017-06-29 14:33:05 +06:30
Yan
fbeab17b3c
merge with origin master
2017-06-29 14:08:20 +06:30
Nweni
8d09e5a919
shift sale update
2017-06-29 13:48:14 +06:30
Yan
8ba2606f6e
merge with crm
2017-06-29 13:40:30 +06:30
Nweni
e3c2f02c81
fixed conflict
2017-06-29 13:39:37 +06:30
Nweni
618a89472a
shift open/close
2017-06-29 13:35:09 +06:30
Yan
8045bb31e9
merge with discount
2017-06-29 11:41:29 +06:30
Yan
9991970203
add first bill
2017-06-29 11:34:13 +06:30
Aung Myo
173d824c27
update card column in queue
2017-06-28 23:45:28 +06:30
Aung Myo
58e95e573e
update numberformat in pdf
2017-06-28 23:13:20 +06:30
Yan
50091e4016
updated for api bill controller
2017-06-28 16:56:43 +06:30
Aung Myo
e9e184894d
update fixed conflict
2017-06-28 16:44:31 +06:30
Yan
5ff75fad7d
fix for undefied method type in item pdf
2017-06-28 15:40:54 +06:30
Nweni
f42c800ae1
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into payment
2017-06-28 15:34:14 +06:30
Nweni
6a3973beea
fixed conflict
2017-06-28 15:33:27 +06:30
Nweni
986655052a
shift
2017-06-28 15:29:44 +06:30
Yan
ea4ba325fa
text change percentage value
2017-06-28 14:15:35 +06:30
Nweni
55278c83bc
fixed conflict
2017-06-28 12:58:27 +06:30
Nweni
f01e1b1ce3
edit login
2017-06-28 12:57:39 +06:30
Aung Myo
ab7f08b1d6
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
2017-06-28 12:47:18 +06:30
Min Zeya Phyo
5716294955
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
...
* 'master' of ssh://bitbucket.org/code2lab/sxrestaurant:
billed
rake task
Pending Payment
Credit payment
update page height bill pdf
not show price 0 fixed
multiple invoice void
rake task fix
Shop View
Shop View
get update
not to show price 0 and 10
2017-06-28 12:45:05 +06:30
Aung Myo
c16d322cea
update pdf and font
2017-06-28 11:50:05 +06:30
Yan
b975d6194f
add remove item and remove all in discount
2017-06-28 10:59:03 +06:30
Min Zeya Phyo
ee651763b7
shift close and payment journal
2017-06-28 10:34:42 +06:30
Yan
58a8cdec6e
still dev dis
2017-06-27 18:32:58 +06:30
Aung Myo
53ff3989b5
update merge cancan
2017-06-27 16:55:56 +06:30
Aung Myo
5a52183846
update pull master
2017-06-27 16:48:05 +06:30
Aung Myo
ff2844124e
update utc
2017-06-27 15:10:42 +06:30
Aung Myo
f762664912
update bill
2017-06-27 14:16:48 +06:30
Zin Lin Phyo
1c65a38b70
fix conflit
2017-06-27 14:04:29 +06:30
Yan
def8ce34c2
Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant
2017-06-27 12:07:35 +06:30
Phyo
7810fc693b
Pending Payment
2017-06-27 12:06:18 +06:30
Yan
4f78c63b63
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-27 11:53:46 +06:30
Yan
e38886790c
not show price 0 fixed
2017-06-27 11:52:51 +06:30
Zin Lin Phyo
8d8f7b9093
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-27 11:35:48 +06:30
Zin Lin Phyo
bcd44db9a2
multiple invoice void
2017-06-27 11:35:36 +06:30
Phyo
2f8c6e25a1
Shop View
2017-06-27 11:33:03 +06:30
Phyo
37da55610f
Shop View
2017-06-27 11:32:10 +06:30
Nweni
463e8e5875
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-27 10:28:58 +06:30
Nweni
535a5825fb
get update
2017-06-27 10:28:47 +06:30
Yan
08e98409a5
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-27 10:16:28 +06:30
Yan
e09dbb095c
not to show price 0 and 10
2017-06-27 10:15:22 +06:30
Aung Myo
4c13be257b
update authroize
2017-06-26 22:45:34 +06:30
Min Zeya Phyo
1ea9125f80
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
...
# Conflicts:
# Gemfile.lock
# app/views/layouts/application.html.erb
2017-06-26 21:57:55 +06:30
Min Zeya Phyo
b607154037
New Login form
2017-06-26 21:56:13 +06:30
Aung Myo
25967b82d3
update home link
2017-06-26 20:44:15 +06:30
Aung Myo
c6906ba293
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
2017-06-26 20:31:55 +06:30
Aung Myo
9a5656c5e6
update crm customer
2017-06-26 20:13:56 +06:30
Yan
6f741e0a0c
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 19:28:21 +06:30
