Commit Graph

1563 Commits

Author SHA1 Message Date
Fairuz 102a7fe7ee Merge branch 'development' into laravel-dusk 2022-04-23 16:18:10 +08:00
Fairuz d81c8b17bd Laravel dusk implementation for testing 2022-04-23 16:14:55 +08:00
ahmedsophyudden 63ad9abc3c Update supplier's status (front-end & back-end) 2022-04-23 06:52:23 +08:00
edmondlang 29c2344f5a Merge branch 'notification-ui' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-20 23:44:23 +08:00
edmondlang f18d579495 solve bug on ApproveIdentificationDocumentLogic 2022-04-20 23:43:55 +08:00
edmondlang ad723aff01 Merge branch 'updateExportsTransactions' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-19 22:01:58 +08:00
edmondlang cd80b75db6 add marking in ExportsTransactions 2022-04-19 22:00:13 +08:00
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 b9760d8739 update notification ui, display no result found if no notification 2022-04-17 21:11:11 +08:00
edmondlang 3cff7a671a update UI for transaction group 2022-04-17 20:34:02 +08:00
edmondlang d0c054bb0f create update UI for transaction group 2022-04-17 20:24:03 +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 2865f2ef2c remove debug message in BookingConfirmationComponent 2022-04-17 10:18:23 +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 9631f70350 update icon color when notification center is open 2022-04-17 09:51:45 +08:00
edmondlang 779f7643fb update responsive notification ui 2022-04-17 00:49:33 +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 a3f4de7c1a debug wallet top up 2022-04-15 14:06:13 +08:00
omair saleh b6dbd6c517 update jack suppliers 2022-04-15 10:47:58 +08:00
omair saleh 9c8a0e5a92 update debtor export format 2022-04-14 16:08:44 +08:00
omair saleh f89db64bea fix rack do's 2022-04-14 11:59:54 +08:00
omair saleh e3da93807b fix rack do's 2022-04-14 11:55:12 +08:00
omair saleh 4e5fc70eea fix rack do's 2022-04-14 11:53:50 +08:00
omair saleh 1c97dcefce fix rack do's 2022-04-14 11:50:42 +08:00
omair saleh 89865302e3 update jack suppliers 2022-04-13 15:50:49 +08:00
omair saleh 8aa853c7c4 add border to payment proof 2022-04-13 12:38:37 +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
Leong Chee Siong 594739fb98 Merge branch 'debtor' into 'development'
refund bug

See merge request CIEFWorldwideSdnBhd/exchange-2.0!103
2022-04-11 15:53:05 +00: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
Leong Chee Siong 2e8e545ed9 Merge branch 'debtor' into 'development'
Debtor

See merge request CIEFWorldwideSdnBhd/exchange-2.0!102
2022-04-09 16:28:06 +00:00
glovetleong eee77325f7 back 2022-04-10 00:24:22 +08:00
glovetleong 17f6333030 refund bug 2022-04-10 00:23:23 +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