Commit Graph

1562 Commits

Author SHA1 Message Date
Yan
f7d3e4c0e3 google font 2017-09-29 15:15:32 +06:30
Yan
9454df17a0 updating 2017-09-29 13:32:56 +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
Aung Myo
d4484ce849 update addorder 2017-09-27 15:29:08 +06:30
Aung Myo
eaa591a17b update addorder 2017-09-27 13:07:33 +06:30
Aung Myo
12458b71be update addorder 2017-09-27 11:30:47 +06:30
Aung Myo
35b9a9e02a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs 2017-09-27 11:26:27 +06:30
Aung Myo
ddf466d3fe update addorder available and max qty 2017-09-27 11:26:13 +06:30
Aung Myo
dd9e8fe908 update queue and completed sale 2017-09-21 17:54:57 +06:30
Yan
15a2df5922 not compitable with our tech 2017-09-21 17:52:30 +06:30
Yan
3e4fc7d45d not compitable with our tech 2017-09-21 17:51:59 +06:30
Aung Myo
a6380fc77c update sym master sql 2017-09-21 14:11:28 +06:30
Yan
1a4ca5238f update dashboard layout 2017-09-21 13:50:14 +06:30
Yan
91ad6e3ef0 BSBMaterial added 2017-09-20 19:25:19 +06:30
Aung Myo
274eebd19c update symmaster 2017-09-20 16:40:34 +06:30
Yan
899eb61568 changing dashboard 2017-09-20 16:29:37 +06:30
Yan
bcfd088d5d changing dashboard 2017-09-20 16:29:27 +06:30
Aung Myo
7191f0511c update sym master.sql 2017-09-19 18:02:23 +06:30
Aung Myo
e3a76f7095 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-09-19 14:32:52 +06:30
Aung Myo
a5473503fb update menu_item json for attribute name 2017-09-19 14:32:04 +06:30
Aung Myo
6514fc5285 update sym_master.sql 2017-09-19 14:30:27 +06:30
Aung Myo
4779b6a19f update 2017-09-19 11:09:23 +06:30
Yan
f4270ffd87 fix promotion date format 2017-09-18 17:36:17 +06:30
Yan
3e0371a9fb done 2017-09-15 14:20:53 +06:30
Yan
f5c32229b7 Merge branch 'master' into qr_code 2017-09-15 10:06:58 +06:30
Yan
5c96dcac81 Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant 2017-09-14 18:23:43 +06:30
Yan
77c399d7cd add qr 2017-09-14 18:23:16 +06:30
Aung Myo
07ea214eee update other payment alert box 2017-09-14 17:49:11 +06:30
Aung Myo
e878a6387e update member discount 2017-09-14 17:36:00 +06:30
Yan
36f6da4470 Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant 2017-09-14 14:11:38 +06:30
Yan
baa3da9b5c add qr code 2017-09-14 14:10:55 +06:30
Yan
6482f05218 adding qr 2017-09-13 18:38:05 +06:30
Yan
807d472c01 merge with master 2017-09-13 14:46:51 +06:30
Aung Myo
90681cddcc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs 2017-09-13 14:21:52 +06:30
Aung Myo
abde6745a4 update addorder modefined 2017-09-13 12:27:37 +06:30
Aung Myo
bbcce13a2e update addorder 2017-09-13 09:21:35 +06:30
Yan
4b732e8d8c menu edit fix 2017-09-12 17:23:42 +06:30
Yan
101b9511da fix menu_item api 2017-09-12 14:37:33 +06:30
Yan
569664f48a fix menu_item api 2017-09-11 18:33:56 +06:30
Yan
89e6a7161a bug menu item api 2017-09-11 18:30:49 +06:30
Yan
6db3e96c1c Merge branch 'qr_code' of bitbucket.org:code2lab/sxrestaurant 2017-09-11 17:04:22 +06:30
Yan
8ec820a624 bill cable add and add ... for origami pages 2017-09-11 16:38:32 +06:30
Yan
c3b38a860c bill cable add and add ... for origami pages 2017-09-11 16:37:50 +06:30
Yan
c131a4eff2 fix dining charge calc 2017-09-11 15:47:32 +06:30
Aung Myo
361e439664 update qr code 2017-09-11 15:44:45 +06:30
Yan
ea02f6b8fc Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-09-11 14:05:35 +06:30
Yan
efb60e6f79 add calc tax order in sale 2017-09-11 14:05:19 +06:30
Yan
b4ceff9631 add calc tax order flag in shop table 2017-09-11 13:56:49 +06:30