Commit Graph

1376 Commits

Author SHA1 Message Date
Aung Myo
84d483cad2 update addorder 2017-08-30 18:41:54 +06:30
Aung Myo
2e48c1529e update addorder 2017-08-29 17:58:34 +06:30
Aung Myo
1372285c7f update add order 2017-08-28 18:27:22 +06:30
Aung Myo
2522950019 update create order function 2017-08-25 18:55:34 +06:30
Aung Myo
a043a33ca5 update addorder 2017-08-24 18:10:23 +06:30
Aung Myo
3314b3554f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into addorder 2017-08-24 13:30:02 +06:30
Yan
d36a633134 fix menu item json format 2017-08-24 12:48:10 +06:30
Aung Myo
7b90acd2c1 update jade integration card use for all shop 2017-08-24 11:29:04 +06:30
Yan
18dc0300c4 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-23 19:55:37 +06:30
Aung Myo
352037641b update jade integration 2017-08-23 19:55:17 +06:30
Yan
1a091929b0 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-23 19:51:55 +06:30
Aung Myo
07b13d8f87 update jade integration 2017-08-23 19:46:00 +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
55f041a252 add checksum for menu sync 2017-08-23 18:59:23 +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
688ce932cc promotion 2017-08-23 18:07:58 +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
d56132f6f4 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  Dining Charges Fix for free time
2017-08-23 15:03:16 +06:30
Zin Lin Phyo
874a9b60be create InJuty 2017-08-23 15:02:27 +06:30
Phyo
790b7939fc Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-23 13:59:52 +06:30
Phyo
248b807633 Dining Charges Fix for free time 2017-08-23 13:59:27 +06:30
Yan
911b941793 fix member sync and menu json 2017-08-23 13:43:31 +06:30
Zin Lin Phyo
d6b8e8bdee update commissioner 2017-08-23 11:36:36 +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
Nweni
28dab9d3e0 promotion 2017-08-23 09:48:15 +06:30
Yan
94cc126969 fix for pdf print setting 2017-08-22 18:02:16 +06:30
Aung Myo
0c89b09249 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into addorder 2017-08-22 16:10:29 +06:30
Aung Myo
ee869c9ded update add order 2017-08-22 16:08:48 +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
Yan
a400bb5a0e remove extra menu image 2017-08-22 11:44:31 +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
Yan
7a1668ca82 re-fixed for customer button 2017-08-21 18:44:40 +06:30
Aung Myo
ad628c6746 update addorder 2017-08-21 18:22:51 +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