Yan
|
f2829fab0f
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-17 13:50:24 +06:30 |
|
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 |
|
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
|
e791ce8809
|
Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-15 17:27:48 +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 |
|
Aung Myo
|
70dc3622ad
|
update show for foc
|
2017-08-15 17:04:46 +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
|
e4a2d58e5e
|
update foc and pdf
|
2017-08-15 15:14:55 +06:30 |
|
Zin Lin Phyo
|
74b15465f7
|
item foc in sale edit
|
2017-08-15 15:13:44 +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
|
0ec1657f7b
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
|
2017-08-14 16:50:19 +06:30 |
|
yamin
|
5fc485615c
|
UpdateDiningCharges
|
2017-08-14 16:49:39 +06:30 |
|
Zin Lin Phyo
|
a01eaacbcb
|
fix conflit
|
2017-08-14 16:46:26 +06:30 |
|
Zin Lin Phyo
|
7dae1c2c27
|
dashboard link
|
2017-08-14 16:43:35 +06:30 |
|
Yan
|
ac47d7d8f0
|
update dashbiard ui
|
2017-08-14 15:57:34 +06:30 |
|
Aung Myo
|
d5f6bca2b8
|
Merge branch 'menu_sync' of bitbucket.org:code2lab/sxrestaurant into staging
|
2017-08-14 15:35:44 +06:30 |
|
Yan
|
edb4ab0425
|
Merge branch 'master' into menu_sync
|
2017-08-14 15:34:19 +06:30 |
|
Phyo
|
624617fc02
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
|
2017-08-14 15:33:28 +06:30 |
|
Phyo
|
af3a7c1d88
|
Room Charges Bug Fix
|
2017-08-14 15:33:13 +06:30 |
|
Yan
|
5a5e654dbc
|
move css to css file
|
2017-08-14 15:26:04 +06:30 |
|
Aung Myo
|
67b6da92ab
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging
|
2017-08-14 15:04:28 +06:30 |
|
Aung Myo
|
a691eb8d64
|
update
|
2017-08-14 15:01:44 +06:30 |
|
Yan
|
739efa8baf
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-14 14:40:43 +06:30 |
|
Yan
|
0df8264de7
|
Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-14 14:38:14 +06:30 |
|
yamin
|
26e5472abc
|
xMerge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
|
2017-08-14 14:29:24 +06:30 |
|
yamin
|
fa68bcff69
|
removeDBcolsanddbparams
|
2017-08-14 14:26:16 +06:30 |
|
Phyo
|
497a1b60f7
|
add Updated_at to Employee Listing
|
2017-08-14 14:04:39 +06:30 |
|
Aung Myo
|
069ad16733
|
update oqs filtring
|
2017-08-14 13:42:47 +06:30 |
|
Phyo
|
25ab7c9701
|
Payment Voucher UI fix
|
2017-08-14 13:41:18 +06:30 |
|
Phyo
|
5c2928166d
|
Voucher/Cuopon UI phrase 1
|
2017-08-11 18:10:57 +06:30 |
|
Phyo
|
740038757d
|
Dining Charges CRUD
|
2017-08-11 17:53:48 +06:30 |
|
Yan
|
a614ec6ae7
|
Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-11 17:41:28 +06:30 |
|
Yan
|
03a6208a76
|
add item set with scaffold
|
2017-08-11 17:41:10 +06:30 |
|
Aung Myo
|
79ca1428b9
|
update close receipt for member discount
|
2017-08-11 15:39:08 +06:30 |
|
Yan
|
be71d187b0
|
update menu
|
2017-08-11 15:00:24 +06:30 |
|
yamin
|
2cad08277e
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
|
2017-08-11 14:42:59 +06:30 |
|
yamin
|
3e6ea657f3
|
Set Footer in Dashboard
|
2017-08-11 14:42:44 +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 |
|
Yan
|
fbd5e70f2b
|
Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-11 12:16:07 +06:30 |
|