1196 Commits

Author SHA1 Message Date
Dillon e126fd46b7 Migrate source code changes for testing Jenkins/Vapor from personal account to CIEF account 2023-06-02 20:33:37 +08:00
edmondlang f37d775e97 honey trap changes 2023-05-30 19:06:28 +08:00
edmondlang 839cce3320 honey trap changes 2023-05-30 18:09:20 +08:00
Omair Saleh b89b911f71 Merge remote-tracking branch 'origin/master' 2023-05-30 12:32:46 +08:00
Omair Saleh 1f105421a1 xpo 04-2023 2023-05-30 12:32:29 +08:00
edmondlang 27509f5937 recalculate wallet balance 2023-05-18 19:31:51 +08:00
edmondlang b452cf0027 recalculate wallet balance 2023-05-18 19:22:58 +08:00
edmondlang 35edc807a8 recalculate wallet balance 2023-05-18 00:07:20 +08:00
edmondlang 43a9bf6742 AuditAndUpdateWallletBalance 2023-05-17 23:49:32 +08:00
edmondlang d5b04b9b81 AuditAndUpdateWallletBalance 2023-05-17 23:44:49 +08:00
edmondlang 96193a2880 recalculate wallet balance 2023-05-17 23:36:32 +08:00
Omair Saleh e84f288d39 xpo jan & feb 2023-05-15 10:44:04 +08:00
edmondlang bc7c0026bd fix wallet bug 2023-05-10 13:38:39 +08:00
edmondlang 455d1d83fa fix sending billplz email to customer on development environment 2023-05-10 13:38:11 +08:00
edmondlang d058d10e49 change honey trap to honey trap platinum 2023-05-10 10:38:34 +08:00
edmondlang d586e11249 upload-honey-trap 2023-05-10 01:46:35 +08:00
edmondlang d315c47bca upload-honey-trap 2023-05-10 01:41:30 +08:00
edmondlang 204068d864 fix bug date error in update announcement function in settings page 2023-04-19 13:26:06 +08:00
edmondlang bf2528d98a update delete booking controller 2023-04-18 13:50:26 +08:00
Dillon c1b53973e5 Reduce flooding of logs from Perfex CRM 2023-04-15 20:58:21 +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 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
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 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
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
edmondlang 584819a513 honey trap update 2023-03-20 10:12:47 +08:00
Dillon d602cde450 Merge branch 'dillon/crm-update-multiple-tasks-status' into dillon/debug-and-fixes-1-22 2023-03-19 22:24:15 +08:00
Dillon 3fc449b08e Merge branch 'dillon/crm-gen-invoice-update' into dillon/debug-and-fixes-1-22 2023-03-19 22:24:07 +08:00
Dillon a8b69cd6a6 Sync code for bug fixes at Shipping Portal 2023-03-19 22:16:42 +08:00
Dillon 4a4c53e388 Fix a problem of a mismatch in data update for invoice 2023-03-19 04:55:54 +08:00