Commit Graph

343 Commits

Author SHA1 Message Date
yamin
1aea52619a UI change 2017-10-23 11:38:10 +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
Aung Myo
7f5ce4e233 update ui desige for sx theme 2017-09-26 11:40:44 +06:30
Yan
3e4fc7d45d not compitable with our tech 2017-09-21 17:51:59 +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
a50becb365 merge with august_spring 2017-09-06 18:32:45 +06:30
Zin Lin Phyo
2e53b72574 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  Timepicker Bug Fix
  Show data in Edit
  Promotion Destory Bug Fix
2017-09-06 18:28:09 +06:30
Zin Lin Phyo
5e1e0cd5b9 stock_check report template 2017-09-06 18:27:58 +06:30
Phyo
4ca3b708c4 Show data in Edit 2017-09-06 17:01:33 +06:30
Zin Lin Phyo
784e740da3 rename in_juty to in_duty 2017-09-06 11:18:02 +06:30
Zin Lin Phyo
31021813b0 inventory list and stock check 2017-09-05 16:47:50 +06:30
Aung Myo
d715809b20 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs 2017-09-01 16:57:04 +06:30
Aung Myo
fc5192157b update 2017-09-01 16:55:51 +06:30
Yan
3726e8a7c3 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-31 18:09:35 +06:30
Zin Lin Phyo
0fbce1ca7c fix conflit 2017-08-31 18:07:05 +06:30
Yan
e09559c508 merge with august spring but merge fail 2017-08-31 15:58:01 +06:30
Nweni
12c8be597d Inventory Stock Check Print 2017-08-31 15:29:36 +06:30
Zin Lin Phyo
d1003e2f6a move load_commissioner to origamin/product_commission 2017-08-31 14:15:09 +06:30
Yan
f50ca87e59 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-30 19:16:20 +06:30
Yan
51d8c986f1 merge with august_spring 2017-08-30 19:16:07 +06:30
Aung Myo
84d483cad2 update addorder 2017-08-30 18:41:54 +06:30
Phyo
2f0a7c11ad Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-30 18:22:42 +06:30
Phyo
bf9f0cdbe7 CRUD Update for Promotion 2017-08-30 18:22:22 +06:30
Nweni
de45fb29b8 Update 2017-08-30 14:21:05 +06:30
Nweni
cabc78c373 inventory 2017-08-30 14:19:24 +06:30
Yan
76fb16615d merge with august sprint for commission 2017-08-29 18:44:31 +06:30