Commit Graph

803 Commits

Author SHA1 Message Date
edmondlang efbd9db691 remove the word passport 2023-06-15 15:36:30 +08:00
omair saleh 0b7f4e6130 Merge branch 'dillon/accounting-bank-mapping' into 'development'
show status of transaction

See merge request CIEFWorldwideSdnBhd/exchange-2.0!140
2023-06-13 17:35:29 +00:00
Omair Saleh ff76203bcf show status of transaction 2023-06-14 01:33:48 +08:00
omair saleh a262769365 Merge branch 'dillon/accounting-bank-mapping' into 'development'
show status of transaction

See merge request CIEFWorldwideSdnBhd/exchange-2.0!139
2023-06-13 17:12:41 +00:00
Omair Saleh aa99d8aae4 show status of transaction 2023-06-14 01:11:26 +08:00
omair saleh e3fb4d2dbe Merge branch 'dillon/accounting-bank-mapping' into 'development'
Dillon/accounting bank mapping

See merge request CIEFWorldwideSdnBhd/exchange-2.0!138
2023-06-13 16:58:15 +00:00
Omair Saleh 885444cb97 Merge remote-tracking branch 'origin/dillon/accounting-bank-mapping' into dillon/accounting-bank-mapping 2023-06-14 00:54:33 +08:00
Omair Saleh 4167f28be2 show status of transaction 2023-06-14 00:54:15 +08:00
omair saleh bf3c2d164c Merge branch 'dillon/accounting-bank-mapping' into 'development'
Dillon/accounting bank mapping

See merge request CIEFWorldwideSdnBhd/exchange-2.0!137
2023-06-13 15:22:16 +00:00
edmondlang 77f533111f accounting mapping api files and calling api, api need to be updated 2023-06-03 23:13:26 +08:00
edmondlang a98ac9b3ce Merge branch 'company-name-warning-text' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-06-03 14:43:00 +08:00
edmondlang 4218a4e398 company name warning text 2023-06-03 14:42:37 +08:00
Dillon ca38ba9688 Merge branch 'dillon/voucherify-35' into development 2023-06-01 18:58:47 +08:00
Dillon c323d416da Fix double loading icons showing when validating voucher 2023-06-01 18:58:29 +08:00
edmondlang 6aea566760 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-05-31 17:57:14 +08:00
edmondlang 619ebc7269 update SegmentCompanyComponent 2023-05-31 17:56:25 +08:00
edmondlang 672bcde0ee update SegmentCompanyComponent 2023-05-31 17:54:01 +08:00
Dillon 455ce0fe08 Vourcherify manual merged conflict resolved 2023-05-30 22:33:26 +08:00
Dillon 20d6ca47dc Vourcherify 2023-05-30 22:02:09 +08:00
Dillon 44deab4542 Merge branch 'master' into promo-code 2023-05-25 14:16:12 +08:00
edmondlang dc9f09b18a accounting bank mapping part - mapping unknown transactions 2023-05-21 22:59:48 +08:00
Omair Saleh 1ede3edc08 fix bugs 2023-05-19 17:21:36 +08:00
Omair Saleh 93fd645bf6 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/accounting-bank-mapping
 Conflicts:
	routes/web.php
2023-05-16 12:17:43 +08:00
omair saleh 0129a9e11a Merge branch 'dillon/accounting-bank-mapping' into 'development'
Dillon/accounting bank mapping

See merge request CIEFWorldwideSdnBhd/exchange-2.0!134
2023-05-16 03:34:26 +00:00
sharifcse57 3b55675933 working with promo code 2023-05-10 08:58:31 +06:00
sharifcse57 84e7db62a4 working with promo code 2023-05-10 08:56:09 +06:00
edmondlang 19bab00b61 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	routes/web.php
2023-05-10 01:49:23 +08:00
edmondlang d315c47bca upload-honey-trap 2023-05-10 01:41:30 +08:00
edmondlang 526c5694fa bulk import honey trap 2023-05-09 16:01:17 +08:00
sharifcse57 bac3ec20d1 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into promo-code 2023-05-05 15:22:10 +06:00
edmondlang aded55b8c7 appprove group mapping transaction api 2023-04-28 19:34:22 +08:00
edmondlang b316032c1e appprove duplicate group mapping transaction api 2023-04-28 19:00:30 +08:00
edmondlang 69d3d8426d Merge branch 'disable-enter-myr' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-04-28 12:31:45 +08:00
edmondlang ea3b96dff4 segment to enable enter MYR Rate 2023-04-28 12:31:24 +08:00
edmondlang ddf85d5a30 segment to enable enter MYR Rate 2023-04-28 12:30:45 +08:00
DESKTOP-5I7S92L\nicho cc99933f52 disbale enter myr 2023-04-28 11:19:30 +08:00
edmondlang 057cafd1e4 Merge branch 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-04-20 17:58:08 +08:00
edmondlang 4681a39cd1 groupApprove statement transaction mapping api 2023-04-20 17:40:35 +08:00
edmondlang 81f26e7041 reject statement transaction mapping api 2023-04-20 17:11:50 +08:00
edmondlang d1fb18d3f4 reject statement transaction mapping api 2023-04-20 16:18:41 +08:00
edmondlang ced6d2a1b1 reject statement transaction mapping api 2023-04-20 16:17:07 +08:00
edmondlang 4407f6664c Merge branch 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-04-20 16:15:07 +08:00
edmondlang 5b73e426fe reject statement transaction mapping 2023-04-20 16:14:27 +08:00
edmondlang fed6281171 Merge branch 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-04-20 00:02:04 +08:00
edmondlang f10c7f2c6d update filter accounting mapping 2023-04-20 00:01:38 +08:00
edmondlang d9c8db4e40 Merge branch 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-04-19 23:34:02 +08:00
edmondlang b6b736a581 revert 2023-04-19 23:33:43 +08:00
edmondlang 50b538e3b9 update modal to approve match and reject match 2023-04-19 23:31:15 +08:00
edmondlang 89c69771fa update modal to approve match and reject match 2023-04-19 23:28:55 +08:00
edmondlang 22b0ebbe5d update modal to approve match and reject match 2023-04-19 23:14:56 +08:00