Commit Graph

1346 Commits

Author SHA1 Message Date
Stephanos A
2bd76756a4 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-23 10:13:36 +03:00
Stephanos A
2d51787383 Backoffice updates, boarding pass, alternative schedule search and more 2026-06-23 10:10:55 +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
Abubeker Yasin
707e32c43c feat: ( iam ) update the iam package 2026-06-23 09:43:12 +03:00
Abubeker Yasin
bb55194b54 Merge branch 'alpha' into passenger/feat/iam 2026-06-23 09:35:50 +03:00
Abubeker Yasin
fd0f1d27d8 remove malware 2026-06-23 08:50:34 +03:00
Abubeker Yasin
f15b6f6ed5 Merge pull request #245 from Tria-plc/feat/veriFayda-integration
feat: ( fayda ) implement verify with fayda
2026-06-23 06:00:49 +03:00
Abubeker Yasin
44ae3f8a67 feat: ( fayda ) implement verify with fayda 2026-06-23 05:52:41 +03:00
Abubeker Yasin
f0d9c95956 Merge branch 'dev' into passenger/feat/iam 2026-06-22 21:01:08 +03:00
Abubeker Yasin
aede976973 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into dev 2026-06-22 20:09:56 +03:00
Eyob T.
e6cdefdf69 Merge pull request #244 from Tria-plc/alpha
Added manage booking,voucher download options and fix email and phone number for guest user
2026-06-22 18:34:44 +03:00
Yonas Tewabe
be1461c792 Update deployment workflow to use dynamic runner 2026-06-22 17:00:57 +03:00
Muluhabt
ee90d178ae Adding local packages 2026-06-22 16:52:49 +03:00
Nathnael
f7cbb6af6f fix: query key 2026-06-22 13:52:34 +00:00
Roba Boru
9cfd0fc2eb Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-22 16:46:55 +03:00
Roba Boru
aadf1644fb Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-22 16:46:44 +03:00
Nathnael
2700a3edec refactor: migrate from most of the custom hooks into the api.ts 2026-06-22 13:46:38 +00:00
Roba Boru
1456ca7e9c Added download voucher option and manage booking 2026-06-22 16:46:24 +03: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
Eyob T.
25bba23579 Merge pull request #240 from Tria-plc/fix/security_patch
Fix/security patch
2026-06-22 15:12:33 +03:00
Marshal
ad0043b580 feat: enhance service profile handling for customer companies 2026-06-22 12:11:10 +00:00
Eyob T.
f06526cfd6 Merge pull request #237 from Tria-plc/fix/security_patch
Fix/security patch
2026-06-22 15:07:19 +03:00
Eyob T.
6108e7bb67 Security patch
Remove specific temporary files from .gitignore.
2026-06-22 15:06:40 +03:00
Eyob T.
8d0080f074 Security patch 2026-06-22 15:06:08 +03:00
Abubeker Yasin
4b3c47ca03 refactor: ( iam ) remove user relations 2026-06-22 15:01:16 +03: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
Abubeker Yasin
a63b49d419 Revert "pass test"
This reverts commit 82900219d2.
2026-06-22 13:34:46 +03:00
Abubeker Yasin
82900219d2 pass test 2026-06-22 13:34:20 +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