Yan
|
db248d69cd
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-31 17:18:23 +06:30 |
|
yamin
|
21a9f77c59
|
Update
|
2017-08-31 17:05:07 +06:30 |
|
yamin
|
b311df9a0b
|
promotionDay
|
2017-08-31 16:59:32 +06:30 |
|
Zin Lin Phyo
|
d1003e2f6a
|
move load_commissioner to origamin/product_commission
|
2017-08-31 14:15:09 +06:30 |
|
Phyo
|
dd19b52ebd
|
Promotion Index View Change
|
2017-08-31 14:03:43 +06:30 |
|
Phyo
|
012b771435
|
Set Auto Generate ID to exact 16
|
2017-08-31 10:07:44 +06:30 |
|
Yan
|
f50ca87e59
|
Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-30 19:16:20 +06:30 |
|
Yan
|
51d8c986f1
|
merge with august_spring
|
2017-08-30 19:16:07 +06:30 |
|
Aung Myo
|
84d483cad2
|
update addorder
|
2017-08-30 18:41:54 +06:30 |
|
Phyo
|
2f0a7c11ad
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
|
2017-08-30 18:22:42 +06:30 |
|
Phyo
|
bf9f0cdbe7
|
CRUD Update for Promotion
|
2017-08-30 18:22:22 +06:30 |
|
Yan
|
c7018ee774
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-30 11:14:11 +06:30 |
|
Zin Lin Phyo
|
df4caa288d
|
jquery date-time picker
|
2017-08-30 10:46:46 +06:30 |
|
Yan
|
7c5db11df5
|
merge with addorder
|
2017-08-29 18:08:05 +06:30 |
|
Aung Myo
|
2e48c1529e
|
update addorder
|
2017-08-29 17:58:34 +06:30 |
|
Zin Lin Phyo
|
1cbea173df
|
product commission transaction in commissioner
|
2017-08-28 18:17:22 +06:30 |
|
Zin Lin Phyo
|
3131823ae0
|
commission update -> change route under settings
|
2017-08-28 09:46:36 +06:30 |
|
Phyo
|
0670a6a05d
|
Promotion Product Bug Fix
|
2017-08-24 14:37:11 +06:30 |
|
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 |
|