cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-31 18:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,341 Commits 175 Branches 0 Tags
d844cf64a4202d07e463ba313a43a55c96d181f0
Commit Graph

2341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dillon d844cf64a4 Merge branch 'dillon/debug-and-fixes-2-29' into development 2023-03-31 17:43:37 +08:00
Dillon a3a1c912a3 Minor code amendment 2023-03-31 17:43:22 +08:00
Dillon f295cbb9f4 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-03-31 00:18:04 +08:00
Dillon 214ae61362 Merge branch 'dillon/debug-and-fixes-2-29' into development 2023-03-31 00:17:48 +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 b97170378d Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-03-30 16:03:43 +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 69072c6b38 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-03-28 23:29:30 +08:00
Dillon 530061cefd Merge branch 'dillon/crm-create-task-3-26' into development 2023-03-28 23:28:55 +08:00
Dillon 42290b83a4 Trying to fix a problem when user billing address not yet setup 2023-03-28 23:28:24 +08:00
edmondlang 8a9edd6b5b Merge branch '1688-tnc' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-03-28 12:23:13 +08:00
edmondlang 245f647e6f update 1688 tnc 2023-03-28 12:22:51 +08:00
edmondlang 446f78eb2c Merge branch '1688-tnc' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-03-28 11:16:25 +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 1c35cde3e3 Merge branch 'dillon/crm-create-task-3-26' into development 2023-03-25 14:18:29 +08:00
Dillon d24cb38247 Fix another error from production logs 2023-03-25 14:17:43 +08:00
Dillon 74e5fcd7ca Merge branch 'dillon/crm-create-task-3-26' into development 2023-03-25 08:59:59 +08:00
Dillon 2ef853cc62 Template update 2023-03-25 08:59:53 +08:00
Dillon dc363ad466 Merge branch 'dillon/crm-create-task-3-26' into development 2023-03-25 02:16:51 +08:00
Dillon 3cac5d20a8 Minor fixes 2023-03-25 02:16:38 +08:00
Dillon 6512ba8f4d Merge branch 'dillon/crm-create-task-3-26' into development 2023-03-25 02:07:58 +08:00
Dillon b7487394d2 Minor fixes and cleanup 2023-03-25 02:07:44 +08:00
Dillon a481b4a789 Merge branch 'dillon/crm-create-task-3-26' into development 2023-03-24 15:16:28 +08:00
Dillon 58bdfaaee7 minor code streamline from shipping portal 2023-03-24 15:16:21 +08:00
Dillon 4cb70bbe5a Merge branch 'dillon/crm-create-task-3-26' into development 2023-03-24 03:17:34 +08:00
Dillon be4111196e CRM Task with dynamic data 2023-03-24 03:13:18 +08:00
Dillon 74c7084364 Merge branch 'dillon/crm-create-task-3-26' into development 2023-03-23 04:32:02 +08:00
Dillon e1596d69be Fix a problem with new registration uploading document 2023-03-23 04:30:22 +08:00
Dillon 5cdb7ed95c Merge branch 'dillon/crm-create-task-3-26' into development 2023-03-23 04:20:37 +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 04ad7286a7 Merge branch 'dillon/crm-create-task-3-26' into development 2023-03-22 23:53:42 +08:00
Dillon 01046dc4f3 Fix a inconsistency in data update for task into CRM 2023-03-22 23:53:32 +08:00
Dillon fac4beb9d4 Merge branch 'dillon/crm-create-task-3-26' into development 2023-03-22 22:42:54 +08:00
Dillon c0af4f4e3a Fix an error from testing at dev 2023-03-22 22:42:43 +08:00
Dillon 3e64214100 Merge branch 'dillon/crm-create-task-3-26' into development 2023-03-22 22:17:21 +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 7448455f5c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-03-22 11:40:08 +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 b1588aa9c7 Merge branch 'honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-03-20 23:18:38 +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