Commit Graph

1205 Commits

Author SHA1 Message Date
Yan
8aa834a487 delete btn for menu item instance 2017-11-07 17:31:14 +06:30
Yan
f7ef431ded Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-07 15:29:28 +06:30
Aung Myo
55943a2e33 update survey json 2017-11-07 15:19:22 +06:30
Yan
4db7f7b7aa add survey form 2017-11-07 15:06:27 +06:30
Aung Myo
97c03c1744 update survey 2017-11-07 14:49:42 +06:30
Yan
758b36000e origami numpad ui fix and promotion fix 2017-11-07 14:48:33 +06:30
Yan
7b2f928df0 test for jade 2017-11-07 12:32:50 +06:30
Yan
0ad958d8a8 del migrating no need commission 2017-11-07 11:03:19 +06:30
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
c5e6854faa change UI for payment page in origami 2017-11-07 10:28:20 +06:30
Yan
6917ce2612 add survey 2017-11-06 18:51:15 +06:30
Yan
d5efe1402f add survey 2017-11-06 18:23:38 +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
3aacc63b82 update conflix sarb rb 2017-11-06 14:17:47 +06:30
Yan
7e19dbc1b6 merge with aung myo 2017-11-06 13:45:26 +06:30
Aung Myo
ce49f81440 update update void print and sale item report 2017-11-06 13:42:04 +06:30
Aung Myo
8f13403fab update transaction 2017-11-06 09:45:44 +06:30
Yan
15196053a0 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-01 17:14:44 +06:30
Aung Myo
ebb2114243 update payment method report and from,to time change 2017-11-01 16:14:45 +06:30
Yan
bb668e1070 fix ui 2017-11-01 15:48:32 +06:30
Yan
4660530218 upgrade version 2017-10-31 18:41:19 +06:30
Aung Myo
01c4eeca81 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-31 18:05:29 +06:30
Aung Myo
b89340b85e update payment menthod report 2017-10-31 18:03:36 +06:30
Yan
cd11841df1 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-31 13:41:36 +06:30
Yan
89381eb72b add manage in ability for supervisor 2017-10-31 13:34:52 +06:30
Aung Myo
1239b308f9 update void alert 2017-10-31 13:34:01 +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
e3b536d58c check and update for origami btn show 2017-10-31 10:50:13 +06:30
Yan
041f9b9fe2 need to edit origami 2017-10-31 10:38:19 +06:30
Yan
c1db3ba8be merge with aung myo 2017-10-30 18:52:48 +06:30
Yan
72414b53b5 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-30 18:51:22 +06:30
Yan
35161aae91 remove turbolink in backend and update logout 2017-10-30 18:51:05 +06:30
Yan
da0558b5ef remove turbolinks in form for conflict 2017-10-30 17:26:38 +06:30
Yan
7beb4e7563 test for turbolink 2017-10-30 14:33:05 +06:30
phyusin
9426834541 add localization text for all report 2017-10-30 14:23:00 +06:30
Aung Myo
a687b45193 update adminbsbs 2017-10-30 12:14:11 +06:30
phyusin
4c6c503e15 add localization text for Transactions tab 2017-10-30 11:48:44 +06:30
Yan
558ec84819 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-30 10:37:36 +06:30
Yan
8169da4d52 edit product form 2017-10-30 10:29:02 +06:30
phyusin
74e90c98d3 add localization text for inventory 2017-10-30 10:27:54 +06:30
Yan
ae5dfaf192 test for no work js,it cause by turbolink 2017-10-29 14:20:24 +06:30
Yan
772b65f2d8 merge with augn myo 2017-10-27 18:41:44 +06:30
Yan
6f6c037e9e merge with phyu sin 2017-10-27 18:40:58 +06:30
Yan
5c27dcff66 merge with origin 2017-10-27 17:06:07 +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