Commit Graph

1068 Commits

Author SHA1 Message Date
Aung Myo
b89340b85e update payment menthod report 2017-10-31 18:03:36 +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
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
phyusin
20c0c2ca98 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-10-27 13:28:49 +06:30
phyusin
19b9b5c557 add validation for payment method,print_setting,tax_profile 2017-10-27 13:28:25 +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
phyusin
1765a5dd36 fix dashboard js error 2017-10-27 11:39:51 +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
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