Commit Graph

602 Commits

Author SHA1 Message Date
Nweni
b2ed77947e Update 2017-06-17 13:32:16 +06:30
Nweni
064f132906 Update 2017-06-17 12:13:38 +06:30
Nweni
1b7f90ccfe Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-17 11:35:26 +06:30
Nweni
29b76adba7 Update 2017-06-17 11:35:17 +06:30
Yan
2cf9c6947c print for oqs 2017-06-16 21:06:33 +06:30
Yan
cd6ec67b94 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 19:28:37 +06:30
Yan
885662fbe6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 19:28:07 +06:30
Yan
9f3acad10d update order for oqs 2017-06-16 19:26:21 +06:30
Aung Myo
c7efcb85d3 update sale 2017-06-16 19:19:33 +06:30
Aung Myo
b029cabeba update show detail and order 2017-06-16 19:04:25 +06:30
Yan
0a496f2274 update order for oqs 2017-06-16 18:55:14 +06:30
Yan
741a7d0d64 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-16 18:23:12 +06:30
Yan
841f74b406 update footer in req bill 2017-06-16 18:22:18 +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
cb43afc405 update bug sale 2017-06-16 18:04:39 +06:30
Yan
38ae8f8f86 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-16 13:45:23 +06:30
Yan
c40a2c78e7 oqs autoprint developing 2017-06-16 13:44:39 +06:30
Aung Myo
cd804a3d18 update queue no print 2017-06-16 13:28:28 +06:30
Aung Myo
bec59a1d7b update queue no print 2017-06-16 13:23:05 +06:30
Yan
58bc13e8b6 add auto_print field to migration 2017-06-16 11:14:47 +06:30
Aung Myo
4cf9ce79ec update receipt print member info 2017-06-16 10:51:50 +06:30
Aung Myo
0e21117f05 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 10:22:21 +06:30
Aung Myo
f06235c2cf Merge branch 'crm' 2017-06-16 10:21:56 +06:30
Aung Myo
09a96372c8 update void and complete sale 2017-06-16 10:20:20 +06:30
Yan
87c3546974 merge with master 2017-06-16 09:59:35 +06:30
Yan
15682a3d49 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 09:57:34 +06:30
Yan
73cf45a9c7 dump.rdb 2017-06-16 09:54:47 +06:30
Nweni
d92a0b0378 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 09:27:50 +06:30
Nweni
998ec1bd01 update api 2017-06-16 09:27:39 +06:30
Yan
0e820f0ee1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 19:14:34 +06:30
Yan
79496458e7 dump.rdb 2017-06-15 19:13:48 +06:30
Nweni
14e3ee93b5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 19:13:15 +06:30
Nweni
b9e1a0694c update api 2017-06-15 19:13:01 +06:30
Aung Myo
f0ea6f3c56 finish reprint 2017-06-15 19:07:33 +06:30
Phyo
c54c610b7f Rake bug fix 2017-06-15 18:36:36 +06:30
Yan
5eafe7094a Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 18:35:00 +06:30
Yan
5cb2ec4a0d always modified dump.rdb 2017-06-15 18:34:34 +06:30
Phyo
032bff5bb6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 18:27:16 +06:30
Phyo
8fb2dbf0d9 rake fix 2017-06-15 18:27:09 +06:30
Aung Myo
b5743eb7a7 update customer bolder 2017-06-15 18:18:35 +06:30
Yan
a290e795ae dump.rdb in ignore 2017-06-15 17:59:02 +06:30
Yan
03feae5b0f fix get_order_items_details method in order_item and add taxes in receipt 2017-06-15 17:57:58 +06:30
Aung Myo
744e937f3d update sale detail 2017-06-15 17:19:28 +06:30
Aung Myo
4098c99509 update membership in sale detail 2017-06-15 17:13:11 +06:30
Yan
e085adab74 add dump.rdb in ignore 2017-06-15 16:51:12 +06:30
Yan
ffafec0105 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 16:47:25 +06:30
Yan
77049176f6 oqs and zone for seed 2017-06-15 16:47:04 +06:30
Aung Myo
f0d3f30d88 update order queue , sale void 2017-06-15 16:24:00 +06:30
Yan
0f41035b68 add dump.rdb to gitignore 2017-06-15 15:04:49 +06:30