Phyo
5a1c161771
Promotion Relation with PromotionProduct
2017-08-21 17:46:16 +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
yamin
8c6f06a667
for pull
2017-08-21 16:33:59 +06:30
yamin
25e6039a9f
CRUDcommissioner
2017-08-21 16:12:59 +06:30
Zin Lin Phyo
618f5f3b7c
commssions
2017-08-21 16:11:51 +06:30
yamin
3b5eb532d3
updateProduct
2017-08-21 16:06:34 +06:30
Zin Lin Phyo
2a736cc92f
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
...
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant: (71 commits)
Update
Coupon / Voucher data change
update menu_sync
update addorder
update addorder view
add fields for Menu Sync
update add oreder
add menu api
update add order and calculate subtotal
update seed
menu ui update
update ability for setmenu
fixed
update show for foc
add bootstrap file input and menu item img implemented
update foc and pdf
update menu item
update receipt bill pdf for foc and credit
add CarrierWave gems for menu image upload
add CarrierWave gems for menu image upload
...
2017-08-21 13:30:28 +06:30
Zin Lin Phyo
7b0db433c4
commissioner scaffold
2017-08-21 13:30:04 +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
fcc5014b49
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
2017-08-17 18:55:33 +06:30
Yan
29b3f94573
add menu api
2017-08-17 18:55:13 +06:30
Nweni
06619d30dc
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-17 17:41:01 +06:30
Nweni
9702299fa7
Update
2017-08-17 17:40:18 +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
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
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
Nweni
2da60ce6e3
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-15 11:15:41 +06:30
Nweni
e5a685f36e
room charges
2017-08-15 11:14:38 +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
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
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
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
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
Nweni
1f892fdd3d
fixed conflict
2017-08-14 11:32:18 +06:30
Nweni
6f39a024ca
dining charge
2017-08-14 11:30:58 +06:30
Yan
f8c7630b97
updating item_set
2017-08-14 10:28:23 +06:30
yamin
c30d8f15d8
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-14 10:19:22 +06:30
yamin
646492fbd6
updateability
2017-08-14 10:18:59 +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
Yan
12d3e70b19
update model for menu
2017-08-11 14:23:33 +06:30
