Commit Graph

2453 Commits

Author SHA1 Message Date
edmondlang c79d9e916c Merge branch 'recalculate-wallet-balance' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-05-18 00:07:40 +08:00
edmondlang 35edc807a8 recalculate wallet balance 2023-05-18 00:07:20 +08:00
edmondlang f2619d3c4c Merge branches 'development' and 'recalculate-wallet-balance' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-05-17 23:49:50 +08:00
edmondlang 43a9bf6742 AuditAndUpdateWallletBalance 2023-05-17 23:49:32 +08:00
edmondlang d5b04b9b81 AuditAndUpdateWallletBalance 2023-05-17 23:44:49 +08:00
edmondlang 629a27c2bf Merge branch 'recalculate-wallet-balance' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-05-17 23:37:02 +08:00
edmondlang 96193a2880 recalculate wallet balance 2023-05-17 23:36:32 +08:00
omair saleh 591725daef Merge branch 'dillon/accounting-bank-mapping' into 'development'
Dillon/accounting bank mapping

See merge request CIEFWorldwideSdnBhd/exchange-2.0!136
2023-05-16 04:38:49 +00:00
Omair Saleh 86c0383864 add owner reference for bank statement transaction owners 2023-05-16 12:37:48 +08:00
omair saleh 1a1469ab3b Merge branch 'dillon/accounting-bank-mapping' into 'development'
add owner reference for bank statement transaction owners

See merge request CIEFWorldwideSdnBhd/exchange-2.0!135
2023-05-16 04:20:24 +00: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 63511f4582 add owner reference for bank statement transaction owners 2023-05-16 12:15:21 +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
Omair Saleh 9d93808f84 add owner reference for bank statement transaction owners 2023-05-16 11:33:21 +08:00
Omair Saleh e84f288d39 xpo jan & feb 2023-05-15 10:44:04 +08:00
edmondlang 2880aed0f6 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-05-10 13:38:56 +08:00
edmondlang bc7c0026bd fix wallet bug 2023-05-10 13:38:39 +08:00
edmondlang 455d1d83fa fix sending billplz email to customer on development environment 2023-05-10 13:38:11 +08:00
edmondlang 2033842d6c only admin and upload honey trap csv 2023-05-10 10:43:48 +08:00
edmondlang 5cc6a3c292 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-05-10 10:39:37 +08:00
edmondlang d058d10e49 change honey trap to honey trap platinum 2023-05-10 10:38:34 +08: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 d586e11249 upload-honey-trap 2023-05-10 01:46:35 +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
edmondlang e44c8f3839 test appprove group mapping transaction api 2023-05-02 18:32:53 +07:00
edmondlang 48ed5e305b test appprove group mapping transaction api 2023-05-02 18:26:21 +07:00
edmondlang 60d5406384 test appprove group mapping transaction api 2023-05-02 18:21:54 +07:00
edmondlang b09308d969 test appprove group mapping transaction api 2023-04-29 01:27:54 +08:00
edmondlang 391554fa76 test appprove group mapping transaction api 2023-04-29 01:20:48 +08:00
edmondlang 2369a24c03 test appprove group mapping transaction api 2023-04-29 01:18:35 +08:00
edmondlang 6e96018812 test appprove group mapping transaction api 2023-04-29 01:16:00 +08:00
edmondlang f4497346c8 test appprove group mapping transaction api 2023-04-29 01:04:08 +08:00
edmondlang a5990decb2 test appprove group mapping transaction api 2023-04-29 00:53:15 +08:00
edmondlang 1b3e67f858 test appprove group mapping transaction api 2023-04-29 00:47:47 +08:00
edmondlang 9edac99b97 test appprove group mapping transaction api 2023-04-29 00:43:46 +08:00
edmondlang aded55b8c7 appprove group mapping transaction api 2023-04-28 19:34:22 +08:00
edmondlang 04d36a4aa0 appprove group mapping transaction api 2023-04-28 19:04:54 +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 3d786f04be add robot.txt to avoid google crawling 2023-04-28 00:18:41 +08:00
Omair Saleh 1b91937e70 fill up po calculation 2023-04-27 18:31:20 +08:00
Omair Saleh 0e7f9f86f0 fill up po calculation 2023-04-27 18:18:36 +08:00
Omair Saleh 0886e09dc1 fill up po calculation 2023-04-27 18:17:39 +08:00
Omair Saleh 59bcb3f0f9 fill up po calculation 2023-04-27 16:42:41 +08:00
Omair Saleh aa24d96c92 fill up po calculation 2023-04-27 16:40:47 +08:00
edmondlang fd5dc7b1c2 debug wallet audit 2023-04-26 12:01:21 +08:00