Commit Graph

551 Commits

Author SHA1 Message Date
edmondlang 7fcce7a2aa Merge branch 'delete-group-transaction' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-18 00:16:41 +08:00
edmondlang 6836e42ce4 tidy up update group controller logic 2022-04-18 00:16:10 +08:00
edmondlang ff1a8bda57 Merge branch 'delete-group-transaction' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-18 00:04:16 +08:00
edmondlang f28f6f003a Merge branch 'notification-ui' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-18 00:04:04 +08:00
edmondlang 34c03edb4a Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-18 00:03:48 +08:00
edmondlang 5795c4b499 create and intergrate api for update group transaction 2022-04-18 00:02:19 +08:00
edmondlang 2b3fe22cb6 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into delete-group-transaction 2022-04-17 10:18:54 +08:00
edmondlang 911b928619 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into delete-group-transaction 2022-04-17 10:03:09 +08:00
edmondlang 3419d41fd6 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into notification-ui 2022-04-16 23:53:41 +08:00
edmondlang 29b1f87966 move notification API and UI from shipping portal 2022-04-16 23:53:12 +08:00
omair saleh c49718e278 fix fpx payment 2022-04-16 12:48:50 +08:00
omair saleh a79cb718d9 debug wallet top up 2022-04-15 14:11:15 +08:00
omair saleh 43b9d181b2 debug wallet top up 2022-04-15 14:09:26 +08:00
omair saleh e0ed003c26 debug wallet top up 2022-04-15 14:08:09 +08:00
omair saleh 9c8a0e5a92 update debtor export format 2022-04-14 16:08:44 +08:00
omair saleh f7de7d290a update transfer fee formula 2022-04-12 11:19:57 +08:00
omair saleh 13b136b4c4 update transfer fee formula 2022-04-12 11:15:11 +08:00
omair saleh bad6a99efa update transfer fee formula 2022-04-12 11:13:52 +08:00
omair saleh 41c46c1af1 update transfer fee formula 2022-04-12 11:12:33 +08:00
omair saleh 55cd573aee update transfer fee formula 2022-04-12 11:08:33 +08:00
glovetleong 0bf3b1b353 refund bug 2022-04-11 23:50:15 +08:00
omair saleh ed2f386101 show top up transactions for null debtors 2022-04-11 14:18:35 +08:00
omair saleh 3b15aef71a update deptno for transactions export 2022-04-11 11:39:24 +08:00
edmondlang 5647957e9f delete group transaction 2022-04-10 21:31:20 +08:00
edmondlang 8b3b97167f Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Classes/ValueObjects/Constants/TransactionType.php
2022-04-08 20:16:51 +08:00
omair saleh df6a96addd update debtors export 2022-04-07 22:59:14 +08:00
glovetleong 148d10fafc Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into debtor 2022-04-06 22:54:01 +08:00
glovetleong 14947865f8 wallet pay cash back 2022-04-06 22:52:39 +08:00
omair saleh 2b3d3edc1b temp disable cashback until ready for release 2022-04-06 13:42:37 +08:00
omair saleh ac0b6b9e87 fix debtors import 2022-04-06 11:55:31 +08:00
omair saleh 899da269ef fix debtors import 2022-04-06 10:55:29 +08:00
omair saleh f060eeef22 fix debtors import 2022-04-06 10:54:47 +08:00
omair saleh 56dc37a8e5 fix debtors import 2022-04-06 10:53:43 +08:00
omair saleh 5b832177af fix debtors import 2022-04-06 10:40:04 +08:00
glovetleong 01ddfb6282 cash back ref 2022-04-05 22:57:53 +08:00
omair saleh 51bde6eed7 update xpo for nov to feb 2022-04-05 16:17:18 +08:00
omair saleh be7d5bb95f update xpo for nov to feb 2022-04-05 16:15:59 +08:00
omair saleh 800c723416 update xpo for nov to feb 2022-04-05 16:07:13 +08:00
omair saleh 9efbda1d2a update xpo for nov to feb 2022-04-05 16:05:58 +08:00
omair saleh f25a1033cb debug file type 2022-04-04 18:17:11 +08:00
omair saleh bfd3d87977 debug file type 2022-04-04 18:15:17 +08:00
glovetleong 4deb5845e3 bank log 2022-04-03 23:32:50 +08:00
glovetleong 0b5733ffb9 cash back front 2022-04-02 09:32:20 +08:00
omair saleh 216f108b9e fix transactions export 2022-04-01 16:15:04 +08:00
omair saleh efc05ffc3f fix transactions export 2022-04-01 16:14:11 +08:00
omair saleh c1793dfe09 fix transactions export 2022-04-01 16:10:52 +08:00
omair saleh aa76be8ef2 fix transactions export 2022-04-01 16:08:11 +08:00
omair saleh 55b5d01ce0 fix transactions export 2022-04-01 16:07:31 +08:00
glovetleong bfe06cc85c test 2022-04-01 12:35:10 +08:00
glovetleong 3fcfcf9de9 cash back 2022-04-01 10:12:23 +08:00