Phyo
|
0118a178b2
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
|
2017-08-23 19:18:18 +06:30 |
|
Phyo
|
857fcd419f
|
Promotion Time Fixed
|
2017-08-23 19:09:44 +06:30 |
|
Yan
|
744065d3e9
|
merge with august_spring
|
2017-08-22 14:52:14 +06:30 |
|
Yan
|
c3e511c8ed
|
fix menu edit
|
2017-08-22 14:11:25 +06:30 |
|
Nweni
|
44f02be4cb
|
nested form
|
2017-08-22 14:11:13 +06:30 |
|
Phyo
|
e3c1dd216a
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
|
2017-08-21 17:40:44 +06:30 |
|
Phyo
|
e9ba56826c
|
Promotion Product Add
|
2017-08-21 17:38:07 +06:30 |
|
Yan
|
2b0dcd4ab9
|
update and fix
|
2017-08-21 16:50:24 +06:30 |
|
yamin
|
3b5eb532d3
|
updateProduct
|
2017-08-21 16:06:34 +06:30 |
|
yamin
|
150c843fe0
|
Update
|
2017-08-21 10:14:16 +06:30 |
|
Yan
|
a1df5a0dbc
|
update menu_sync
|
2017-08-18 19:46:43 +06:30 |
|
Yan
|
48461da9ea
|
add fields for Menu Sync
|
2017-08-18 11:24:38 +06:30 |
|
Yan
|
29b3f94573
|
add menu api
|
2017-08-17 18:55:13 +06:30 |
|
Yan
|
f2829fab0f
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-17 13:50:24 +06:30 |
|
Phyo
|
0138ae2efa
|
Fix Conflict
|
2017-08-16 18:38:41 +06:30 |
|
Phyo
|
fc2927b341
|
Promotion CRUD
|
2017-08-16 18:36:23 +06:30 |
|
Yan
|
0eee1fd0af
|
menu ui update
|
2017-08-16 18:26:30 +06:30 |
|
yamin
|
4fc748e877
|
CRUDforProducts
|
2017-08-16 18:19:20 +06:30 |
|
yamin
|
3e9b9c6b8b
|
CalculatePriceInDiningCharges
|
2017-08-16 10:46:03 +06:30 |
|
Yan
|
e0789ecb97
|
Merge branch 'menu_sync' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-15 17:24:46 +06:30 |
|
Aung Myo
|
b2f00358f1
|
update ability for setmenu
|
2017-08-15 17:24:06 +06:30 |
|
Yan
|
20bba0f659
|
merge with august_spring
|
2017-08-15 17:04:28 +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
|
655b3ccef9
|
update menu item
|
2017-08-15 14:26:22 +06:30 |
|
Yan
|
f018a56027
|
add CarrierWave gems for menu image upload
|
2017-08-14 18:53:39 +06:30 |
|
Aung Myo
|
997cc0733c
|
add item set and menu item set CRUD
|
2017-08-14 17:57:55 +06:30 |
|
yamin
|
5fc485615c
|
UpdateDiningCharges
|
2017-08-14 16:49:39 +06:30 |
|
Yan
|
edb4ab0425
|
Merge branch 'master' into menu_sync
|
2017-08-14 15:34:19 +06:30 |
|
Phyo
|
af3a7c1d88
|
Room Charges Bug Fix
|
2017-08-14 15:33:13 +06:30 |
|
Phyo
|
497a1b60f7
|
add Updated_at to Employee Listing
|
2017-08-14 14:04:39 +06:30 |
|
Phyo
|
740038757d
|
Dining Charges CRUD
|
2017-08-11 17:53:48 +06:30 |
|
Yan
|
03a6208a76
|
add item set with scaffold
|
2017-08-11 17:41:10 +06:30 |
|
Yan
|
be71d187b0
|
update menu
|
2017-08-11 15:00:24 +06:30 |
|
yamin
|
1b14589927
|
addCreatedAtInEmployee
|
2017-08-09 15:25:16 +06:30 |
|
yamin
|
da690e00b8
|
add s in Points
|
2017-08-09 12:28:46 +06:30 |
|
Aung Myo
|
b3c77fc28c
|
update lookup
|
2017-07-31 17:33:06 +06:30 |
|
Aung Myo
|
63cda9a076
|
update view files
|
2017-07-27 17:43:07 +06:30 |
|
Aung Myo
|
0b7b5cae30
|
update osaka demo bugs
|
2017-07-14 17:23:40 +06:30 |
|
Aung Myo
|
e34d267fc8
|
update control member for osaka
|
2017-07-12 19:43:56 +06:30 |
|
Aung Myo
|
602a0d010a
|
update show detail template of backend
|
2017-07-05 11:51:43 +06:30 |
|
Yan
|
ed0e627f34
|
fixed at bitp and oqs print
|
2017-07-03 17:40:12 +06:30 |
|
Yan
|
813f2ecf2d
|
merge with settings_backend
|
2017-06-26 14:46:31 +06:30 |
|
Phyo
|
f878b2f1d8
|
Accounts disable Bonus and discount
|
2017-06-26 13:53:54 +06:30 |
|
Yan
|
ecc9ab53ec
|
Merge branch 'cancan' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 09:59:16 +06:30 |
|
Phyo
|
62156e2e3e
|
Employee Show
|
2017-06-23 11:13:29 +06:30 |
|
Aung Myo
|
01e5b7ba6c
|
update authorize
|
2017-06-23 09:41:48 +06:30 |
|
Phyo
|
90be2b8d63
|
OQS edit bug fix
|
2017-06-19 18:54:19 +06:30 |
|
Phyo
|
c02e305c30
|
Zone Created_at Bug Fix
|
2017-06-19 16:24:44 +06:30 |
|
Phyo
|
d78327f906
|
Membership Setting UI
|
2017-06-19 16:22:39 +06:30 |
|