Commit Graph

483 Commits

Author SHA1 Message Date
Yan
420e1b9cbc all info details in oqs 2017-06-17 14:15:08 +06:30
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
cd6ec67b94 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 19:28:37 +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
741a7d0d64 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-16 18:23:12 +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
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
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
0e820f0ee1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 19:14:34 +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
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
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
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
Phyo
8cab49e964 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 14:44:41 +06:30
Phyo
c30a3a1ea9 Nett Bug Fix 2017-06-15 14:44:25 +06:30
Aung Myo
a48ff7745d update customer 2017-06-15 14:21:20 +06:30
Aung Myo
addf3603ff update customer 2017-06-15 14:19:31 +06:30
Aung Myo
441bd847ec update customer 2017-06-15 14:13:40 +06:30
Aung Myo
a77065ac3d Merge branch 'crm' 2017-06-15 14:02:44 +06:30
Aung Myo
f83d11e379 update customer 2017-06-15 14:02:09 +06:30
Aung Myo
5878999ead Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 13:19:13 +06:30
Aung Myo
ed3f97a2af upadte customer and sale void 2017-06-15 13:17:58 +06:30
Phyo
215239ec0f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 12:30:33 +06:30
Phyo
5675f0e48b Payment Bug fix 2017-06-15 12:29:36 +06:30
Yan
061c06b3c3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 11:25:49 +06:30
Phyo
136ca65233 Back Button in Payment 2017-06-15 11:10:11 +06:30
Yan
2efd6fc410 merge with origin master 2017-06-15 10:53:42 +06:30
Yan
e133595d49 authentication fixed 2017-06-15 10:48:32 +06:30
Aung Myo
8cb40783a4 update requestby in sail 2017-06-15 10:20:26 +06:30
Aung Myo
29d5b134da fixed conflict 2017-06-15 09:46:01 +06:30
Aung Myo
b88c40be41 sale update 2017-06-15 09:41:00 +06:30
Phyo
764855bea0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 20:08:02 +06:30
Yan
17c5a6cdf8 merge with master 2017-06-14 19:43:05 +06:30
Yan
8cfa2bc5c5 payment bill added and origami bug fixed 2017-06-14 19:41:32 +06:30
Nweni
39e03fab25 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 18:56:23 +06:30