Commit Graph

2924 Commits

Author SHA1 Message Date
edmondlang e7a708ef33 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-15 01:22:02 +08:00
edmondlang 1b97f5082d add route wallet/{marking}/details-precise 2023-09-15 01:20:44 +08:00
JiaSheng 7596409d1e Merge branch 'get-transactions-from-production' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into fix-account-statement-issue
# Conflicts:
#	app/Classes/Modules/Accounting/Processors/CreateBankStatementTransactionOwnersProcessor.php
2023-09-14 23:40:54 +08:00
JiaSheng a8a22ca1c3 fix error when getting transaction from shipping portal due to mistake in filters string 2023-09-14 15:01:30 +08:00
JiaSheng c374e46834 add functionality to get transactions from production when creating statement transactions owner 2023-09-13 22:03:32 +08:00
edmondlang 51863b42ad Merge branch 'fix-account-statement-issue' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	routes/web.php
2023-09-12 23:29:23 +08:00
JiaSheng 8d382fd656 comment 2023-09-12 23:27:13 +08:00
edmondlang e728901557 Merge branch 'fix-duplicate-statement-transactions' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into fix-account-statement-issue 2023-09-12 23:21:36 +08:00
JiaSheng 88119b4f95 solve duplicate statement transaction created upon import bank statement 2023-09-12 19:55:14 +08:00
edmondlang b854fd5bdc fix invoice 2023-09-07 00:39:21 +08:00
edmondlang d0d901d7ab fix regenerate invoice 2023-09-07 00:26:09 +08:00
edmondlang 2e7b994dea test regenerate invoice 2023-09-07 00:19:39 +08:00
edmondlang 4e12059d51 Merge branch 'fix-regenerate-bulk-invoice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-07 00:16:54 +08:00
edmondlang 37e1e325c2 test fix invoice 2023-09-07 00:16:19 +08:00
edmondlang 211dde4a4f Merge branch 'fix-regenerate-bulk-invoice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-07 00:11:27 +08:00
edmondlang 84f5525e22 fix invoice 2023-09-07 00:10:56 +08:00
edmondlang d7cf426034 Merge branch 'fix-regenerate-bulk-invoice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-06 23:39:49 +08:00
edmondlang 5cf0a7a00e fix invoice 2023-09-06 23:39:26 +08:00
edmondlang 512f791939 add route fix invoice 2023-09-06 23:30:49 +08:00
edmondlang ac9df38caf Merge branch 'fix-regenerate-bulk-invoice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-06 23:04:15 +08:00
edmondlang fe26d7fdad fix invoice 2023-09-06 23:03:44 +08:00
edmondlang a1e7ce1e46 remove the regenerateInvoice cron on development server 2023-09-06 22:39:48 +08:00
edmondlang 5baa9dcf3d Merge branch 'fix-regenerate-bulk-invoice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-06 22:34:38 +08:00
edmondlang 6755a5e30f cron to regenerate invoice 2023-09-06 22:33:52 +08:00
edmondlang 4b5724f6e3 fix invoice 2023-09-06 22:30:55 +08:00
edmondlang 9e7fb22122 Merge branch 'fix-regenerate-bulk-invoice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-06 18:09:19 +08:00
edmondlang 3e54b636e0 fix invoice 2023-09-06 18:08:49 +08:00
edmondlang 2578ff4d35 Merge branch 'fix-regenerate-bulk-invoice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-06 17:56:33 +08:00
edmondlang c65780d4f1 fix invoice 2023-09-06 17:56:07 +08:00
edmondlang a66878e14f Merge branch 'fix-regenerate-bulk-invoice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-06 16:10:54 +08:00
edmondlang 6dac580add fix invoice 2023-09-06 16:09:59 +08:00
edmondlang 20eb0c0886 Merge branch 'fix-regenerate-bulk-invoice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-06 16:05:30 +08:00
edmondlang 53489726e0 fix regenerate invoice 2023-09-06 16:05:06 +08:00
edmondlang fc27936043 Merge branch 'fix-regenerate-bulk-invoice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-06 15:50:21 +08:00
edmondlang ec223133b6 add log 2023-09-06 15:49:42 +08:00
edmondlang 31d4ddd0d0 Merge branch 'fix-regenerate-bulk-invoice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-06 15:46:16 +08:00
edmondlang f36fa358fe add log for regenerate invoice invoice 2023-09-06 15:45:52 +08:00
edmondlang e00d641549 Merge branch 'fix-regenerate-bulk-invoice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-06 15:35:02 +08:00
edmondlang d3f9f21170 regenerate bulk invoice 2023-09-06 15:34:39 +08:00
edmondlang 2e8823340e revert fix invoice bugs 2023-09-06 13:49:11 +08:00
edmondlang 1ed8b20989 Merge branch 'fix-account-statement-issue' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-05 16:06:56 +08:00
edmondlang 6388c8499f Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into fix-account-statement-issue 2023-09-05 16:06:22 +08:00
edmondlang d8ff540f0d fix refund booking 2023-09-05 11:52:45 +08:00
JiaSheng 425dbef072 fix a lot of transaction goes into unknown 2023-09-02 19:36:31 +08:00
Omair Saleh f2c008239b fix invoice bugs 2023-09-01 05:15:41 +08:00
Omair Saleh 39d8ed2e9e fix invoice bugs 2023-09-01 04:32:37 +08:00
Omair Saleh 85ca64ac39 fix invoice bugs 2023-09-01 03:06:54 +08:00
Omair Saleh 9a57e4d82f Merge remote-tracking branch 'origin/master' 2023-08-30 11:49:49 +08:00
Omair Saleh 5dc6f395bd show swift code in white form for usd 2023-08-30 11:49:29 +08:00
Dillon Ngo 7283efc84e Merge branch 'dillon/41-voucherify-phase-2b' into 'master'
Voucherify Phase 2 minor update

See merge request CIEFWorldwideSdnBhd/exchange-2.0!150
2023-08-25 22:55:12 +00:00