Aung Myo
|
d4d8961b87
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into addorder
|
2017-08-17 09:54:55 +06:30 |
|
Aung Myo
|
865c2c5cdd
|
update add order
|
2017-08-17 09:54:19 +06:30 |
|
Yan
|
0eee1fd0af
|
menu ui update
|
2017-08-16 18:26:30 +06:30 |
|
Yan
|
e0789ecb97
|
Merge branch 'menu_sync' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-15 17:24:46 +06:30 |
|
Yan
|
513530e8f3
|
Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-15 16:42:32 +06:30 |
|
Yan
|
e69eeadb6e
|
add bootstrap file input and menu item img implemented
|
2017-08-15 16:27:40 +06:30 |
|
Aung Myo
|
997cc0733c
|
add item set and menu item set CRUD
|
2017-08-14 17:57:55 +06:30 |
|
Yan
|
ac47d7d8f0
|
update dashbiard ui
|
2017-08-14 15:57:34 +06:30 |
|
Yan
|
edb4ab0425
|
Merge branch 'master' into menu_sync
|
2017-08-14 15:34:19 +06:30 |
|
Yan
|
5a5e654dbc
|
move css to css file
|
2017-08-14 15:26:04 +06:30 |
|
Yan
|
739efa8baf
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-14 14:40:43 +06:30 |
|
Aung Myo
|
069ad16733
|
update oqs filtring
|
2017-08-14 13:42:47 +06:30 |
|
Yan
|
03a6208a76
|
add item set with scaffold
|
2017-08-11 17:41:10 +06:30 |
|
Aung Myo
|
10aae022d2
|
update oqs
|
2017-08-11 16:47:57 +06:30 |
|
Nweni
|
b0ad2049c5
|
dining_charges
|
2017-08-11 13:34:30 +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
|
50a878349d
|
update add order
|
2017-07-26 15:08:44 +06:30 |
|
Aung Myo
|
c93b50d46a
|
update conflict oragimi.scss
|
2017-07-26 10:04:49 +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
|
2d55ea0dab
|
update add order
|
2017-07-07 09:56:18 +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 |
|