Commit Graph

537 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 780bbe7333 Merge branch 'import-ambank-cief-lite-statement' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-07 10:09:36 +08:00
JiaSheng 6c0d0be3eb import ambank and cief lite statement 2023-11-30 18:04:00 +08:00
JiaSheng 7ab938ebee Merge branch 'centralize-izyim-exchange' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
2023-11-24 17:28:22 +08:00
JiaSheng aca665f580 centralize izyim exchange 2023-11-19 17:10:33 +08:00
edmondlang 960f0b71a4 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-11-09 10:21:22 +08:00
edmondlang 6fe1ca3e0e update regenerate invoice 2023-11-09 10:21:04 +08:00
edmondlang 4630133ba1 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-11-09 10:07:31 +08:00
edmondlang fc2bdb4ff0 update regenerate invoice 2023-11-09 10:07:13 +08:00
edmondlang 9b46981593 update regenerate documents link 2023-11-09 09:43:09 +08:00
edmondlang 8b5710cc2b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-11-09 00:26:30 +08:00
edmondlang 4de027c82f regenerate customer invoice in certain date period 2023-11-09 00:24:55 +08:00
edmondlang 51766b6caa Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into regenerate-invoice-with-first-bill-no 2023-11-08 00:11:44 +08:00
edmondlang 4d23e0cb9c Merge branch 'account-statement-pagination' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-11-04 23:18:03 +08:00
JiaSheng d6754014aa account-statement-pagination 2023-11-04 00:00:58 +08:00
Steve Ng fe46d72891 fix bug of update status of statement transaction owner when update invoice or receipt success, and paginate when next page with filtering date in Pending Export tab, and error on export invoive to autocount 2023-11-01 13:45:05 +08:00
Steve Ng 4bf32ac285 fix bug of update status of statement transaction owner when update invoice or receipt success, and paginate when next page with filtering date in Pending Export tab, and error on export invoive to autocount 2023-11-01 13:43:36 +08:00
edmondlang 10e44bbd18 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-10-30 18:39:34 +08:00
edmondlang 5c5f54e03b delete booking / expire the order payment 2023-10-30 18:39:19 +08:00
Steve Ng 89c777ee49 fixing the structure of export receipt to autocount and import receipt to exchange map failed 2023-10-29 08:46:59 +08:00
Steve Ng 5b681ac8c0 fixing the structure of export receipt to autocount and import receipt to exchange map failed 2023-10-29 08:44:31 +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 5b94b87448 Merge branch 'steve/account-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into staging 2023-10-12 18:19:48 +08:00
edmondlang 5ec7a4a61f update bulk download white form 2023-10-12 18:10:32 +08:00
edmondlang c6747b24cd Merge branch 'bulk-download-white-form' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	routes/web.php
2023-10-12 16:15:10 +08:00
Jia Sheng Lee 3bbc4346c4 bulk download white form and supplier filter 2023-10-12 16:11:34 +08:00
Steve Ng d9d3c48e6d code for statement import invoice mapping 2023-10-09 14:28:11 +08:00
Steve Ng 4e29145b50 Merge branch 'steve/mapping-import-invoice' into development 2023-10-06 11:00:59 +08:00
Steve Ng bc5d1eff88 code for statement import invoice mapping 2023-10-06 10:59:36 +08:00
edmondlang 70d9072e26 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-10-05 12:11:38 +08:00
edmondlang db2384a235 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-10-04 13:02:34 +08:00
Jia Sheng Lee a0f600037b import purchase order function 2023-10-03 22:35:37 +08:00
Steve Ng 0882a4d91f enhance the code in ApproveDuplicateBankStatementDetailsStatusLogic class to dynamic for update status to approve and revert back pending 2023-10-03 15:21:29 +08:00
Steve Ng 9938615fe4 enhance the code in ApproveDuplicateBankStatementDetailsStatusLogic class to dynamic for update status to approve and revert back pending 2023-10-03 15:20:11 +08:00
edmondlang 52e6454716 deploy module download bulk invoice 2023-09-30 15:51:09 +08:00
edmondlang 287ef64d86 Merge branch 'bulk-download-invoices' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2023-09-30 14:24:04 +08:00
edmondlang bd33abb054 Merge branch 'company-wallet-transaction-pagination' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-26 20:40:50 +08:00
JiaSheng cc1229a27f company wallet transaction pagination 2023-09-19 00:09:09 +08:00
edmondlang 62c9b28bc4 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-16 18:10:17 +08:00
edmondlang 6542710ba9 update ui for export Wallet Transaction History 2023-09-16 18:09:11 +08:00
edmondlang 823556b9b5 download wallet transaction history 2023-09-16 16:36:32 +08:00
edmondlang d041b08492 Merge branch 'regenerate-invoice-with-first-bill-no' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Console/Commands/RegenerateInvoice.php
2023-09-16 14:38:41 +08:00
edmondlang 9f2b431f21 regenerate-invoice-with-first-bill-no 2023-09-16 14:38:02 +08:00
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 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 58ae950a71 bulk download invoices 2023-09-08 14:49:39 +08:00
edmondlang b854fd5bdc fix invoice 2023-09-07 00:39:21 +08:00