Commit Graph

1491 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Aung Myo
0943808ac8 finished order and sales in setting 2017-06-12 00:45:59 +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
fc3893f048 payment 2017-06-11 17:49:06 +06:30
Nweni
f6d14de461 fixed conflict 2017-06-11 16:58:18 +06:30
Nweni
05286ce7a6 payment 2017-06-11 16:57:31 +06:30