Commit Graph

2309 Commits

Author SHA1 Message Date
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
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 a84f1fe165 test honey trap cron 2023-03-20 11:09:42 +08:00
edmondlang 28a0088d26 Merge branch 'honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-03-20 11:08:47 +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 1fb42f15ba Merge branch 'honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-03-20 10:13:18 +08:00
edmondlang 584819a513 honey trap update 2023-03-20 10:12:47 +08:00
Dillon b0a788771b Merge branch 'dillon/debug-and-fixes-1-22' into development 2023-03-19 22:31:45 +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 7893616bcb Merge branch 'dillon/crm-gen-invoice-update' into development 2023-03-19 04:56:11 +08:00
Dillon 4a4c53e388 Fix a problem of a mismatch in data update for invoice 2023-03-19 04:55:54 +08:00
Dillon 629ed269eb Merge branch 'dillon/crm-gen-invoice-update' into development 2023-03-19 04:32:26 +08:00
Dillon 5a226d18e1 Undo a change that was meant for shipping portal 2023-03-19 04:32:01 +08:00
Dillon 4f1dff9367 Merge branch 'dillon/crm-update-multiple-tasks-status' into development 2023-03-19 03:49:50 +08:00
Dillon 039bb8ce9a Merge branch 'dillon/crm-gen-invoice-update' into development 2023-03-19 03:49:21 +08:00
edmondlang 418c0c3279 Merge branch 'honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-03-18 23:00:21 +08:00
edmondlang b86e7b175a update honey trap 2023-03-18 23:00:02 +08:00
edmondlang 08435bb619 update command seasonalSegmantCompany:remove 2023-03-18 20:15:59 +08:00
edmondlang 7a029afd64 update command seasonalSegmantCompany:remove 2023-03-18 20:14:24 +08:00
Omair Saleh aed176f662 import bank record 2023-03-18 06:56:09 +08:00
Omair Saleh bff743111b import bank record 2023-03-18 06:44:13 +08:00
Omair Saleh 2960b2855d import bank record 2023-03-18 06:42:23 +08:00
Omair Saleh d31b6cfca6 import bank record 2023-03-18 06:38:52 +08:00
Omair Saleh 1c0d64fb12 import bank record 2023-03-18 06:36:03 +08:00
Omair Saleh f55e6609b6 import bank record 2023-03-18 06:34:31 +08:00
Omair Saleh be80313122 import bank record 2023-03-18 06:33:50 +08:00
Omair Saleh 64624ae2a3 import bank record 2023-03-18 06:33:13 +08:00
Omair Saleh 26df516ec8 import bank record 2023-03-18 06:31:45 +08:00
Omair Saleh bf336084b5 import bank record 2023-03-18 06:20:21 +08:00
Omair Saleh 57cb45062e import bank record 2023-03-18 05:43:53 +08:00