Commit Graph

659 Commits

Author SHA1 Message Date
Aung Myo
6c4c817453 fixed fonflict 2017-06-21 10:22:43 +06:30
Aung Myo
4ab5c311eb update crm 2017-06-21 10:05:07 +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
895e028e7c added cashier station time 2017-06-21 05:55:45 +06:30
Nweni
fa309fb89a move whole table 2017-06-21 05:36:58 +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
Yan
242eb80081 defaults json in oqs for create 2017-06-20 18:25:45 +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
6528845d82 oqs updated 2017-06-20 15:58:50 +06:30
Yan
dd2a2e54a4 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-20 14:21:58 +06:30
Yan
e43818fdf5 oqs updated 2017-06-20 13:33:41 +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
bdb42daad7 dining facility model 2017-06-20 07:42:05 +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
Yan
c95b0130dc edit migrate oqs 2017-06-19 18:56:36 +06:30
Phyo
90be2b8d63 OQS edit bug fix 2017-06-19 18:54:19 +06:30
Yan
9089eab196 temp remove options in oqs 2017-06-19 17:36:39 +06:30
Phyo
c02e305c30 Zone Created_at Bug Fix 2017-06-19 16:24:44 +06:30
Phyo
d78327f906 Membership Setting UI 2017-06-19 16:22:39 +06:30
Nweni
2cc8d2c00c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-19 15:56:57 +06:30
Nweni
35fc649df3 pg order 2017-06-19 15:56:45 +06:30
Yan
d8930cb2b5 still 2017-06-19 15:55:21 +06:30
Phyo
184dcb53a1 Conflict fix din settings_backend 2017-06-19 15:24:15 +06:30
Phyo
2dbbb17634 Add extra fields to accounts 2017-06-19 12:21:54 +06:30
Phyo
33128d26a2 add Back Button in Redeem 2017-06-19 12:17:08 +06:30
Yan
b826b479cd update for oqs print 2017-06-19 12:07:43 +06:30
Yan
dd3c429301 control paypar url and oqs fix 2017-06-19 11:56:26 +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
Yan
cf5854c2bb Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-19 11:06:39 +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
Aung Myo
faa6beb243 update sale report 2017-06-18 20:23:39 +06:30
Aung Myo
6ffa73fa6f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-18 20:18:12 +06:30
Yan
b65d127fd0 bill print format and tax fix 2017-06-18 20:07:28 +06:30
Aung Myo
7881ae4dfa daily sale report 2017-06-18 16:38:46 +06:30
Phyo
a204afda6a Discount added in Rebate 2017-06-18 13:19:07 +06:30
Yan
5906dde741 uncomment for sale taxes 2017-06-18 13:18:53 +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
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
Phyo
e6cef8ef93 Redeem amount not cut bug Fix 2017-06-18 11:57:14 +06:30