Commit Graph

248 Commits

Author SHA1 Message Date
Aung Myo
2da2edc5ec update sale and customer 2017-06-14 18:13:13 +06:30
Phyo
3b99016f80 Limit paid amount for JCB, Visa and Master Card 2017-06-14 17:13:43 +06:30
Yan
41e9aec389 add cashier in sale and origami ui updated 2017-06-14 16:51:25 +06:30
Phyo
5cff9c891b Other Payment shown by type 2017-06-14 12:02:52 +06:30
Nweni
3d2b9f745e payment 2017-06-14 10:41:26 +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
Phyo
8a7c1f0d88 Payment Vs Tax 2017-06-13 16:05:20 +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
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
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
c904451110 update 2017-06-12 19:35:05 +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
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
b47c983886 Edit Redim 2017-06-12 18:18:24 +06:30
Aung Myo
6d34f92506 update crm api 2017-06-12 16:33:18 +06:30
Aung Myo
dc51beae43 fixed conflictfile 2017-06-12 15:01:19 +06:30
Aung Myo
e90178cfdc finished CRM and customer 2017-06-12 14:23:20 +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
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
f6d14de461 fixed conflict 2017-06-11 16:58:18 +06:30
Nweni
05286ce7a6 payment 2017-06-11 16:57:31 +06:30
Moe Su
ee197dba05 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty 2017-06-11 16:12:23 +06:30
Moe Su
29cdcfb28d For Pull 2017-06-11 16:11:44 +06:30
Nweni
a809818324 other payment 2017-06-11 16:10:50 +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
Nweni
aa8068ad10 Update 2017-06-11 13:02:03 +06:30
Moe Su
9f9c83ab7f pay par payment 2017-06-11 13:01:03 +06:30