Commit Graph

289 Commits

Author SHA1 Message Date
Aung Myo
049d3c5958 update settings item set 2017-10-12 15:27:50 +06:30
Aung Myo
535fe17d81 update Setting all layout 2017-10-12 15:20:48 +06:30
Yan
add2c26722 updating 2017-10-03 18:44:27 +06:30
Aung Myo
4779b6a19f update 2017-09-19 11:09:23 +06:30
Yan
4b732e8d8c menu edit fix 2017-09-12 17:23:42 +06:30
Yan
ea02f6b8fc Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-09-11 14:05:35 +06:30
Phyo
fa7fcdd559 Room Charges(Account ID change,add dropdown list,tac not calculate) 2017-09-11 13:55:38 +06:30
Yan
a50becb365 merge with august_spring 2017-09-06 18:32:45 +06:30
Phyo
9d47414292 Timepicker Bug Fix 2017-09-06 18:03:53 +06:30
Phyo
4ca3b708c4 Show data in Edit 2017-09-06 17:01:33 +06:30
Yan
82120e2ba1 updated commission for sale edit 2017-09-04 13:13:08 +06:30
Zin Lin Phyo
c2d86cb17c Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  Promotion multiple order
2017-09-04 10:24:54 +06:30
Zin Lin Phyo
98dae6d712 show and update changes in commission and report 2017-09-04 10:24:24 +06:30
Phyo
2eaf891748 Promotion multiple order 2017-09-04 10:22:54 +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
Phyo
e35378bd36 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-31 18:05:43 +06:30
Yan
db248d69cd Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-31 17:18:23 +06:30
yamin
21a9f77c59 Update 2017-08-31 17:05:07 +06:30
yamin
b311df9a0b promotionDay 2017-08-31 16:59:32 +06:30
Zin Lin Phyo
d1003e2f6a move load_commissioner to origamin/product_commission 2017-08-31 14:15:09 +06:30
Phyo
dd19b52ebd Promotion Index View Change 2017-08-31 14:03:43 +06:30
Phyo
012b771435 Set Auto Generate ID to exact 16 2017-08-31 10:07:44 +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
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
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
Zin Lin Phyo
1cbea173df product commission transaction in commissioner 2017-08-28 18:17:22 +06:30
Zin Lin Phyo
3131823ae0 commission update -> change route under settings 2017-08-28 09:46:36 +06:30
Phyo
0670a6a05d Promotion Product Bug Fix 2017-08-24 14:37:11 +06:30
Phyo
0118a178b2 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-23 19:18:18 +06:30
Phyo
857fcd419f Promotion Time Fixed 2017-08-23 19:09:44 +06:30
Yan
744065d3e9 merge with august_spring 2017-08-22 14:52:14 +06:30
Yan
c3e511c8ed fix menu edit 2017-08-22 14:11:25 +06:30
Nweni
44f02be4cb nested form 2017-08-22 14:11:13 +06:30
Phyo
e3c1dd216a Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-21 17:40:44 +06:30
Phyo
e9ba56826c Promotion Product Add 2017-08-21 17:38:07 +06:30
Yan
2b0dcd4ab9 update and fix 2017-08-21 16:50:24 +06:30
yamin
3b5eb532d3 updateProduct 2017-08-21 16:06:34 +06:30
yamin
150c843fe0 Update 2017-08-21 10:14:16 +06:30
Yan
a1df5a0dbc update menu_sync 2017-08-18 19:46:43 +06:30
Yan
48461da9ea add fields for Menu Sync 2017-08-18 11:24:38 +06:30
Yan
29b3f94573 add menu api 2017-08-17 18:55:13 +06:30
Yan
f2829fab0f Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-17 13:50:24 +06:30
Phyo
0138ae2efa Fix Conflict 2017-08-16 18:38:41 +06:30