Commit Graph

289 Commits

Author SHA1 Message Date
phyusin
a57b0760fb change right panel text for promotion 2017-10-27 11:13:36 +06:30
Yan
4607321726 merge with origin 2017-10-26 17:58:43 +06:30
Yan
0da1aeaeb9 ui review and edited 2017-10-26 17:54:22 +06:30
Aung Myo
89d2bc7b39 update conflic from adminbsb_uidesign branch 2017-10-26 17:52:21 +06:30
Aung Myo
2e6478ebed update breadcrumb 2017-10-26 17:45:37 +06:30
Aung Myo
92ef1dcdae update material ui 2017-10-26 17:02:26 +06:30
phyusin
526649e6df update right panel text for menu 2017-10-26 17:01:03 +06:30
phyusin
c98b5cbb6e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-10-26 16:20:35 +06:30
phyusin
51dbb321a2 add right panel text for settings and CRM/queue 2017-10-26 16:19:23 +06:30
Aung Myo
15604fea2c update notification 2017-10-26 13:49:15 +06:30
phyusin
055dcbe4cb add right panel text for menu item attributes/options 2017-10-26 10:33:58 +06:30
phyusin
645d9b3f94 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-10-26 10:23:38 +06:30
phyusin
805ca6709f add right panel text for menu and order queue station 2017-10-26 10:23:15 +06:30
Aung Myo
fe6d8a4be0 update item attr and options pages 2017-10-26 10:21:46 +06:30
Aung Myo
5b7177ec97 update fix conflic 2017-10-25 18:18:59 +06:30
Aung Myo
d5141c30bb update promtion and dining charges 2017-10-25 18:13:44 +06:30
phyusin
1569e05b99 add right panel text for menu 2017-10-25 18:11:06 +06:30
phyusin
98334531b2 remove conflict text 2017-10-25 16:53:22 +06:30
phyusin
193ddc2486 add right panel text 2017-10-25 16:41:58 +06:30
Yan
bbae5cd5cc update promotion form 2017-10-25 13:03:12 +06:30
Aung Myo
34a4e485af update setting admin pages 2017-10-24 18:16:03 +06:30
Aung Myo
d725777638 update setting admin pages 2017-10-24 15:56:01 +06:30
Aung Myo
0d6167eca9 update setting admin pages 2017-10-24 15:22:34 +06:30
Aung Myo
f7d3920554 update dashboard total credit and card 2017-10-24 11:42:48 +06:30
phyusin
ba18e722d7 add user manual for zone 2017-10-23 17:59:35 +06:30
yamin
d3dfabd66a delte ui change 2017-10-23 13:38:36 +06:30
yamin
382e9fd4fa inventory definition.coffee 2017-10-23 11:40:37 +06:30
yamin
1aea52619a UI change 2017-10-23 11:38:10 +06:30
Yan
95ef534b04 add cashier zone in ui 2017-10-23 10:53:22 +06:30
Aung Myo
f0494307f6 update admin bsb 2017-10-20 17:02:49 +06:30
Aung Myo
990e32a332 update logout an d remove botstrap select 2017-10-20 11:18:47 +06:30
Aung Myo
772ef9ba25 update delete click 2017-10-19 18:27:53 +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
78c6304748 update confirm box 2017-10-19 18:17:56 +06:30
Yan
ade48433bc temp edit for 16 demo 2017-10-16 19:23:25 +06:30
Yan
d0e3a2205f merge with origin 2017-10-16 18:33:29 +06:30
Aung Myo
98bc14c83d update adminbsb for settins 2017-10-16 18:27:57 +06:30
Yan
c85ebcff14 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-16 15:30:36 +06:30
Aung Myo
8cecb9a524 update admin bsb 2017-10-16 15:29:41 +06:30
Yan
42fce6fe86 change mm 2017-10-16 13:14:13 +06:30
Aung Myo
e2d802da67 update adminbsb setting 2017-10-13 18:01:31 +06:30
Aung Myo
c64eac3f15 update admin bsb 2017-10-13 17:09:18 +06:30
Yan
bfe3727e7d merge with origin and add localize 2017-10-13 17:07:17 +06:30
Yan
1ba68cd152 origin 2017-10-13 16:27:13 +06:30
Aung Myo
37d84c5361 fixed conflic app.css 2017-10-13 15:58:06 +06:30
Aung Myo
ae482b91f9 update setting menu design 2017-10-13 15:53:50 +06:30
Yan
746f5ad471 add mm 2017-10-13 15:53:34 +06:30
Yan
9a761e5402 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-13 14:56:46 +06:30
Yan
ee0463508e add mm and ui reset 2017-10-13 14:56:04 +06:30
Aung Myo
e9ff6481d4 update adminbsb for setting pages 2017-10-12 18:17:05 +06:30