Commit Graph

227 Commits

Author SHA1 Message Date
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
e1204d84d9 update header 2017-10-11 10:02:47 +06:30
Aung Myo
50756656a7 updat e addorder for product add 2017-10-10 18:05:09 +06:30
Aung Myo
33f03b2e05 update adminbsb theme all theme setting 2017-10-10 14:11:38 +06:30
Aung Myo
79c7b46ab7 update adminbsb design 2017-10-09 18:17:45 +06:30
Aung Myo
92e8885886 update admin theme 2017-10-09 15:22:58 +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
Aung Myo
c4f3b9e999 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_design 2017-09-28 09:59:07 +06:30
Aung Myo
e7c2e3c007 update addorder 2017-09-27 17:54:54 +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
ddf466d3fe update addorder available and max qty 2017-09-27 11:26:13 +06:30
Aung Myo
7f5ce4e233 update ui desige for sx theme 2017-09-26 11:40:44 +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
Yan
91ad6e3ef0 BSBMaterial added 2017-09-20 19:25:19 +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
c3b38a860c bill cable add and add ... for origami pages 2017-09-11 16:37:50 +06:30
Yan
3e76509347 remove console log 2017-09-07 18:06:59 +06:30
Yan
f67d4197ec add bill channel for req bill 2017-09-07 15:35:00 +06:30
Aung Myo
a9d31935a1 update addorder bugs 2017-09-06 13:22:46 +06:30
Aung Myo
d1db57e9b5 update oqs action cable sorting 2017-09-05 18:06:57 +06:30
Aung Myo
bb6e938f47 update oqs action cable for order cahnnel and oqs channel 2017-09-05 16:51:41 +06:30
Aung Myo
4a85039170 update oqs action cable for order cahnnel and oqs channel 2017-09-05 14:07:20 +06:30
Aung Myo
eeb2a91ce9 update oqs action cable for order cahnnel and oqs channel 2017-09-05 09:41:05 +06:30
Aung Myo
fc5192157b update 2017-09-01 16:55:51 +06:30
Yan
2b3c294327 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-31 12:10:31 +06:30
Aung Myo
449969fa5b update addorder 2017-08-31 11:22:12 +06:30
Yan
f50ca87e59 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-30 19:16:20 +06:30
Yan
3e8ead6a32 ui code review and edited 2017-08-30 19:04:06 +06:30
Aung Myo
84d483cad2 update addorder 2017-08-30 18:41:54 +06:30
Yan
c7018ee774 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-30 11:14:11 +06:30
Zin Lin Phyo
df4caa288d jquery date-time picker 2017-08-30 10:46:46 +06:30
Yan
76fb16615d merge with august sprint for commission 2017-08-29 18:44:31 +06:30
Zin Lin Phyo
5fcfbdc020 fix conflit 2017-08-29 18:42:08 +06:30
Zin Lin Phyo
f03d8654e7 commission report 2017-08-29 18:36:46 +06:30
Yan
7c5db11df5 merge with addorder 2017-08-29 18:08:05 +06:30
Aung Myo
2e48c1529e update addorder 2017-08-29 17:58:34 +06:30
yamin
e84c080552 DataetimepickerInJuty 2017-08-29 13:20:32 +06:30
Yan
bbd9a50868 merge with august spring 2017-08-28 18:33:49 +06:30
Yan
6472a2deac Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-28 18:27:58 +06:30
Aung Myo
1372285c7f update add order 2017-08-28 18:27:22 +06:30
Zin Lin Phyo
1cbea173df product commission transaction in commissioner 2017-08-28 18:17:22 +06:30
Nweni
1f7ba42e80 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-24 18:04:57 +06:30
Nweni
81f430b5c6 inventory setup 2017-08-24 18:04:42 +06:30
Phyo
857fcd419f Promotion Time Fixed 2017-08-23 19:09:44 +06:30