Commit Graph

455 Commits

Author SHA1 Message Date
Aung Myo
3db6252304 update search and crm 2017-06-14 00:09:54 +06:30
Aung Myo
713e0a367c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-13 20:23:00 +06:30
Aung Myo
e9d3ca3059 pull master for membership 2017-06-13 20:22:33 +06:30
Moe Su
27971f406b Seed 2017-06-13 20:22:28 +06:30
Aung Myo
7057e320cf Merge branch 'crm' 2017-06-13 20:13:01 +06:30
Aung Myo
b86ae8d32d customer search 2017-06-13 20:11:24 +06:30
Nweni
2e316f46fe seed updated 2017-06-13 19:58:15 +06:30
Nweni
d1d8226528 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 19:49:35 +06:30
Nweni
71f88f8a5d Update 2017-06-13 19:49:25 +06:30
Phyo
57f7f1037d Change Amount Bug Fix 2017-06-13 19:41:51 +06:30
Nweni
db2cce3dfa Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 19:06:59 +06:30
Nweni
0e86b12ecd order controller update 2017-06-13 19:06:50 +06:30
Moe Su
b69d2525fe add auth_token 2017-06-13 19:02:06 +06:30
Moe Su
3db3b8c7e7 add auth_token 2017-06-13 19:01:14 +06:30
Nweni
9ae4c13f87 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 18:55:31 +06:30
Nweni
c6ee0e9d25 update seed 2017-06-13 18:55:20 +06:30
Aung Myo
77a41eb9dc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 18:47:56 +06:30
Aung Myo
8a6c0bf059 update rebate amount in payment 2017-06-13 18:46:43 +06:30
Nweni
39e9c5419a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 18:37:24 +06:30
Nweni
0d5767b022 Update 2017-06-13 18:37:14 +06:30
Aung Myo
a600c233d5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-13 18:28:40 +06:30
Aung Myo
7f7d579d2f add auth token:
exit
2017-06-13 18:28:22 +06:30
Moe Su
974ed6a908 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 17:42:05 +06:30
Moe Su
19160a9630 Change redeem name 2017-06-13 17:41:50 +06:30
Phyo
8a7c1f0d88 Payment Vs Tax 2017-06-13 16:05:20 +06:30
Aung Myo
e5c29f6074 merge with report 2017-06-13 15:07:29 +06:30
Aung Myo
7194f0e971 update sale search 2017-06-13 15:04:51 +06:30
Yan
d54fd19d1c report ui format 2017-06-13 14:59:00 +06:30
Nweni
7c37d9ada3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 14:37:35 +06:30
Nweni
1ef88c4e70 update 2017-06-13 14:37:23 +06:30
Aung Myo
03b839fc07 update customer detail 2017-06-13 14:12:35 +06:30
Aung Myo
562db87144 update crm view 2017-06-13 13:39:05 +06:30
Aung Myo
b513aa22ab datepicker 2017-06-13 12:27:45 +06:30
Aung Myo
4f7fda6902 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 12:05:11 +06:30
Aung Myo
ee54f1cdd3 validate error 2017-06-13 12:04:55 +06:30
Phyo
99d00f6d2a Redeem amount validation 2017-06-13 12:04:31 +06:30
Aung Myo
9e4c8cef68 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 11:35:49 +06:30
Aung Myo
6717becf92 Customer Update 2017-06-13 11:35:30 +06:30
Moe Su
21936fe3b0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 10:46:06 +06:30
Moe Su
59d53816bd Change style and redeem 2017-06-13 10:45:56 +06:30
Aung Myo
f8df5147a4 fixed conflict file 2017-06-13 10:40:49 +06:30
Aung Myo
c05a64bae7 update customer amount 2017-06-13 10:36:40 +06:30
Yan
3e691ca3f7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 10:00:47 +06:30
Yan
3404c5e0bd ui updating for report 2017-06-13 09:59:56 +06:30
Moe Su
16e163f987 For Pull 2017-06-13 09:33:16 +06:30
Phyo
29acbd9bfa Rebate Redeem amount detect 2017-06-12 20:32:12 +06:30
Nweni
dfd7eec2e9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-12 20:15:35 +06:30
Nweni
a8a8c2b984 update 2017-06-12 20:15:26 +06:30
Yan
8fc4fa5cf1 order quries update 2017-06-12 20:14:20 +06:30
Yan
1d1a913732 bug fix for order completed 2017-06-12 20:11:37 +06:30