Commit Graph

1450 Commits

Author SHA1 Message Date
Yan
707cae4cf8 add multi cashier logic 2017-10-23 18:10:15 +06:30
Yan
857ab0ae14 update for multiple cashier 2017-10-23 16:49:09 +06:30
Yan
47efe20e8e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 16:17:29 +06:30
Aung Myo
2e41037d5f Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 16:15:35 +06:30
Aung Myo
14fc9b1a45 update oqs 2017-10-23 16:14:29 +06:30
Yan
1aa3358013 update seed 2017-10-23 14:44:16 +06:30
Aung Myo
735dc228db update admin bsb for add order design 2017-10-23 13:58:54 +06:30
yamin
d3dfabd66a delte ui change 2017-10-23 13:38:36 +06:30
Yan
ac42c4a78e ui edited 2017-10-23 13:20:41 +06:30
Yan
ba44495663 shift open fix 2017-10-23 12:05:56 +06:30
Yan
58b180adc4 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 11:50:09 +06:30
Aung Myo
1147b81a8a Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 11:48:01 +06:30
Aung Myo
973e6dc11e update admin bsb for layout nav bar 2017-10-23 11:47:35 +06:30
Yan
b989b78442 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 11:41:29 +06:30
yamin
382e9fd4fa inventory definition.coffee 2017-10-23 11:40:37 +06:30
Yan
44010e1762 add cashier zone terminal 2017-10-23 11:39:41 +06:30
yamin
1aea52619a UI change 2017-10-23 11:38:10 +06:30
Aung Myo
e44a512e80 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 10:54:51 +06:30
Aung Myo
f8279084ea update admin bsb for layout inventory 2017-10-23 10:54:34 +06:30
Yan
95ef534b04 add cashier zone in ui 2017-10-23 10:53:22 +06:30
Yan
649f50bd5e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 10:00:46 +06:30
Aung Myo
800143f66f Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 09:59:46 +06:30
Yan
bcd86714e2 add cashier zones 2017-10-23 09:57:26 +06:30
Aung Myo
ccab11acb2 update admin bsb for layout 2017-10-23 09:38:11 +06:30
Yan
ce5e3b69ed Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-20 19:15:46 +06:30
Yan
52067dbd51 race modified 2017-10-20 19:15:17 +06:30
Yan
8f3b30f2fa race 2017-10-20 19:09:17 +06:30
Aung Myo
ed6d3d8757 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-20 18:52:06 +06:30
Aung Myo
80f1170d8a update admin bsb crm layou 2017-10-20 18:50:30 +06:30
Yan
4874bb135c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-20 17:06:50 +06:30
Yan
8ceaf8be05 edited order 2017-10-20 17:06:34 +06:30
Aung Myo
66df689f4e update admin bsb 2017-10-20 17:04:10 +06:30
Aung Myo
f0494307f6 update admin bsb 2017-10-20 17:02:49 +06:30
Yan
ba39284f93 merge with origin 2017-10-20 14:31:01 +06:30
Yan
25bc6f1c26 parallel incoming req 2017-10-20 13:25:24 +06:30
Aung Myo
9dac7198e9 update tab and select 2017-10-20 12:23:27 +06:30
Aung Myo
6066eb2a4f update tab and select 2017-10-20 12:22:05 +06:30
Aung Myo
990e32a332 update logout an d remove botstrap select 2017-10-20 11:18:47 +06:30
Yan
4eb9fe74e1 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-19 18:35:24 +06:30
Yan
e697bd0e1f order edit print 2017-10-19 18:34:58 +06:30
Aung Myo
772ef9ba25 update delete click 2017-10-19 18:27:53 +06:30
Aung Myo
1958d9de67 update delete click 2017-10-19 18:25:39 +06:30
Aung Myo
575d1b0638 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-19 18:21:45 +06:30
Aung Myo
0809965edf update loguou 2017-10-19 18:20:48 +06:30
Aung Myo
78c6304748 update confirm box 2017-10-19 18:17:56 +06:30
Yan
7ab62e2a24 re-origin seed generate 2017-10-19 17:12:02 +06:30
Yan
a00c2d5922 while loop for race condition in seed generate 2017-10-19 17:09:34 +06:30
Aung Myo
034685e1e9 update adminbsb for confirms 2017-10-17 18:09:17 +06:30
Yan
2f3e6cb9aa not done 2017-10-17 18:08:45 +06:30
Yan
264318966e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-17 10:24:15 +06:30