Commit Graph

157 Commits

Author SHA1 Message Date
Aung Myo
675d83c80f sale item report and rebate balance 2017-06-19 11:54:34 +06:30
Yan
6d0cfd17ac merge with origin master 2017-06-18 12:50:07 +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
Aung Myo
b62d5349c6 assign queue and other bug 2017-06-18 00:03:09 +06:30
Nweni
e55ab32fad Update 2017-06-17 16:00:56 +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
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
f0ea6f3c56 finish reprint 2017-06-15 19:07:33 +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
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
5675f0e48b Payment Bug fix 2017-06-15 12:29:36 +06:30
Phyo
136ca65233 Back Button in Payment 2017-06-15 11:10:11 +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
Phyo
d970cfc8bd Other Payments UI change 2017-06-14 17:58:38 +06:30
Phyo
3b99016f80 Limit paid amount for JCB, Visa and Master Card 2017-06-14 17:13:43 +06:30
Yan
41e9aec389 add cashier in sale and origami ui updated 2017-06-14 16:51:25 +06:30
Yan
ff65f4f480 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-14 14:13:45 +06:30
Phyo
5cff9c891b Other Payment shown by type 2017-06-14 12:02:52 +06:30
Yan
1565b054df Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-14 11:25:14 +06:30
Nweni
d7fca79881 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 10:49:19 +06:30
Nweni
9d1aff2fa2 other payment updated 2017-06-14 10:49:00 +06:30
Aung Myo
14e0d91a4e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 10:45:36 +06:30
Phyo
4126012e6d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 10:44:00 +06:30
Aung Myo
c155c86970 update checkbox in customer view 2017-06-14 10:43:27 +06:30
Phyo
f0fe589ec6 Payment conflict in Del key 2017-06-14 10:43:19 +06:30
Nweni
3d2b9f745e payment 2017-06-14 10:41:26 +06:30
Nweni
998b23aae5 update key 2017-06-14 10:27:15 +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
Nweni
a16af5e404 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 10:07:48 +06:30
Nweni
7d5d23e5a6 Update 2017-06-14 10:07:31 +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
Nweni
71f88f8a5d Update 2017-06-13 19:49:25 +06:30
Aung Myo
8a6c0bf059 update rebate amount in payment 2017-06-13 18:46:43 +06:30
Aung Myo
a600c233d5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-13 18:28:40 +06:30
Aung Myo
7f7d579d2f add auth token:
exit
2017-06-13 18:28:22 +06:30