Aung Myo
1d08954a76
update shift sale
2017-06-30 13:32:56 +06:30
Aung Myo
3b9c16d8d5
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
2017-06-29 15:42:45 +06:30
Aung Myo
9305e0c4b4
update authorize void and edit in cashier
2017-06-29 15:39:46 +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
cf851327b3
fixed conflict
2017-06-29 13:52:55 +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
557ad06600
update order queue printer
2017-06-29 10:52:12 +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
d35aa23e34
still dev to respond code for order
2017-06-28 16:17:56 +06:30
Yan
5ff75fad7d
fix for undefied method type in item pdf
2017-06-28 15:40:54 +06:30
Nweni
986655052a
shift
2017-06-28 15:29:44 +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
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
Yan
464e72012b
waiter and cashier in api/bill_controller
2017-06-27 15:26:02 +06:30
Aung Myo
f762664912
update bill
2017-06-27 14:16:48 +06:30
Zin Lin Phyo
bce4380d70
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-27 14:04:41 +06:30
Zin Lin Phyo
1c65a38b70
fix conflit
2017-06-27 14:04:29 +06:30
Nweni
c6f482da83
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-27 14:02:54 +06:30
Nweni
df722de0e7
billed
2017-06-27 14:02:44 +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
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
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
Yan
a236c94910
mobile bill updated
2017-06-26 20:58:12 +06:30
Aung Myo
0726af072e
update cancan
2017-06-26 19:49:02 +06:30
Yan
6f741e0a0c
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 19:28:21 +06:30
Aung Myo
376af85c64
update credit
2017-06-26 19:02:36 +06:30
Yan
ef8f280d0e
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 18:46:16 +06:30
Yan
034c9932a6
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 18:45:55 +06:30
Yan
cb77c771b8
oqs update
2017-06-26 18:45:20 +06:30
Aung Myo
f3417a61c0
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
2017-06-26 18:16:03 +06:30
