Commit Graph

368 Commits

Author SHA1 Message Date
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
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
phyusin
4c6c503e15 add localization text for Transactions tab 2017-10-30 11:48:44 +06:30
phyusin
74e90c98d3 add localization text for inventory 2017-10-30 10:27:54 +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
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
phyusin
526649e6df update right panel text for menu 2017-10-26 17:01:03 +06:30
phyusin
51dbb321a2 add right panel text for settings and CRM/queue 2017-10-26 16:19:23 +06:30
phyusin
805ca6709f add right panel text for menu and order queue station 2017-10-26 10:23:15 +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
da6d85eaf5 update report and inventory layout design 2017-10-25 14:03:15 +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
Aung Myo
f8279084ea update admin bsb for layout inventory 2017-10-23 10:54:34 +06:30
Aung Myo
ccab11acb2 update admin bsb for layout 2017-10-23 09:38:11 +06:30
Yan
8ceaf8be05 edited order 2017-10-20 17:06:34 +06:30
Aung Myo
e3cf15c096 update admin bsb design 2017-10-16 11:41:53 +06:30
Yan
746f5ad471 add mm 2017-10-13 15:53:34 +06:30
Yan
ee0463508e add mm and ui reset 2017-10-13 14:56:04 +06:30
Yan
2379079b03 add mm 2017-10-12 18:08:49 +06:30
Yan
5df78b10ed change login ui from ko kyawS 2017-10-12 16:17:20 +06:30
Yan
cd5f2eb748 remove _sidebar and add mm 2017-10-12 15:42:06 +06:30
Yan
a6b8389fd0 add mm 2017-10-12 15:34:16 +06:30
Yan
b7955b04fa merge with staging 2017-10-12 14:49:28 +06:30
Yan
429842ad9c add mm menu 2017-10-12 14:46:04 +06:30
Yan
150bb1a751 add mm 2017-10-12 14:44:30 +06:30
Yan
de1469bd5e Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-12 10:16:00 +06:30
Yan
bc2101bf42 merge with staging 2017-10-12 09:59:24 +06:30
Yan
476aafa791 add localization 2017-10-11 17:29:28 +06:30
Aung Myo
50756656a7 updat e addorder for product add 2017-10-10 18:05:09 +06:30
Yan
a0ddef16c3 change api key 2017-10-10 14:28:33 +06:30
Yan
9ff01a09f5 change wathon ip 2017-10-10 09:52:13 +06:30
Yan
b1261f4d27 change wathon ip 2017-10-10 09:45:30 +06:30
Yan
1916d33533 provision setup 2017-10-09 14:46:58 +06:30
Yan
0e72acdf30 Merge branch 'ui_design' into staging 2017-10-09 10:58:48 +06:30
Yan
f9ec0da867 add favicon and edit 2017-10-03 09:58:45 +06:30
Yan
343a61a7e3 Merge branch 'master' into adminbsb_material_ui_test 2017-09-28 18:25:44 +06:30
Yan
8d48a73cfc compatible test 2017-09-28 18:25:31 +06:30
Yan
8f0789fede add config for cable 2017-09-28 10:43:17 +06:30