Commit Graph

86 Commits

Author SHA1 Message Date
Yan
f33f11df64 rescue member call and update oqs and js route bug 2017-06-18 03:20:19 +06:30
Yan
0a496f2274 update order for oqs 2017-06-16 18:55:14 +06:30
Yan
87c3546974 merge with master 2017-06-16 09:59:35 +06:30
Nweni
998ec1bd01 update api 2017-06-16 09:27:39 +06:30
Yan
0778df4e80 order fix for booking 2017-06-15 14:44:27 +06:30
Yan
bd94e808d4 print format 2017-06-15 13:24:37 +06:30
Nweni
5e8bc9c013 Update 2017-06-15 10:10:02 +06:30
Nweni
8d557cf7eb remove put 2017-06-15 09:39:30 +06:30
Nweni
34b1c26b0b update 2017-06-15 01:33:52 +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
3db6252304 update search and crm 2017-06-14 00:09:54 +06:30
Nweni
0e86b12ecd order controller update 2017-06-13 19:06:50 +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
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
6945449523 get update 2017-06-12 18:51:02 +06:30
Yan
e1e7064e47 add menu in Transaction 2017-06-12 18:33:09 +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
Nweni
7a3957181c update 2017-06-12 18:15:19 +06:30
Nweni
d1ae734f50 update 2017-06-12 17:30:49 +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
Nweni
b12b52d754 update table status 2017-06-12 14:23:18 +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
Nweni
d2caba3f03 fixed conflict 2017-06-12 13:27:33 +06:30
Nweni
ee208a5dcd Update 2017-06-12 13:26:09 +06:30
Yan
ca2dc181d6 add receipt no report and bug fixing 2017-06-12 12:04:12 +06:30
Yan
c5e9d7afd5 merge with crm 2017-06-12 10:25:07 +06:30
Yan
f834911587 to do req_bill_format and status changed after pay 2017-06-12 00:45:26 +06:30
Aung Myo
d65882ac5b crm update 2017-06-11 18:00:34 +06:30
Yan
71e09ef452 comment for cable and add print seed 2017-06-08 18:57:53 +06:30
Yan
4d4c40cc17 a little change for setup 2017-06-08 09:48:24 +06:30
Yan
f746c18238 (important)migrateion files changed 2017-06-07 18:47:50 +06:30
Yan
be7d448c30 update gem file 2017-06-07 18:09:56 +06:30
Aung Myo
bd345dbc3f fixed conflict 2017-06-07 17:15:51 +06:30
Yan
114c4ee14d all changed for index in origami 2017-06-07 17:13:27 +06:30
Nweni
b847cde62c sale query updated 2017-06-06 14:03:21 +06:30
Yan
dcb8217824 updated order.rb for order_items_id 2017-06-06 10:32:38 +06:30
Yan
e66dd33c1a updated order.rb 2017-06-06 10:27:59 +06:30
Aung Myo
324f1e3b24 update query in order model for origami 2017-06-06 10:10:47 +06:30
Nweni
eaec6a39b4 fixed conflict 2017-06-06 09:47:33 +06:30
Nweni
0cc378f318 fixed conflict 2017-06-06 09:43:16 +06:30
Yan
b24e667e9e merged crm 2017-06-06 09:41:06 +06:30
Aung Myo
b54a19cfff update query data for origami 2017-06-06 09:18:01 +06:30