Commit Graph

1324 Commits

Author SHA1 Message Date
Aung Myo
14e0d91a4e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 10:45:36 +06:30
Phyo
4126012e6d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 10:44:00 +06:30
Aung Myo
c155c86970 update checkbox in customer view 2017-06-14 10:43:27 +06:30
Phyo
f0fe589ec6 Payment conflict in Del key 2017-06-14 10:43:19 +06:30
Nweni
3d2b9f745e payment 2017-06-14 10:41:26 +06:30
Nweni
998b23aae5 update key 2017-06-14 10:27:15 +06:30
Yan
b4021a87c8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into pre_master 2017-06-14 10:16:55 +06:30
Yan
b7f1a0a029 print format updating 2017-06-14 10:15:35 +06:30
Nweni
a16af5e404 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 10:07:48 +06:30
Nweni
7d5d23e5a6 Update 2017-06-14 10:07:31 +06:30
Aung Myo
3db6252304 update search and crm 2017-06-14 00:09:54 +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
71f88f8a5d Update 2017-06-13 19:49:25 +06:30
Aung Myo
8a6c0bf059 update rebate amount in payment 2017-06-13 18:46:43 +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
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
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
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
1d1a913732 bug fix for order completed 2017-06-12 20:11:37 +06:30
Moe Su
2db2be56d8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-12 18:18:32 +06:30
Moe Su
b47c983886 Edit Redim 2017-06-12 18:18:24 +06:30
Nweni
7a3957181c update 2017-06-12 18:15:19 +06:30
Nweni
ddf85905ef fixed conflict 2017-06-12 17:32:38 +06:30
Nweni
d1ae734f50 update 2017-06-12 17:30:49 +06:30
Aung Myo
90e583b212 Merge branch 'crm' 2017-06-12 15:47:29 +06:30
Aung Myo
622aa4f121 update origami js and index 2017-06-12 15:39:38 +06:30
Aung Myo
10418c1204 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-12 15:03:02 +06:30
Aung Myo
dc51beae43 fixed conflictfile 2017-06-12 15:01:19 +06:30
Nweni
59520bf7ec table status update 2017-06-12 14:35:59 +06:30
Aung Myo
e90178cfdc finished CRM and customer 2017-06-12 14:23:20 +06:30
Phyo
c7ff5140d4 Payment route change 2017-06-12 14:22:45 +06:30