Commit Graph

2060 Commits

Author SHA1 Message Date
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
Yan
2ae1b5ba3d fix seed 2017-10-25 14:31:25 +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
32866428ce update promotion ui 2017-10-25 13:57:07 +06:30
Yan
bbae5cd5cc update promotion form 2017-10-25 13:03:12 +06:30
Yan
82d48f8246 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-24 18:23:16 +06:30
Aung Myo
0eea755acd Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-24 18:16:38 +06:30
Aung Myo
34a4e485af update setting admin pages 2017-10-24 18:16:03 +06:30
Yan
fa554067a3 fix seed 2017-10-24 17:57:03 +06:30
Yan
821e647bae Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-24 15:57:40 +06:30
Aung Myo
85e2c48e5e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-24 15:56:44 +06:30
Aung Myo
d725777638 update setting admin pages 2017-10-24 15:56:01 +06:30
Yan
2e420e7dde font for print 2017-10-24 15:55:24 +06:30
Yan
33fc467a58 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-24 15:23:28 +06:30
Aung Myo
0d6167eca9 update setting admin pages 2017-10-24 15:22:34 +06:30
Yan
5c80d50942 font in order 2017-10-24 15:22:03 +06:30
Aung Myo
06dd5df432 update puts remove 2017-10-24 11:44:31 +06:30
Aung Myo
630f46b0f0 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-24 11:43:47 +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
19116654a2 print setting for font 2017-10-24 10:20:18 +06:30
Yan
2f254a34ca print cashier by zone 2017-10-23 19:23:43 +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
Yan
c61c7ac98f print bill by cashier zone 2017-10-23 18:39:05 +06:30
Aung Myo
e1dc1d4a8a update orgamidesign etcc.. 2017-10-23 18:11:43 +06:30
Yan
707cae4cf8 add multi cashier logic 2017-10-23 18:10:15 +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
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
4441944a37 comment oqs js 2017-10-23 16:07:52 +06:30
Yan
5c8adbe618 remove no need crm js 2017-10-23 15:49:55 +06:30
Yan
4cda67b967 update asset 2017-10-23 15:20:35 +06:30
Yan
a08d0f8fc7 fix asset 2017-10-23 15:11:11 +06:30
Yan
d63d309481 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-10-23 14:45:28 +06:30
Yan
52b29e251f update seed 2017-10-23 14:45:04 +06:30
Aung Myo
b7db48d6d7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-10-23 14:44:29 +06:30
Yan
1aa3358013 update seed 2017-10-23 14:44:16 +06:30
Aung Myo
2539352e2d update admin bsb for add order design 2017-10-23 14:43:48 +06:30
Yan
67a6effc83 update chart for group hour 2017-10-23 14:18:31 +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
4adfa48d75 seed fix 2017-10-23 13:31:02 +06:30