Commit Graph

211 Commits

Author SHA1 Message Date
Yan
17afb039cb update commission 2017-11-07 10:52:57 +06:30
Yan
4fa0705f1c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-07 10:32:48 +06:30
Aung Myo
b48625e25e update commission and seed for font 2017-11-07 10:31:10 +06:30
Yan
8f69caff2d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-11-07 10:29:27 +06:30
phyusin
70a908158f fix for checkbox in promotion and Back btn fix for Customers in Origami 2017-11-06 16:02:01 +06:30
Aung Myo
ce49f81440 update update void print and sale item report 2017-11-06 13:42:04 +06:30
Aung Myo
cfa819f985 fixed conflic 2017-10-31 12:13:19 +06:30
Aung Myo
56940d7f00 update sale audit 2017-10-31 12:08:27 +06:30
Yan
c1db3ba8be merge with aung myo 2017-10-30 18:52:48 +06:30
Yan
da0558b5ef remove turbolinks in form for conflict 2017-10-30 17:26:38 +06:30
Aung Myo
a687b45193 update adminbsbs 2017-10-30 12:14:11 +06:30
Yan
8169da4d52 edit product form 2017-10-30 10:29:02 +06:30
Yan
ae5dfaf192 test for no work js,it cause by turbolink 2017-10-29 14:20:24 +06:30
Yan
6f6c037e9e merge with phyu sin 2017-10-27 18:40:58 +06:30
Yan
0f24cc0999 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-27 17:02:17 +06:30
phyusin
ef05aec1db add localization for all form data 2017-10-27 17:00:56 +06:30
Yan
61c9fd0c81 test for js 2017-10-27 16:53:32 +06:30
phyusin
d916c262d7 validation for commission, commissioner 2017-10-27 13:51:45 +06:30
Aung Myo
b4005efa1b fixed conflic 2017-10-27 13:25:13 +06:30
Aung Myo
188d091884 update checkout all formm 2017-10-27 13:17:32 +06:30
Yan
62ce53c978 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-27 11:40:39 +06:30
Yan
18aa3d1e0f ui updated 2017-10-27 11:37:47 +06:30
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