Nweni
de769f3faf
promotion
2017-08-23 17:37:13 +06:30
Nweni
67cf713b90
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-23 10:13:06 +06:30
Nweni
eedf6c39a1
promotion + merge with master
2017-08-23 10:12:41 +06:30
Yan
744065d3e9
merge with august_spring
2017-08-22 14:52:14 +06:30
Nweni
533cfdfe8d
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-22 14:12:04 +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
Zin Lin Phyo
74c2955ef0
create productCommission
2017-08-22 11:08:49 +06:30
Zin Lin Phyo
1af178fecb
update ui commission & commissioner
2017-08-22 09:51:08 +06:30
yamin
7d60ab1a95
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-21 18:17:00 +06:30
yamin
4e29cd7cdd
CRUDcommission
2017-08-21 18:14:36 +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
9d424df9fd
updateCommissioner
2017-08-21 17:31:17 +06:30
Yan
2b0dcd4ab9
update and fix
2017-08-21 16:50:24 +06:30
yamin
b7f9d56221
fix conflit
2017-08-21 16:35:15 +06:30
yamin
8c6f06a667
for pull
2017-08-21 16:33:59 +06:30
Zin Lin Phyo
f26bc83b42
move commission to origami
2017-08-21 16:31:04 +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
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
yamin
dc95f78202
Merge branch 'master' into august_spring
2017-08-21 10:12:47 +06:30
Phyo
8caf4b2612
Coupon / Voucher data change
2017-08-21 10:09:23 +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
3160aab399
merge with addorder
2017-08-17 18:59:22 +06:30
Yan
29b3f94573
add menu api
2017-08-17 18:55:13 +06:30
Aung Myo
7f2bfa2348
update add order and calculate subtotal
2017-08-17 13:51:01 +06:30
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
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
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
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
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
