Commit Graph

1906 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
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
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
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
Moe Su
870dc22249 add merchant uid 2017-06-12 16:26:50 +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
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
Nweni
917ccd0294 booking update 2017-06-12 13:48:54 +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
c5e9d7afd5 merge with crm 2017-06-12 10:25:07 +06:30
Yan
09f9a29cde merge with master 2017-06-12 10:01:36 +06:30
Nweni
3f3d37756d update 2017-06-12 09:20:38 +06:30
Yan
f834911587 to do req_bill_format and status changed after pay 2017-06-12 00:45:26 +06:30
Aung Myo
eb001275c7 fixed conflict 2017-06-11 18:09:00 +06:30
Aung Myo
d65882ac5b crm update 2017-06-11 18:00:34 +06:30
Nweni
6d4ef8e2ad Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-11 17:49:17 +06:30
Nweni
fc3893f048 payment 2017-06-11 17:49:06 +06:30
Moe Su
7ac89829d1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-11 17:40:53 +06:30
Moe Su
7341657477 redeem process 2017-06-11 17:40:44 +06:30
Nweni
05286ce7a6 payment 2017-06-11 16:57:31 +06:30
Moe Su
33cc576f1e edit membership setting , otherpayment page 2017-06-11 15:48:53 +06:30
Moe Su
1d24099abc For Pull 2017-06-11 13:58:34 +06:30
Moe Su
d49dc3f8c8 change route 2017-06-11 13:55:14 +06:30
Yan
518e15f5d1 update crm 2017-06-09 13:54:39 +06:30
Nweni
82de95ca22 update 2017-06-09 13:52:36 +06:30
Yan
4c29aad299 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-09 13:47:19 +06:30
Nweni
8b99f4844e bill api return updated 2017-06-09 13:33:12 +06:30
Nweni
9dd96c7187 fixed conflict 2017-06-09 13:13:54 +06:30
Nweni
56ffd1f063 update sale order talble 2017-06-09 13:13:20 +06:30
Aung Myo
406172c6ff fixed conflict 2017-06-09 12:04:36 +06:30
Yan
367a8694b1 update payment 2017-06-09 11:57:05 +06:30
Nweni
6171b00dc7 cash payment complete 2017-06-09 11:25:30 +06:30