Yan
|
6feb524db8
|
test for checkbox fail
|
2017-10-27 18:39:44 +06:30 |
|
Yan
|
0a7da11aa1
|
new bsb version to old
|
2017-10-27 17:44:06 +06:30 |
|
Yan
|
e76b61987c
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui
|
2017-10-27 17:17:37 +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 |
|
Aung Myo
|
79a46ba7cf
|
update induties
|
2017-10-27 16:50:26 +06:30 |
|
phyusin
|
d916c262d7
|
validation for commission, commissioner
|
2017-10-27 13:51:45 +06:30 |
|
Yan
|
445d63e286
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui
|
2017-10-27 13:42:22 +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 |
|
phyusin
|
0d2952c35f
|
hourly sale group query
|
2017-10-27 12:04:42 +06:30 |
|
phyusin
|
6b3616f644
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-10-27 12:03:00 +06:30 |
|
phyusin
|
0653bfab53
|
check required for oqs and cashier terminal
|
2017-10-27 12:02:38 +06:30 |
|
Yan
|
c8ee056312
|
fix hourly chart
|
2017-10-27 12:01:07 +06:30 |
|
Yan
|
8de7dd7c0b
|
update dining_charge
|
2017-10-27 11:56:54 +06:30 |
|
Yan
|
8f5d24a2e3
|
hourly sale group
|
2017-10-27 11:42:08 +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 |
|
phyusin
|
f49ba4b3d8
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-10-27 09:24:04 +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
|
171c732c86
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-10-26 18:11:17 +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 |
|
Yan
|
40bb227975
|
merge with amyo ui
|
2017-10-25 18:31:20 +06:30 |
|
Yan
|
9cc2c61700
|
fixed from trello bug
|
2017-10-25 18:25:28 +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 |
|