Commit Graph

992 Commits

Author SHA1 Message Date
Omair Saleh 885444cb97 Merge remote-tracking branch 'origin/dillon/accounting-bank-mapping' into dillon/accounting-bank-mapping 2023-06-14 00:54:33 +08:00
Omair Saleh 4167f28be2 show status of transaction 2023-06-14 00:54:15 +08:00
edmondlang 77f533111f accounting mapping api files and calling api, api need to be updated 2023-06-03 23:13:26 +08:00
edmondlang 426abbdf8c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/accounting-bank-mapping 2023-05-31 12:15:21 +08:00
edmondlang 4bd28e3cca add company id in support 2023-05-30 19:38:45 +08:00
edmondlang dc9f09b18a accounting bank mapping part - mapping unknown transactions 2023-05-21 22:59:48 +08:00
Omair Saleh 1ede3edc08 fix bugs 2023-05-19 17:21:36 +08:00
Omair Saleh 93fd645bf6 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/accounting-bank-mapping
 Conflicts:
	routes/web.php
2023-05-16 12:17:43 +08:00
edmondlang 2033842d6c only admin and upload honey trap csv 2023-05-10 10:43:48 +08:00
edmondlang d315c47bca upload-honey-trap 2023-05-10 01:41:30 +08:00
edmondlang 526c5694fa bulk import honey trap 2023-05-09 16:01:17 +08:00
edmondlang aded55b8c7 appprove group mapping transaction api 2023-04-28 19:34:22 +08:00
edmondlang b316032c1e appprove duplicate group mapping transaction api 2023-04-28 19:00:30 +08:00
edmondlang ea3b96dff4 segment to enable enter MYR Rate 2023-04-28 12:31:24 +08:00
edmondlang ddf85d5a30 segment to enable enter MYR Rate 2023-04-28 12:30:45 +08:00
DESKTOP-5I7S92L\nicho cc99933f52 disbale enter myr 2023-04-28 11:19:30 +08:00
edmondlang 4681a39cd1 groupApprove statement transaction mapping api 2023-04-20 17:40:35 +08:00
edmondlang 81f26e7041 reject statement transaction mapping api 2023-04-20 17:11:50 +08:00
edmondlang d1fb18d3f4 reject statement transaction mapping api 2023-04-20 16:18:41 +08:00
edmondlang ced6d2a1b1 reject statement transaction mapping api 2023-04-20 16:17:07 +08:00
edmondlang 5b73e426fe reject statement transaction mapping 2023-04-20 16:14:27 +08:00
edmondlang f10c7f2c6d update filter accounting mapping 2023-04-20 00:01:38 +08:00
edmondlang b6b736a581 revert 2023-04-19 23:33:43 +08:00
edmondlang 50b538e3b9 update modal to approve match and reject match 2023-04-19 23:31:15 +08:00
edmondlang 89c69771fa update modal to approve match and reject match 2023-04-19 23:28:55 +08:00
edmondlang 22b0ebbe5d update modal to approve match and reject match 2023-04-19 23:14:56 +08:00
edmondlang 6a80d4cbe5 update modal to approve match and reject match 2023-04-19 23:01:15 +08:00
edmondlang ae4b826f1e update modal to approve match and reject match 2023-04-19 22:58:46 +08:00
edmondlang 74c3f6a6d3 update modal to approve match and reject match 2023-04-19 22:57:15 +08:00
edmondlang 9e865ea5b2 update modal to approve match and reject match 2023-04-19 22:51:52 +08:00
edmondlang 011e993cfd update modal to approve match and reject match 2023-04-19 22:39:39 +08:00
edmondlang 5f8fa00853 update modal to approve match and reject match 2023-04-19 22:32:44 +08:00
edmondlang 6dbdb0a1d6 modal to approve match and reject match 2023-04-19 22:21:53 +08:00
edmondlang 44ddcebced modal to approve match and reject match 2023-04-19 21:02:52 +08:00
edmondlang 7cb88cb486 modal to approve match and reject match 2023-04-19 18:59:00 +08:00
edmondlang 204068d864 fix bug date error in update announcement function in settings page 2023-04-19 13:26:06 +08:00
Omair Saleh b94d50325c fix duplicated listing section bug 2023-04-18 17:16:11 +08:00
Omair Saleh 4a6ae598fa fix and update the functionality and the ui for accounting automation 2023-04-18 12:07:27 +08:00
Dillon 6aa2ed53c7 Allow user to upload statement repeatedly + master list page + rerun mapping + bug fixes 2023-04-12 05:02:48 +08:00
Dillon 1954cfa63c Mapping of bank statement records with exchange and shipping portal + UI to edit the details 2023-04-11 04:14:53 +08:00
edmondlang 5bd221050c remove console.log 2023-04-10 22:33:04 +08:00
Omair Saleh 7ca23edb9b 1. ImportBankRecordController (script for mapping that get the data from xsl file, needs to be changed to get data from db, and also to retrive data from shipping portal)
2. BankStatementController (for importing data from csv files from bank to insert into the database)
2023-04-03 17:48:39 +08:00
Dillon Ngo cfec4c58b2 Merge branch 'dillon/debug-and-fixes-2-29' into 'master'
New merge request From dillon/debug-and-fixes-2-29 into master

See merge request CIEFWorldwideSdnBhd/exchange-2.0!130
2023-04-01 16:25:23 +00:00
Dillon 1f3e1d32a1 Sync code changes from Shipping Portal + Fix a problem related to activating 1688 service 2023-03-31 00:17:21 +08:00
edmondlang 749c6e0bef Merge branch 'change-admin-role-type' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2023-03-30 16:02:56 +08:00
edmondlang 2139a4ea0b change admin role type 2023-03-30 16:02:39 +08:00
DESKTOP-5I7S92L\nicho dfe659084d change admin role type 2023-03-30 15:52:45 +08:00
edmondlang 245f647e6f update 1688 tnc 2023-03-28 12:22:51 +08:00
edmondlang ee28f13cbe 1688 tnc 2023-03-28 11:16:03 +08:00
DESKTOP-5I7S92L\nicho d867421901 1688 tnc 2023-03-27 16:27:47 +08:00