Commit Graph

1096 Commits

Author SHA1 Message Date
phyusin
a57b0760fb change right panel text for promotion 2017-10-27 11:13:36 +06:30
Yan
59d50856ad merge with ui_charges 2017-10-26 18:16:07 +06:30
Yan
fc49372a8b Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-26 18:12:27 +06:30
phyusin
1dbb5d539b add icon and border for dashboard 2017-10-26 18:10:52 +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
6b88403186 update notification 2017-10-26 14:06:42 +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
Aung Myo
fa5b544416 update site bar and credit note view in transaction 2017-10-25 15:06:28 +06:30
Aung Myo
c3f21445d8 update conflicx reset.css 2017-10-25 14:05:15 +06:30
Aung Myo
da6d85eaf5 update report and inventory layout design 2017-10-25 14:03:15 +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
Aung Myo
59c38b2c96 update dashboard total sale and count 2017-10-24 10:55:02 +06:30
Yan
bb96cf6db5 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 18:40:13 +06:30
Yan
0787271706 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 18:39:46 +06:30
Aung Myo
e1dc1d4a8a update orgamidesign etcc.. 2017-10-23 18:11:43 +06:30
phyusin
ba18e722d7 add user manual for zone 2017-10-23 17:59:35 +06:30
Aung Myo
17926742d5 update twice scroll etcc.. 2017-10-23 17:40:02 +06:30
Aung Myo
dd08fd4298 update addorder button and plus icon etcc.. 2017-10-23 17:28:48 +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
5c8adbe618 remove no need crm js 2017-10-23 15:49:55 +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
Aung Myo
e428a1bc87 update origin themem change sidebar 2017-10-23 13:19:59 +06:30
Aung Myo
c4b810dcd4 update origin themem change sidebar 2017-10-23 12:58:44 +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
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