Nweni
6aaea69f0a
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-25 09:41:44 +06:30
Nweni
b99c503afa
inventory
2017-08-25 09:40:59 +06:30
yamin
4791656a7d
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-24 18:26:28 +06:30
yamin
7004637027
In_juties
2017-08-24 18:24:57 +06:30
Nweni
1f7ba42e80
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-24 18:04:57 +06:30
Nweni
81f430b5c6
inventory setup
2017-08-24 18:04:42 +06:30
Phyo
9327cb7169
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-24 15:28:34 +06:30
Phyo
0670a6a05d
Promotion Product Bug Fix
2017-08-24 14:37:11 +06:30
Zin Lin Phyo
283c59c5dc
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
...
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
Promotion Time Fixed
2017-08-24 10:08:56 +06:30
Zin Lin Phyo
f2ddcb9e4b
readded commission
2017-08-24 10:05:07 +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
yamin
258ab711e1
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-23 18:15:36 +06:30
yamin
d88199150e
CRUDIn_Juties
2017-08-23 18:14:31 +06:30
Nweni
44459ce4b5
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-23 17:37:47 +06:30
Nweni
de769f3faf
promotion
2017-08-23 17:37:13 +06:30
Zin Lin Phyo
784da2cf09
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
...
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
UpdateCommissioner
2017-08-23 15:24:50 +06:30
Zin Lin Phyo
f205d9910e
readded commissions_controller
2017-08-23 15:19:55 +06:30
yamin
111872c158
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-23 15:04:34 +06:30
yamin
621dfb03fe
UpdateCommissioner
2017-08-23 15:03:53 +06:30
Zin Lin Phyo
874a9b60be
create InJuty
2017-08-23 15:02:27 +06:30
Zin Lin Phyo
3132bc7c34
commission update
2017-08-23 11:14:24 +06:30
Zin Lin Phyo
b53db9b08b
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
...
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
nested form
2017-08-23 10:24:44 +06:30
Zin Lin Phyo
fd1bfb7c0e
load commissioner
2017-08-23 10:24:26 +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
