Commit Graph

85 Commits

Author SHA1 Message Date
Aung Myo
7f7d579d2f add auth token:
exit
2017-06-13 18:28:22 +06:30
Aung Myo
e5c29f6074 merge with report 2017-06-13 15:07:29 +06:30
Yan
d54fd19d1c report ui format 2017-06-13 14:59:00 +06:30
Aung Myo
b513aa22ab datepicker 2017-06-13 12:27:45 +06:30
Aung Myo
6717becf92 Customer Update 2017-06-13 11:35:30 +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
Aung Myo
7dcc777668 fixed conflict 2017-06-12 18:34:41 +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
Aung Myo
b14f4d67a5 origamijs 2017-06-12 18:23:12 +06:30
Yan
423776cadd print format update 2017-06-12 18:19:30 +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
622aa4f121 update origami js and index 2017-06-12 15:39:38 +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
4212ad45b3 updated for food and beverage bugs 2017-06-12 14:11:13 +06:30
Yan
c5e9d7afd5 merge with crm 2017-06-12 10:25:07 +06:30
Yan
121fb92b9b update orgami js 2017-06-12 10:12:55 +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
31cc75462b fixed conflict 2017-06-11 15:52:13 +06:30
Nweni
b7bd68a461 payment keypad 2017-06-11 15:51:22 +06:30
Moe Su
33cc576f1e edit membership setting , otherpayment page 2017-06-11 15:48:53 +06:30
Yan
4c29aad299 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-09 13:47:19 +06:30
Yan
d2373f2f24 origami updating 2017-06-09 13:35:15 +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
Yan
fe60ac818f update assets 2017-06-09 11:33:21 +06:30
Yan
015222b575 changed orgirami to origami 2017-06-09 10:22:55 +06:30
Yan
ba4ec71ec9 updated origami js 2017-06-09 10:21:30 +06:30
Aung Myo
35277ac000 queue and crm view updated 2017-06-09 09:29:25 +06:30
Yan
43debf4b7e merged with crm 2017-06-08 19:04:48 +06:30
Yan
1cbbe9d672 Merge branch 'discount' 2017-06-08 18:58:28 +06:30
Yan
71e09ef452 comment for cable and add print seed 2017-06-08 18:57:53 +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
Aung Myo
ea4f50e779 update print 2017-06-08 16:52:50 +06:30
Yan
e0e512b76b editing discount 2017-06-08 15:40:59 +06:30
Yan
5203a9f4a5 merge crm 2017-06-08 15:29:37 +06:30