Commit Graph

3047 Commits

Author SHA1 Message Date
edmondlang 95b4c879ee update template 2023-11-04 23:58:40 +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
edmondlang 00b5a03d5c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-11-04 23:17:48 +08:00
JiaSheng 7d94776543 fix bcmath function bug 2023-11-04 22:28:16 +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 8b0cdd6b3f fix export pdf logic 2023-11-04 08:19:47 +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
edmondlang ab2109ec51 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-10-30 18:09:11 +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 24a6c8cf53 fixing the unknown tab to list the transactions of is_mapped false and also mapped and status in rejected 2023-10-26 00:02:51 +08:00
Steve Ng f47c3c9ecc fixing the unknown tab to list the transactions of is_mapped false and also mapped and status in rejected 2023-10-26 00:01:10 +08:00
Steve Ng b1426aa8bb fixing the unknown tab to list the transactions of is_mapped false and also mapped and status in rejected 2023-10-25 18:05:20 +08:00
Steve Ng 910f190075 fixing the unknown tab to list the transactions of is_mapped false and also mapped and status in rejected 2023-10-25 18:03:31 +08:00
Steve Ng a6b398a46e fix bug in function import invoices 2023-10-24 21:23:40 +08:00
Steve Ng bc5a8a9193 fix bug in function import invoices 2023-10-24 21:21:51 +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 a8636d1954 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-10-18 15:37:32 +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
edmondlang 1892f13cd6 Merge branch 'steve/account-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2023-10-18 15:05:13 +08:00
Steve Ng eaccb6a0cd fix store date conflict between different tabs 2023-10-18 14:39:33 +08:00
Steve Ng 18aecc1f71 fix store date conflict between different tabs 2023-10-18 14:35:04 +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
Omair Saleh 3dcb64ecd1 fix account number 2023-10-17 16:21:59 +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 e18c1f39d0 enhance import invoice mapping conditions 2023-10-16 10:25:35 +08:00
Steve Ng f9c196a67c code for mapped report 2023-10-16 10:25: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
Steve Ng 829ea9ad17 enhance import invoice mapping conditions 2023-10-15 22:42:47 +08:00
Steve Ng 521260d69f code for mapped report 2023-10-13 08:25:54 +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 caff1ab5d5 show error message for bulk download 2023-10-12 18:57:14 +08:00
edmondlang 1eb227a63c show error message for bulk download 2023-10-12 18:53:26 +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 8dd0c3ee06 Merge branch 'bulk-download-white-form' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into staging 2023-10-12 18:19:17 +08:00