Commit Graph

115 Commits

Author SHA1 Message Date
JiaSheng 7db7ff68a6 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-23 16:30:23 +08:00
JiaSheng 72797d8885 supplier bill group dashboard 2023-12-22 18:16:04 +08:00
edmondlang b759be4264 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-20 17:57:31 +08:00
edmondlang 89eaa78ee9 update logging 2023-12-20 17:57:03 +08:00
JiaSheng bf278e438e update group command 2023-12-20 17:41:10 +08:00
edmondlang 18ba789d44 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php
#	app/Console/Kernel.php
#	routes/web.php
2023-10-16 12:14:18 +08:00
edmondlang 5bd7a6104f delete all bulk download files 2023-10-12 19:12:52 +08:00
edmondlang 47ec38bb96 delete all bulk download files 2023-10-12 19:09:56 +08:00
edmondlang 549cd018fa Merge branch 'invoice-adjustment' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Console/Kernel.php
2023-10-12 10:33:50 +08:00
edmondlang d58f24283e Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into bulk-download-invoices
# Conflicts:
#	app/Console/Kernel.php
2023-10-11 00:51:49 +08:00
edmondlang 79150d4d84 remove cron job regenerate invoice - not using any more 2023-10-11 00:51:13 +08:00
edmondlang 2227139dd0 Merge branch 'bulk-download-invoices' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
#	app/Console/Kernel.php
2023-10-11 00:29:05 +08:00
edmondlang 839dc28be2 update bulk download invoice 2023-10-11 00:26:26 +08:00
edmondlang e80ae0f391 remove regenerate invoice at develeopment 2023-09-16 14:48:03 +08:00
edmondlang 1827f4b294 code clean up 2023-09-16 14:37:15 +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 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 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 d8ff540f0d fix refund booking 2023-09-05 11:52:45 +08:00
Dillon a264980320 Merge branch 'dillon/41-voucherify-phase-2b' into development 2023-08-26 06:33:35 +08:00
edmondlang f35bc37f72 fix refunded bookings 2023-08-19 17:07:34 +08:00
edmondlang 85682905e4 fix refunded bookings 2023-08-19 17:04:43 +08:00
edmondlang ed7b87894e Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-08-08 19:15:52 +08:00
edmondlang 0e67cacf80 make refunded booking expired status 2023-08-08 19:14:56 +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 a84f1fe165 test honey trap cron 2023-03-20 11:09:42 +08:00
edmondlang 39a98c469a update honey trap cron 2023-03-20 11:08:16 +08:00
edmondlang 52980b8863 update honey trap cron 2023-03-20 10:28:01 +08:00
edmondlang 584819a513 honey trap update 2023-03-20 10:12:47 +08:00
edmondlang 08435bb619 update command seasonalSegmantCompany:remove 2023-03-18 20:15:59 +08:00
edmondlang 7a029afd64 update command seasonalSegmantCompany:remove 2023-03-18 20:14:24 +08:00
edmondlang 31a5f243cc update RemoveSeasonalSegmentCompany command desc 2023-03-17 19:10:12 +08:00
edmondlang 7cf7fdec54 honey trap 2023-03-17 18:40:48 +08:00
edmondlang f6082382bf debug billplz payment 2023-03-15 19:48:21 +08:00
edmondlang 1140cc9d3d debug billplz payment 2023-03-15 19:43:51 +08:00
edmondlang fe9ccc1041 debug billplz payment 2023-03-15 19:28:42 +08:00
edmondlang 0d9264ba10 debug billplz payment 2023-03-15 19:26:59 +08:00
edmondlang 10467e5cc1 debug billplz payment 2023-03-15 19:23:24 +08:00