Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 00:52:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,219 Commits 96 Branches 0 Tags
c69dd3c2387d3cbc2fec71f8185d67e582586cfe
Commit Graph

1219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hagiye
c69dd3c238 Release Order plus Storage fee 2026-06-24 15:23:50 +03:00
hagiye
8ee31789c6 merge conflict fix 2026-06-24 12:31:59 +03:00
hagiye
0255adffe6 changes 2026-06-24 09:56:12 +03:00
yaschalew10
6d648b2553 Merge pull request #252 from Tria-plc/freight/fix/type-errors 
Fixes and improvements
 2026-06-23 17:22:00 +03:00
Nathnael
10d74a65b0 fix: type error and fixes 2026-06-23 14:20:16 +00:00
Nathnael
cbbad02b29 fix: type error and other fixes 2026-06-23 13:14:06 +00:00
ghost2023
cdfe7c1f5b fix: type errors 2026-06-23 15:02:25 +03:00
yaschalew10
18989c97e6 Merge pull request #248 from Tria-plc/freight/feature/vehicle_2 
Freight/feature/vehicle 2
 2026-06-23 11:15:22 +03:00
yaschalew
c8f7445b4d Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-23 10:54:20 +03:00
yaschalew
eeb7ce8cae fix user module 2026-06-23 10:53:57 +03:00
Nathnael Wondisha
fd1fc1ca69 Merge pull request #247 from Tria-plc/freight/fix/api 
fix
 2026-06-23 10:04:28 +03:00
ghost2023
fab05569d4 fix 2026-06-23 10:03:54 +03:00
yaschalew10
4655392e70 Merge pull request #246 from Tria-plc/freight/style/ui-sync 
Feat: add the company profile management to the backoffice
 2026-06-23 09:54:06 +03:00
Nathnael Wondisha
56968e0709 Merge branch 'freight/develop' into freight/style/ui-sync 2026-06-23 09:51:24 +03:00
Nathnael
a6f3fd5643 feat: finish company profile in the backoffice 2026-06-23 06:45:29 +00:00
Nathnael
f7cbb6af6f fix: query key 2026-06-22 13:52:34 +00:00
Nathnael
2700a3edec refactor: migrate from most of the custom hooks into the api.ts 2026-06-22 13:46:38 +00:00
Muluhabt
f25a237dc0 Remove malware 2026-06-22 16:27:02 +03:00
mulish77
387fc5efdd Add files via upload 2026-06-22 16:25:57 +03:00
mulish77
712579bf92 Delete local-packages/tria-plc-api-common-1.4.3.tgz 2026-06-22 16:23:01 +03:00
marshal
02427f72f1 Merge pull request #243 from Tria-plc/freight_feature/profile 
Freight feature/profile
 2026-06-22 15:49:25 +03:00
marshal
af3a03750b Merge pull request #236 from Tria-plc/freight/feature/vehicle_2 
Freight/feature/vehicle 2
 2026-06-22 15:49:06 +03:00
Marshal
39f2c99395 feat: add phone number normalization to Ethiopian E.164 format in CompanyProfileForm 2026-06-22 12:35:01 +00:00
Nathnael
c6bc636495 feat(customers): implement customer management page with mock data 
- Created CustomersPage component to display a list of companies with search and pagination features.
- Added mock data for companies, including various statuses and profiles.
- Implemented a service layer to simulate API calls for fetching company data, bookings, documents, and payments.
- Defined TypeScript types for company and related entities to ensure type safety.
- Integrated Mantine components for UI consistency and improved user experience.
 2026-06-22 12:32:52 +00:00
Marshal
30b022356c feat: update onboarding and company role handling to support multiple service types 2026-06-22 12:30:44 +00:00
Nathnael
d66ccc5363 refactor: migrated of the customer hooks for warehouse data fetching 2026-06-22 12:25:20 +00:00
Marshal
ad0043b580 feat: enhance service profile handling for customer companies 2026-06-22 12:11:10 +00:00
Marshal
3e45d694da changes 2026-06-22 11:54:10 +00:00
Nathnael
74e03f2067 refactor: migrate to use the central api obj 2026-06-22 11:52:59 +00:00
Marshal
b031ddb204 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-22 11:43:38 +00:00
Marshal
ff039bd440 feat(bookings): update payment eligibility logic for general contracts and one-time bookings 2026-06-22 11:40:35 +00:00
ghost2023
71db3a968e chore: rm junk 2026-06-22 14:27:10 +03:00
yaschalew
78692c6b59 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-22 14:23:59 +03:00
yaschalew
7f51f24a77 fix conflict 2026-06-22 14:23:43 +03:00
Nathnael Wondisha
ecb452d8df Merge pull request #235 from Tria-plc/freight/fix/tailwind 
Fix the injections and migration
 2026-06-22 14:21:35 +03:00
ghost2023
992ba8f55f fix: migration issue 2026-06-22 14:20:17 +03:00
ghost2023
b1318a6ef5 fix: pruge the js blob 2026-06-22 14:13:15 +03:00
yaschalew10
bc900ce6d4 Merge pull request #234 from Tria-plc/modify-submodule-user-management 
Modify submodule user management
 2026-06-22 12:42:37 +03:00
Dagimassefa
b3bfa899f5 update 2026-06-22 12:29:48 +03:00
Dagimassefa
911f486620 remove submodiule link 2026-06-22 12:04:07 +03:00
Nathnael Wondisha
56c6c8027a Merge pull request #233 from Tria-plc/freight/style/ui-sync 
Dashboard ui clean up
 2026-06-22 11:59:19 +03:00
Nathnael Wondisha
fff679369d Merge branch 'freight/develop' into freight/style/ui-sync 2026-06-22 11:58:18 +03:00
Muluhabt
41c51b7986 Adding local packages 2026-06-22 11:53:17 +03:00
Nathnael
8fb432e30f style: finalize the style of the dashboard 2026-06-22 08:52:45 +00:00
Nathnael
feddce8a0c style: use the proper primary color 2026-06-22 08:11:11 +00:00
Nathnael
ec708d85b3 style: update the overview style 2026-06-22 08:05:04 +00:00
natib21
6b1bbd8e59 last mile 2026-06-22 07:58:56 +00:00
natib21
bee47b231a add column 2026-06-22 07:54:07 +00:00
natib21
00d722fa4f last mile 2026-06-22 07:49:47 +00:00
Nathnael
9a224e9baf style: WIP ui updates 2026-06-22 07:44:03 +00:00