Commit Graph

1256 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 b6162f5355 update 2023-12-23 16:29:06 +08:00
JiaSheng 72797d8885 supplier bill group dashboard 2023-12-22 18:16:04 +08:00
JiaSheng 603f29c9d0 Merge branch 'import-ambank-cief-lite-statement' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-18 19:17:32 +08:00
JiaSheng 4d057d0f5f Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into import-ambank-cief-lite-statement
update import cief lite
2023-12-18 19:15:34 +08:00
Steve Ng 44fbb14b36 change where condition for import receipts 2023-12-12 16:25:52 +08:00
Steve Ng 7ab1cd47e5 change where condition for import receipts 2023-12-12 16:24:36 +08:00
JiaSheng ae94a03a65 Merge branch 'import-ambank-cief-lite-statement' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-08 19:56:14 +08:00
JiaSheng a6c4a0350d -Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into import-ambank-cief-lite-statement
-update import ambank statement logic
2023-12-08 19:53:09 +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 cbc3fb56d4 fix pay booking by wallet bug 2023-12-07 01:05:17 +08:00
Dillon Ngo 120ea642c5 Merge branch 'dillon/41-voucherify-phase-2b' into development 2023-12-06 13:38:03 +08:00
Dillon Ngo 1212ec37b8 Fix a decimal problem reported by kexin 2023-12-06 13:37:45 +08:00
Dillon Ngo 864a0a7faf Merge branch 'dillon/41-voucherify-phase-2b' into development 2023-12-04 12:59:09 +08:00
Dillon Ngo c7c7ee8c0c Fix a problem on voucher expiration date inaccurate 2023-12-04 12:58:18 +08:00
Steve Ng cad933ed59 add payment received date in import invoice result and fix structure export receipts to autocount 2023-12-03 18:59:49 +08:00
Steve Ng 1c29e45744 add payment received date in import invoice result and fix structure export receipts to autocount 2023-12-03 18:58:55 +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 8f20c0e8a8 updates for dev environment 2023-11-22 16:18:02 +08:00
JiaSheng 1f057e464e updates 2023-11-19 18:05:52 +08:00
JiaSheng aca665f580 centralize izyim exchange 2023-11-19 17:10:33 +08:00
Steve Ng 84d5af39f5 fix bug in import invoices and unknow tabs for status not in rejected 2023-11-12 11:50:59 +08:00
Steve Ng d8a4510fc4 fix bug in import invoices and unknow tabs for status not in rejected 2023-11-12 11:49:51 +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 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 f98607bc32 filters update 2023-11-04 11:52:34 +08:00
Steve Ng b3a6a9cdcc fix bug unmapped invoice 2023-11-04 10:48:11 +08:00
Steve Ng db88edabfe fix bug unmapped invoice 2023-11-04 10:45:41 +08:00
JiaSheng c11f6dab7a fix account statement transaction not tally issue 2023-11-04 09:59:16 +08:00
JiaSheng d6754014aa account-statement-pagination 2023-11-04 00:00:58 +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
Steve Ng 1ea34d0468 fixing unable mapping records and filtering function in Pending Export tab and listing data not same in Pending Export tab with export Invoice to autocount and calculate mapped percentage 2023-10-23 09:23:10 +08:00
Steve Ng 05b5823fe4 fixing unable mapping records and filtering function in Pending Export tab and listing data not same in Pending Export tab with export Invoice to autocount and calculate mapped percentage 2023-10-23 09:21:26 +08:00
edmondlang 85d96117ad Merge branch 'company-wallet-transaction-pagination' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-10-20 14:58:29 +08:00
JiaSheng 8e67c219a9 fix wallet pagination 2023-10-20 14:56:35 +08:00
edmondlang 24510dbcf1 Merge branch 'bulk-download-white-form' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2023-10-18 15:55:30 +08:00
edmondlang dd9b20e824 Merge branch 'bulk-download-white-form' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-10-18 15:37:18 +08:00
Jia Sheng Lee 02db4d7d5f fix download file name issue, and disable supplier selectable when data is fetching 2023-10-17 17:20:17 +08:00
Steve Ng d99f569d7c reduce queue job statement process qty 2023-10-16 20:07:33 +08:00
Steve Ng f943abcacb reduce queue job statement process qty 2023-10-16 20:06:01 +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
Steve Ng 4ceeb6a317 code for import receipts 2023-10-16 10:25:02 +08:00
Steve Ng 72f4fee864 add edit at pending_export 2023-10-16 10:24:44 +08:00
edmondlang caff1ab5d5 show error message for bulk download 2023-10-12 18:57:14 +08:00