Commit Graph

344 Commits

Author SHA1 Message Date
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
Nweni
90da21993d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-12 19:35:17 +06:30
Nweni
c904451110 update 2017-06-12 19:35:05 +06:30
Phyo
4bbf651040 Rebate Bug Fix 2017-06-12 19:31:01 +06:30
Phyo
796d511f2e Rebate add 2017-06-12 19:02:20 +06:30
Nweni
3bc3419243 fixed conflict 2017-06-12 18:52:12 +06:30
Nweni
6945449523 get update 2017-06-12 18:51:02 +06:30
Aung Myo
92f1f80acb Edit Customer 2017-06-12 18:50:06 +06:30
Aung Myo
7dcc777668 fixed conflict 2017-06-12 18:34:41 +06:30
Yan
562c93dee7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-12 18:33:23 +06:30
Yan
e1e7064e47 add menu in Transaction 2017-06-12 18:33:09 +06:30
Aung Myo
967d035097 change dob 2017-06-12 18:31:42 +06:30
Cherry
a35dad8872 Merge branch 'master' of https://bitbucket.org/code2lab/sxrestaurant 2017-06-12 18:28:18 +06:30
Cherry
a247c142b8 ReceiptList Report Rough 2017-06-12 18:26:00 +06:30
Yan
1d667c6174 merge with master 2017-06-12 18:24:57 +06:30
Aung Myo
b14f4d67a5 origamijs 2017-06-12 18:23:12 +06:30
Yan
423776cadd print format update 2017-06-12 18:19:30 +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
e6647dd494 Seed Edit 2017-06-12 16:48:20 +06:30
Aung Myo
8eee364710 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-12 16:36:01 +06:30
Aung Myo
779df44da0 Merge branch 'crm' 2017-06-12 16:34:39 +06:30
Aung Myo
6d34f92506 update crm api 2017-06-12 16:33:18 +06:30
Moe Su
870dc22249 add merchant uid 2017-06-12 16:26:50 +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
Nweni
105581a7de Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-12 14:23:29 +06:30
Aung Myo
e90178cfdc finished CRM and customer 2017-06-12 14:23:20 +06:30
Nweni
b12b52d754 update table status 2017-06-12 14:23:18 +06:30
Phyo
c7ff5140d4 Payment route change 2017-06-12 14:22:45 +06:30