Commit Graph

2281 Commits

Author SHA1 Message Date
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 082c9de572 reverse commit 2023-04-19 22:47:45 +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
Omair Saleh 83e883abb9 fix duplicated listing section bug 2023-04-18 17:23:27 +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
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 a3a1c912a3 Minor code amendment 2023-03-31 17:43:22 +08: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
Dillon Ngo 800e743fd6 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!129
2023-03-29 14:18:46 +00:00
Dillon eaf7ce4b67 Insert logs for debugging purpose on production 2023-03-29 22:16:24 +08:00
Dillon Ngo 12cf0c541b Merge branch 'dillon/crm-create-task-3-26' into 'master'
New merge request From dillon/crm-create-task-3-26 into master

See merge request CIEFWorldwideSdnBhd/exchange-2.0!128
2023-03-28 15:54:34 +00:00
Dillon 42290b83a4 Trying to fix a problem when user billing address not yet setup 2023-03-28 23:28:24 +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
Dillon d24cb38247 Fix another error from production logs 2023-03-25 14:17:43 +08:00
Dillon 2ef853cc62 Template update 2023-03-25 08:59:53 +08:00
Dillon 3cac5d20a8 Minor fixes 2023-03-25 02:16:38 +08:00
Dillon b7487394d2 Minor fixes and cleanup 2023-03-25 02:07:44 +08:00
Dillon 58bdfaaee7 minor code streamline from shipping portal 2023-03-24 15:16:21 +08:00
Dillon be4111196e CRM Task with dynamic data 2023-03-24 03:13:18 +08:00
Dillon e1596d69be Fix a problem with new registration uploading document 2023-03-23 04:30:22 +08:00
Dillon bd319c1ee7 Added new task, new task details such as priority and due date + some cleanup 2023-03-23 04:20:07 +08:00
Dillon 01046dc4f3 Fix a inconsistency in data update for task into CRM 2023-03-22 23:53:32 +08:00
Dillon c0af4f4e3a Fix an error from testing at dev 2023-03-22 22:42:43 +08:00
Dillon 3bb62a98c0 PO related tasks added when payment is made + Update PO task status 2023-03-22 22:16:48 +08:00
edmondlang d24983d1b3 Merge branch 'honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2023-03-22 11:36:22 +08:00
edmondlang 3411529594 update honey trap .env 2023-03-22 11:36:00 +08:00
edmondlang e29109b834 update honey trap with search 2023-03-20 23:14:56 +08:00
edmondlang ad776d972e fix bug - delete seasonalSegment and add date after current month 2023-03-20 22:55:58 +08:00
Dillon Ngo 6ad285808f Merge branch 'dillon/debug-and-fixes-1-22' into 'master'
Resolve fixes-1 "Dillon/debug and  22"

See merge request CIEFWorldwideSdnBhd/exchange-2.0!127
2023-03-20 14:15:03 +00:00
Dillon Ngo 5ae4f6f562 Merge branch 'dillon/crm-update-multiple-tasks-status' into 'master'
Allow multiple tasks' status to be updated when one is completed, see crm for the same branch name

See merge request CIEFWorldwideSdnBhd/exchange-2.0!126
2023-03-20 14:14:39 +00:00
Dillon Ngo ec90f76c13 Merge branch 'dillon/crm-gen-invoice-update' into 'master'
Dillon/crm gen invoice update

See merge request CIEFWorldwideSdnBhd/exchange-2.0!125
2023-03-20 14:13:40 +00: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