Commit Graph

110 Commits

Author SHA1 Message Date
Aung Myo
09a96372c8 update void and complete sale 2017-06-16 10:20:20 +06:30
Aung Myo
f0ea6f3c56 finish reprint 2017-06-15 19:07:33 +06:30
Aung Myo
b5743eb7a7 update customer bolder 2017-06-15 18:18:35 +06:30
Aung Myo
f0d3f30d88 update order queue , sale void 2017-06-15 16:24:00 +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
Nweni
9d1aff2fa2 other payment updated 2017-06-14 10:49:00 +06:30
Aung Myo
3db6252304 update search and crm 2017-06-14 00:09:54 +06:30
Nweni
71f88f8a5d Update 2017-06-13 19:49:25 +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
Moe Su
19160a9630 Change redeem name 2017-06-13 17:41:50 +06:30
Moe Su
59d53816bd Change style and redeem 2017-06-13 10:45:56 +06:30
Yan
1d1a913732 bug fix for order completed 2017-06-12 20:11:37 +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
dc51beae43 fixed conflictfile 2017-06-12 15:01:19 +06:30
Phyo
c7ff5140d4 Payment route change 2017-06-12 14:22:45 +06:30
Yan
4212ad45b3 updated for food and beverage bugs 2017-06-12 14:11:13 +06:30
Yan
ca2dc181d6 add receipt no report and bug fixing 2017-06-12 12:04:12 +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
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
f6d14de461 fixed conflict 2017-06-11 16:58:18 +06:30
Nweni
05286ce7a6 payment 2017-06-11 16:57:31 +06:30
Moe Su
fe2a07bf5f Redeem process 2017-06-11 16:17:50 +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
Aung Myo
406172c6ff fixed conflict 2017-06-09 12:04:36 +06:30
Aung Myo
e2e8045d0f update crm layout 2017-06-09 11:55:50 +06:30
Aung Myo
35277ac000 queue and crm view updated 2017-06-09 09:29:25 +06:30
Yan
568c5fbf68 Merge branch 'loyalty' of bitbucket.org:code2lab/sxrestaurant 2017-06-08 18:03:59 +06:30
Yan
907764b3e4 update discount 2017-06-08 18:02:40 +06:30
Moe Su
0bcd612bc2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty 2017-06-08 17:57:43 +06:30
Moe Su
74b0550c30 payment_setting 2017-06-08 17:57:29 +06:30
Yan
5203a9f4a5 merge crm 2017-06-08 15:29:37 +06:30
Yan
fbc00bc3e4 merged loyalty 2017-06-08 15:28:09 +06:30
Moe Su
664fe2f6e1 Adding Redeem at payment 2017-06-08 15:17:26 +06:30
Aung Myo
8a5fcadb69 finished customer to sale assign in crm 2017-06-08 13:41:11 +06:30
Yan
612f037fe8 index ui for discount 2017-06-08 10:40:06 +06:30
Aung Myo
44382d284f fixed conflict 2017-06-07 22:29:43 +06:30
Aung Myo
f9c8dbc03e fixed conflict route and request bill 2017-06-07 22:21:42 +06:30
Aung Myo
234ef9bc15 change crm booking 2017-06-07 22:17:12 +06:30
Yan
df138d94ba merged master 2017-06-07 17:45:40 +06:30
Yan
114c4ee14d all changed for index in origami 2017-06-07 17:13:27 +06:30