Aung Myo
|
069ad16733
|
update oqs filtring
|
2017-08-14 13:42:47 +06:30 |
|
Aung Myo
|
10aae022d2
|
update oqs
|
2017-08-11 16:47:57 +06:30 |
|
Aung Myo
|
2c7a641d47
|
update oqs
|
2017-08-11 13:21:40 +06:30 |
|
Aung Myo
|
5684d5d0c7
|
update oqs
|
2017-08-11 12:15:30 +06:30 |
|
Aung Myo
|
9eaf04778c
|
update oqs
|
2017-08-11 10:25:09 +06:30 |
|
Aung Myo
|
362789a93e
|
update oqs
|
2017-08-10 18:19:07 +06:30 |
|
Aung Myo
|
285ad93501
|
update filter in sale and order and creditnote
|
2017-08-08 09:43:58 +06:30 |
|
Aung Myo
|
a7cbea5dbb
|
update login To show dashboard screen with available features based on user type
|
2017-07-24 17:42:34 +06:30 |
|
Yan
|
c068d702b3
|
still nfc
|
2017-07-18 11:52:49 +06:30 |
|
Yan
|
df06b81b28
|
Merge branch 'staging'
|
2017-07-17 15:13:31 +06:30 |
|
Yan
|
51c14f379b
|
still nfc
|
2017-07-17 15:07:27 +06:30 |
|
Yan
|
b2ccc12e17
|
add paypar acc for nfc
|
2017-07-16 18:16:52 +06:30 |
|
Aung Myo
|
0b7b5cae30
|
update osaka demo bugs
|
2017-07-14 17:23:40 +06:30 |
|
Yan
|
6f57bb8a79
|
adding shift sale summary
|
2017-07-13 11:12:02 +06:30 |
|
Aung Myo
|
040d60402b
|
update edit qty and price and cash and credit div in payment details
|
2017-07-06 12:54:04 +06:30 |
|
Aung Myo
|
7cee40746d
|
update unsuccessfully rebate and alert
|
2017-07-05 14:42:40 +06:30 |
|
Yan
|
d51b1a0b9e
|
disable cable and oqs qty can 0
|
2017-07-04 18:56:52 +06:30 |
|
superuser
|
60dee30046
|
api/bill_controller edited
|
2017-06-30 19:29:09 +06:30 |
|
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 |
|
superuser
|
873f847a67
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-27 12:11:17 +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 |
|
superuser
|
9fa6ad920e
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 20:02:39 +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 |
|
superuser
|
4dbc9b6134
|
:q
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-23 18:00:18 +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 |
|
superuser
|
ea74d52a6f
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-22 18:26:36 +06:30 |
|
Yan
|
8ee37c5b52
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-22 18:03:55 +06:30 |
|