Aung Myo
|
1d08954a76
|
update shift sale
|
2017-06-30 13:32:56 +06:30 |
|
Aung Myo
|
f60c145c00
|
update queue
|
2017-06-29 14:33:05 +06:30 |
|
Aung Myo
|
173d824c27
|
update card column in queue
|
2017-06-28 23:45:28 +06:30 |
|
Aung Myo
|
e9e184894d
|
update fixed conflict
|
2017-06-28 16:44:31 +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
|
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
|
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
|
4e5ca54eee
|
Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 16:38:15 +06:30 |
|
Yan
|
0c2e299ced
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 16:37:02 +06:30 |
|
Nweni
|
04e44c4859
|
fixed conflict
|
2017-06-26 16:35:24 +06:30 |
|
Yan
|
f60b3d554a
|
add table and order no in oqs
|
2017-06-26 16:23:00 +06:30 |
|
Yan
|
813f2ecf2d
|
merge with settings_backend
|
2017-06-26 14:46:31 +06:30 |
|
Phyo
|
46ad87314a
|
Add color blue to orders
|
2017-06-26 14:39:25 +06:30 |
|
Yan
|
ecc9ab53ec
|
Merge branch 'cancan' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 09:59:16 +06:30 |
|
Yan
|
a91816bb4e
|
qty edit in oqs
|
2017-06-25 22:41:26 +06:30 |
|
Yan
|
30df25d78a
|
Merge branch 'master' into oqs
|
2017-06-23 19:22:07 +06:30 |
|
Yan
|
e9fb90d8a0
|
updating oqs
|
2017-06-23 19:00:49 +06:30 |
|
Yan
|
e01ecc6e0f
|
merge origin master
|
2017-06-23 17:53:53 +06:30 |
|
Yan
|
27ff8b89e7
|
merge with crm
|
2017-06-23 17:51:09 +06:30 |
|
Nweni
|
81c50f220a
|
edit invoice
|
2017-06-23 17:37:08 +06:30 |
|
Aung Myo
|
f5f0f9e077
|
update crm customer and bind customer and queue
|
2017-06-23 17:03:52 +06:30 |
|
Phyo
|
68403617a5
|
Change Font and show status in origami
|
2017-06-23 11:14:48 +06:30 |
|
Aung Myo
|
01e5b7ba6c
|
update authorize
|
2017-06-23 09:41:48 +06:30 |
|
Yan
|
8ee37c5b52
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-22 18:03:55 +06:30 |
|
Yan
|
7bf2499e83
|
add options in oqs
|
2017-06-22 17:32:13 +06:30 |
|
Aung Myo
|
cd5fdaac6a
|
update origami scss
|
2017-06-22 15:28:40 +06:30 |
|
Aung Myo
|
187caa5253
|
update customre
|
2017-06-22 11:58:16 +06:30 |
|
Aung Myo
|
de38a50522
|
Merge branch 'discount' of bitbucket.org:code2lab/sxrestaurant into crm
|
2017-06-22 09:34:45 +06:30 |
|
Aung Myo
|
d95b7c7abc
|
add confirm js and css
|
2017-06-21 19:20:10 +06:30 |
|
Aung Myo
|
d2549df2e9
|
update receipt bill payment
|
2017-06-21 17:37:16 +06:30 |
|
Aung Myo
|
7c5456d712
|
assign table ,membership transaction and queue
|
2017-06-21 16:22:53 +06:30 |
|
Yan
|
e3b3ff76b2
|
add account_id to od_item and sale_item table
|
2017-06-21 14:49:01 +06:30 |
|
Yan
|
9137436b70
|
bind origami show to action
|
2017-06-21 11:38:28 +06:30 |
|
Yan
|
e3c83cdd44
|
discount ui changed
|
2017-06-21 10:50:16 +06:30 |
|
Aung Myo
|
6c4c817453
|
fixed fonflict
|
2017-06-21 10:22:43 +06:30 |
|
Nweni
|
b889603ce6
|
update
|
2017-06-21 09:33:39 +06:30 |
|
Nweni
|
6272e07959
|
add back action
|
2017-06-21 06:19:06 +06:30 |
|
Nweni
|
f69bee9b03
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-20 19:00:02 +06:30 |
|
Aung Myo
|
0e619f3f2a
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
|
2017-06-20 17:59:14 +06:30 |
|
Aung Myo
|
33cb8b64a3
|
finished customer form and update
|
2017-06-20 17:57:50 +06:30 |
|
Yan
|
e43818fdf5
|
oqs updated
|
2017-06-20 13:33:41 +06:30 |
|
Aung Myo
|
faae996d5d
|
Rebate balance in receipt
|
2017-06-20 11:31:02 +06:30 |
|
Nweni
|
a71ee3657a
|
origami changes
|
2017-06-20 07:36:38 +06:30 |
|
Yan
|
7fe36e8ef4
|
merge with settings
|
2017-06-19 19:14:58 +06:30 |
|
Phyo
|
90be2b8d63
|
OQS edit bug fix
|
2017-06-19 18:54:19 +06:30 |
|
Nweni
|
fcd1590868
|
change query
|
2017-06-19 15:51:04 +06:30 |
|