Commit Graph

190 Commits

Author SHA1 Message Date
Yan
77943f3bba Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 09:52:22 +06:30
Yan
3f15e7bc6f Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 09:51:22 +06:30
Yan
2525bfbdd9 discount updated 2017-06-21 20:30:12 +06:30
Aung Myo
d95b7c7abc add confirm js and css 2017-06-21 19:20:10 +06:30
Aung Myo
d9d07a1cdc update reprint 2017-06-21 18:19:44 +06:30
Phyo
51252b99e3 Auto Refresh on/off 2017-06-21 17:01:44 +06:30
Yan
e3b3ff76b2 add account_id to od_item and sale_item table 2017-06-21 14:49:01 +06:30
Phyo
209a453ca9 other payments delete button doesn't work 2017-06-21 11:39:53 +06:30
Yan
9137436b70 bind origami show to action 2017-06-21 11:38:28 +06:30
Yan
e3c83cdd44 discount ui changed 2017-06-21 10:50:16 +06:30
Aung Myo
6c4c817453 fixed fonflict 2017-06-21 10:22:43 +06:30
Nweni
b889603ce6 update 2017-06-21 09:33:39 +06:30
Nweni
6272e07959 add back action 2017-06-21 06:19:06 +06:30
Nweni
fa309fb89a move whole table 2017-06-21 05:36:58 +06:30
Yan
6207f1ce24 editing discount 2017-06-20 19:28:21 +06:30
Nweni
f69bee9b03 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-20 19:00:02 +06:30
Nweni
a9e1d8c3d1 origami 2017-06-20 18:59:34 +06:30
Aung Myo
0e619f3f2a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-20 17:59:14 +06:30
Aung Myo
33cb8b64a3 finished customer form and update 2017-06-20 17:57:50 +06:30
Yan
dd2a2e54a4 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-20 14:21:58 +06:30
Phyo
80362f87fe Rebate Option 2017-06-20 13:22:27 +06:30
Aung Myo
faae996d5d Rebate balance in receipt 2017-06-20 11:31:02 +06:30
Nweni
a71ee3657a origami changes 2017-06-20 07:36:38 +06:30
Yan
7fe36e8ef4 merge with settings 2017-06-19 19:14:58 +06:30
Phyo
184dcb53a1 Conflict fix din settings_backend 2017-06-19 15:24:15 +06:30
Phyo
33128d26a2 add Back Button in Redeem 2017-06-19 12:17:08 +06:30
Aung Myo
e693927016 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-19 11:55:01 +06:30
Aung Myo
675d83c80f sale item report and rebate balance 2017-06-19 11:54:34 +06:30
Yan
566cc2f3c1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-19 11:28:19 +06:30
Yan
b747845cbf merge with settings_backend 2017-06-19 11:15:28 +06:30
Nweni
f8dd7d9400 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-19 09:47:04 +06:30
Nweni
e25ef17308 payment 2017-06-19 09:46:51 +06:30
Yan
b65d127fd0 bill print format and tax fix 2017-06-18 20:07:28 +06:30
Phyo
3a1fba2c6f Other Payments Bug fix 2017-06-18 13:18:23 +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