Commit Graph

232 Commits

Author SHA1 Message Date
Phyo
c6f976bab3 Payment via card Bug fix 2017-06-15 09:49:44 +06:30
Nweni
34b1c26b0b update 2017-06-15 01:33:52 +06:30
Phyo
541907d204 Merchant Id 2017-06-14 20:08:44 +06:30
Yan
8cfa2bc5c5 payment bill added and origami bug fixed 2017-06-14 19:41:32 +06:30
Aung Myo
2da2edc5ec update sale and customer 2017-06-14 18:13:13 +06:30
Yan
41e9aec389 add cashier in sale and origami ui updated 2017-06-14 16:51:25 +06:30
Yan
c1e8f3ffb2 updated printer for each stations 2017-06-14 15:30:28 +06:30
Yan
b4021a87c8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into pre_master 2017-06-14 10:16:55 +06:30
Yan
b7f1a0a029 print format updating 2017-06-14 10:15:35 +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
Phyo
57f7f1037d Change Amount Bug Fix 2017-06-13 19:41:51 +06:30
Nweni
db2cce3dfa Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 19:06:59 +06:30
Nweni
0e86b12ecd order controller update 2017-06-13 19:06:50 +06:30
Moe Su
3db3b8c7e7 add auth_token 2017-06-13 19:01:14 +06:30
Aung Myo
7f7d579d2f add auth token:
exit
2017-06-13 18:28:22 +06:30
Aung Myo
7194f0e971 update sale search 2017-06-13 15:04:51 +06:30
Phyo
99d00f6d2a Redeem amount validation 2017-06-13 12:04:31 +06:30
Moe Su
59d53816bd Change style and redeem 2017-06-13 10:45: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
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
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
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