Commit Graph

65 Commits

Author SHA1 Message Date
Yan
9137436b70 bind origami show to action 2017-06-21 11:38:28 +06:30
Nweni
fa309fb89a move whole table 2017-06-21 05:36:58 +06:30
Nweni
a9e1d8c3d1 origami 2017-06-20 18:59:34 +06:30
Nweni
a71ee3657a origami changes 2017-06-20 07:36:38 +06:30
Yan
b65d127fd0 bill print format and tax fix 2017-06-18 20:07:28 +06:30
Yan
6d0cfd17ac merge with origin master 2017-06-18 12:50:07 +06:30
Yan
f33f11df64 rescue member call and update oqs and js route bug 2017-06-18 03:20:19 +06:30
Nweni
29b76adba7 Update 2017-06-17 11:35:17 +06:30
Nweni
49768900a9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 18:22:13 +06:30
Nweni
9ff5122b72 Update 2017-06-16 18:21:57 +06:30
Aung Myo
f0ea6f3c56 finish reprint 2017-06-15 19:07:33 +06:30
Yan
8cfa2bc5c5 payment bill added and origami bug fixed 2017-06-14 19:41:32 +06:30
Yan
41e9aec389 add cashier in sale and origami ui updated 2017-06-14 16:51:25 +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
7f7d579d2f add auth token:
exit
2017-06-13 18:28:22 +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
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
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
b7bd68a461 payment keypad 2017-06-11 15:51:22 +06:30
Nweni
7ab9874b80 remove migration files 2017-06-11 13:20:26 +06:30
Yan
fe60ac818f update assets 2017-06-09 11:33:21 +06:30
Yan
43debf4b7e merged with crm 2017-06-08 19:04:48 +06:30
Yan
71e09ef452 comment for cable and add print seed 2017-06-08 18:57:53 +06:30
Yan
907764b3e4 update discount 2017-06-08 18:02:40 +06:30
Aung Myo
ea4f50e779 update print 2017-06-08 16:52:50 +06:30
Yan
5203a9f4a5 merge crm 2017-06-08 15:29:37 +06:30
Aung Myo
8388192a81 delete view origami file 2017-06-08 14:46:35 +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
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
Aung Myo
9ad04323f0 fixed conflict request_bill_con and origami index 2017-06-07 16:48:28 +06:30
Nweni
c18b57eca8 payment 2017-06-07 10:29:00 +06:30
Yan
ed45c2dc1e merged for payment 2017-06-06 17:03:47 +06:30