cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-21 21:43:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,589 Commits 175 Branches 0 Tags
dillon/development
Commit Graph

83 Commits

Author SHA1 Message Date
omair saleh bf3c2d164c Merge branch 'dillon/accounting-bank-mapping' into 'development' 
Dillon/accounting bank mapping

See merge request CIEFWorldwideSdnBhd/exchange-2.0!137
 2023-06-13 15:22:16 +00:00
Omair Saleh 9ccd51af08 remove accounting tasks from auto generated tasks temporarily until ready 2023-06-11 15:42:49 +08:00
edmondlang dc9f09b18a accounting bank mapping part - mapping unknown transactions 2023-05-21 22:59:48 +08:00
omair saleh ceb64a66a1 Merge branch 'development' into 'dillon/accounting-bank-mapping' 
# Conflicts:
#   app/Http/Controllers/Accounting/BankStatementController.php
 2023-04-18 04:10:13 +00:00
Omair Saleh 4a6ae598fa fix and update the functionality and the ui for accounting automation 2023-04-18 12:07:27 +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
DESKTOP-5I7S92L\nicho dfe659084d change admin role type 2023-03-30 15:52:45 +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 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 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 4f1dff9367 Merge branch 'dillon/crm-update-multiple-tasks-status' into development 2023-03-19 03:49:50 +08:00
Dillon 9afa7f8471 Allow multiple tasks' status to be updated when one is completed, see crm for the same branch name 2023-03-18 03:40:01 +08:00
edmondlang f81bccb876 Merge branch 'honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-03-17 18:41:19 +08:00
edmondlang 1140cc9d3d debug billplz payment 2023-03-15 19:43:51 +08:00
Dillon a4a0c28333 Merge branch 'dillon/crm-tasks-department' into development 2023-03-12 17:36:23 +08:00
Dillon 2565ddfda5 CRM add department custom field to task + PDOException fix 2023-03-12 17:35:56 +08:00
Dillon 40641fb73f Merge branch 'dillon/crm-create-task-2' into development 2023-03-10 02:47:05 +08:00
Dillon 40e4aae185 CRM create all remaining tasks according to documentation 2023-03-10 02:42:00 +08:00
Dillon 508070479d Merge branch 'dillon/crm-create-invoice' into development 2023-03-05 20:27:19 +08:00
Dillon 914b961d66 CRM create invoice 2023-03-05 20:26:20 +08:00
Dillon d3450a900a Merge branch 'dillon/crm-create-task' into development 2023-03-01 12:35:27 +08:00
Dillon 607a6f111b Add new tasks post payment into CRM + Add task append to lead 2023-03-01 12:27:26 +08:00
Dillon 374b7d187a Merge branch 'dillon/crm-integration' into development 2023-02-17 07:39:55 +08:00
Dillon 4d7b41b0a4 CRM integration MVP Phase 1 2023-02-17 06:28:59 +08:00
edmondlang c6189aa905 Merge branch 'dillon/crm-integration' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
 2023-02-12 20:22:37 +08:00
edmondlang d32476d171 api and web route logs 2023-01-04 22:17:14 +08:00
Dillon 63f0670923 PerfexCRM Integration 2023-01-03 15:41:30 +08:00
Farhan 0115e59582 Add LABEL_SEGMENT constant 2022-07-26 15:55:12 +08:00
omair saleh b4b3fa33fd upload 1688 purchase order in pdf format 2022-07-21 14:56:29 +08:00
ahmedsophyudden cf852eb120 Generate bulk purchase order 2022-07-04 09:14:16 +08:00
edmondlang 3c4e81532b Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-06-11 14:41:46 +08:00
edmondlang fe5756efc2 export billing analaytic data 2022-05-14 15:02:17 +08:00
omair saleh b62ba94e41 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	app/Classes/ValueObjects/Constants/TransactionType.php
 2022-05-03 13:39:05 +08:00
omair saleh 18b2cd3f4b debug file type 2022-04-04 18:16:24 +08:00
omair saleh bfd3d87977 debug file type 2022-04-04 18:15:17 +08:00
omair saleh c1793dfe09 fix transactions export 2022-04-01 16:10:52 +08:00
glovetleong 3fcfcf9de9 cash back 2022-04-01 10:12:23 +08:00
omair saleh 739b9af57d update debtors import 2022-03-19 15:19:13 +08:00
omair saleh 481426bec9 clean up development 2022-03-12 17:02:21 +08:00
ahmedsophyudden e6ecf74379 Merge branch 'add-transaction-service-charge' into development 2022-02-28 22:50:13 +08:00
ahmedsophyudden dd0b142238 Create api to create and update service change setting 2022-02-27 12:51:21 +08:00
edmondlang e3e4b490b0 Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-ui 
# Conflicts:
#	resources/views/partials/header.blade.php
#	routes/web.php
 2022-02-04 22:22:07 +08:00