Commit Graph

396 Commits

Author SHA1 Message Date
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
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
Moe Su
0f055fe546 Add Seed 2017-06-12 16:24:56 +06:30
Moe Su
3b93f6b22e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-12 16:20:25 +06:30
Moe Su
4af0c4fc13 add seed 2017-06-12 16:20:16 +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
Moe Su
b0eb92b043 Seed 2017-06-12 14:19:04 +06:30
Moe Su
3e531f68a9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-12 14:16:42 +06:30
Moe Su
dd5de68bc0 Seed 2017-06-12 14:16:31 +06:30
Yan
7122fb4c81 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-12 14:15:16 +06:30
Yan
4212ad45b3 updated for food and beverage bugs 2017-06-12 14:11:13 +06:30
Moe Su
228ff44e5c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-12 13:58:24 +06:30
Moe Su
a2111f1635 For Pull 2017-06-12 13:58:16 +06:30
Nweni
917ccd0294 booking update 2017-06-12 13:48:54 +06:30
Moe Su
75e363ed12 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-12 13:33:21 +06:30
Moe Su
c6b72a112b For Pull 2017-06-12 13:31:01 +06:30
Nweni
a96444518a fixed conflict 2017-06-12 13:28:16 +06:30
Nweni
d2caba3f03 fixed conflict 2017-06-12 13:27:33 +06:30
Nweni
ee208a5dcd Update 2017-06-12 13:26:09 +06:30
Yan
ca2dc181d6 add receipt no report and bug fixing 2017-06-12 12:04:12 +06:30
Yan
b6bba9ecd4 merge conflict 2017-06-12 10:55:04 +06:30
Yan
e1481eb591 update route after merge with crm 2017-06-12 10:27:53 +06:30
Yan
c5e9d7afd5 merge with crm 2017-06-12 10:25:07 +06:30
Yan
121fb92b9b update orgami js 2017-06-12 10:12:55 +06:30