Commit Graph

268 Commits

Author SHA1 Message Date
Nweni
35fc649df3 pg order 2017-06-19 15:56:45 +06:30
Yan
5906dde741 uncomment for sale taxes 2017-06-18 13:18:53 +06:30
Yan
6d0cfd17ac merge with origin master 2017-06-18 12:50:07 +06:30
Yan
0e7042f00f merge with settings_backend 2017-06-18 12:30:06 +06:30
Yan
74c6f3cebc Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-18 12:10:30 +06:30
Yan
f33f11df64 rescue member call and update oqs and js route bug 2017-06-18 03:20:19 +06:30
Yan
80320b6d3e oqs updated 2017-06-18 00:45:39 +06:30
Aung Myo
b62d5349c6 assign queue and other bug 2017-06-18 00:03:09 +06:30
Phyo
b093a993ba Zone and OQS 2017-06-17 18:00:59 +06:30
Nweni
b2ed77947e Update 2017-06-17 13:32:16 +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
9f3acad10d update order for oqs 2017-06-16 19:26:21 +06:30
Yan
0a496f2274 update order for oqs 2017-06-16 18:55:14 +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
bec59a1d7b update queue no print 2017-06-16 13:23:05 +06:30
Aung Myo
0e21117f05 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 10:22:21 +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
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
5eafe7094a Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 18:35:00 +06:30
Aung Myo
b5743eb7a7 update customer bolder 2017-06-15 18:18:35 +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
Yan
ffafec0105 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 16:47:25 +06:30
Aung Myo
f0d3f30d88 update order queue , sale void 2017-06-15 16:24:00 +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
Aung Myo
7dffd668ea Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-15 10:21:26 +06:30
Aung Myo
8cb40783a4 update requestby in sail 2017-06-15 10:20:26 +06:30
Nweni
ed34088907 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 10:10:19 +06:30
Nweni
5e8bc9c013 Update 2017-06-15 10:10:02 +06:30
Phyo
2a492345a4 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 09:50:43 +06:30
Phyo
c6f976bab3 Payment via card Bug fix 2017-06-15 09:49:44 +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
Phyo
541907d204 Merchant Id 2017-06-14 20:08:44 +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
Yan
41e9aec389 add cashier in sale and origami ui updated 2017-06-14 16:51:25 +06:30
Yan
c1e8f3ffb2 updated printer for each stations 2017-06-14 15:30:28 +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
Aung Myo
7057e320cf Merge branch 'crm' 2017-06-13 20:13:01 +06:30
Aung Myo
b86ae8d32d customer search 2017-06-13 20:11:24 +06:30
Phyo
57f7f1037d Change Amount Bug Fix 2017-06-13 19:41:51 +06:30
Nweni
db2cce3dfa Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 19:06:59 +06:30