Commit Graph

1082 Commits

Author SHA1 Message Date
Marshal
648f4f2ee4 Add fleet management and admin permissions, and update controllers to enforce new permissions 2026-06-17 01:56:56 +00:00
Marshal
fe679d23d4 Refactor payment method handling and simplify provider options in PaymentMethodModal 2026-06-17 01:19:04 +00:00
marshal
a1b58d0068 Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-17 04:02:48 +03:00
Marshal
c76f8648a9 Updated signature handling, added booking detail components, introduced a signature management page, updated routing, enabled document downloads, and simplified the profile page. 2026-06-17 01:02:09 +00:00
marshal
828f1ac1cd Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-17 03:19:08 +03:00
marshal
152dbf8e62 Remove PolinRider malware scan workflow and centralize API configuration
- Delete .github/workflows/polinrider-scan.yml workflow file
- Create centralized API_BASE_URL constant in apps/edr-freight-web/backoffice/src/constants/apiConfig.ts
- Update http.ts and CargoFormDialog.tsx to use centralized API_BASE_URL
- Add TypeScript types to vite.config.ts middleware functions
- Add React/Mantine dedupe configuration to vite.config.ts resolve
- Add MySignatureCard component for customer profile signature
2026-06-17 03:18:34 +03:00
Marshal
e65addc619 Add signature menu item and wrap MySignatureCard in a div on ProfilePage 2026-06-17 00:09:28 +00:00
Marshal
7106a549ab Add signature management features for booking contracts
- Implement MySignatureCard component for viewing and updating saved signatures.
- Enhance BookingContractPage to utilize saved signatures for contract signing.
- Introduce hooks for fetching and saving user signatures.
- Update ContractView interface to include saved signature details.
- Create signatures service for API interactions related to user signatures.
2026-06-16 23:06:41 +00:00
Marshal
853c2b2765 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 22:50:01 +00:00
marshal
dbe4983b75 Pin Mantine dependencies to portal's node_modules and optimize dependency pre-bundling to prevent React version conflicts 2026-06-17 01:29:48 +03:00
marshal
b191fe2335 Update Vite configuration to use Vitest for testing, add TypeScript source resolution for types, and deduplicate Mantine dependencies to ensure shared context. 2026-06-17 00:44:39 +03:00
marshal
57b9029daf Merge branch 'dev' of github.com:Tria-plc/edr-platform into dev 2026-06-16 23:28:47 +03:00
SennayT
9ad78bffc1 remove virus scanner 2026-06-16 23:27:25 +03:00
marshal
6d8eb65a36 Add TypeScript type annotations to Vite config and dedupe Mantine dependencies 2026-06-16 23:26:03 +03:00
Sennay
fd49d904a8 remove PolinRider malware scan workflow
This workflow scans for PolinRider malware signatures, checks git history for suspicious patterns, and enforces a clean-scan gate to block deployments if malware is detected.
2026-06-16 23:25:21 +03:00
marshal
9329e6ca57 Refactor payment type exports to separate types from enums in index 2026-06-16 23:08:27 +03:00
marshal
e815b4d976 Refactor API base URL configuration to use centralized constant across applications 2026-06-16 23:06:46 +03:00
marshal
67ab9b5f82 changes 2026-06-16 22:59:48 +03:00
marshal
699f7466e2 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 22:45:31 +03:00
Sennay
b512e77ce1 Update VITE_API_URL to production endpoint 2026-06-16 22:35:27 +03:00
Eyob T.
d110391c05 Merge pull request #189 from Tria-plc/alpha
Update roundtrip booking result
2026-06-16 22:33:41 +03:00
Roba Boru
ad2a175ff5 Merge remove changes 2026-06-16 22:29:50 +03:00
Roba Boru
57c2549738 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-16 22:29:31 +03:00
Roba Boru
001a1a7d98 Update roundtrip booking result 2026-06-16 22:29:10 +03:00
Stephanos A
865105eb6a Revert "fix: add lockfile corruption handling to CI/CD and Dockertfiles"
This reverts commit 560aff222b.
2026-06-16 22:25:26 +03:00
Sennay
2d513b78a3 Update VITE_API_URL for production deployment 2026-06-16 22:15:57 +03:00
Eyob T.
c1d96f1daf Merge pull request #188 from Tria-plc/revert-187-alpha
Revert "fix: add lockfile corruption handling to CI/CD and Dockerfiles"
2026-06-16 22:02:54 +03:00
Stephanos A.
7a00955588 Revert "fix: add lockfile corruption handling to CI/CD and Dockerfiles" 2026-06-16 21:58:26 +03:00
Eyob T.
eb7db6db21 Merge pull request #187 from Tria-plc/alpha
fix: add lockfile corruption handling to CI/CD and Dockerfiles
2026-06-16 21:48:40 +03:00
Stephanos A
560aff222b fix: add lockfile corruption handling to CI/CD and Dockerfiles 2026-06-16 21:40:01 +03:00
ghost2023
1861d45f1e feat: add the payment to booking page 2026-06-16 20:38:48 +03:00
ghost2023
c73780712d fixes 2026-06-16 20:37:41 +03:00
ghost2023
f3284a13d0 refactor(workflow): Revamp booking progress stages and status mapping 2026-06-16 20:37:40 +03:00
Eyob T.
fc57c66d0a Merge pull request #185 from Tria-plc/alpha
Merge request for booking endpoint and other enhancements
2026-06-16 20:20:41 +03:00
yaschalew10
38f18d1fde Merge pull request #186 from Tria-plc/freight/hotfix_1
fix prod issue
2026-06-16 19:40:27 +03:00
natib21
018ae5e059 fix prod issue 2026-06-16 16:39:29 +00:00
Stephanos A
ad83c87e2f Enhance deletion logic in Fleet and Schedules services to prevent deletion of records with active dependencies; update Seats and Stations pages to improve UI and remove unused fields. 2026-06-16 19:30:09 +03:00
Stephanos A
eb60fc340d Refactor booking creation to support one-way and round-trip bookings with enhanced DTOs and service methods 2026-06-16 18:44:09 +03:00
Marshal
e8c6a2bbd2 Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 15:28:38 +00:00
Marshal
052829c7e6 Add freight demo data seeder and permissions management
- Introduced `DemoFreightDataSeeder` to seed demo freight data including wagons, approval rules, and staff users.
- Added `seed:freight-demo` script to `package.json` for easy execution.
- Updated permissions for operations officer and added permission checks in various components.
- Enhanced sidebar and booking actions to respect user permissions.
2026-06-16 15:28:10 +00:00
marshal
7e1c2dcbd8 Merge pull request #184 from Tria-plc/freight/develop
Freight/develop
2026-06-16 18:26:01 +03:00
marshal
8098adedaa Merge pull request #183 from Tria-plc/freight_feature/priority
Freight feature/priority
2026-06-16 18:25:12 +03:00
marshal
369f2892fb Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 18:13:25 +03:00
Eyob T.
2e9e69275a Merge pull request #180 from Tria-plc/alpha
Enhance DTOs and services to support sequence and operational status for coaches and stations
2026-06-16 17:40:01 +03:00
marshal
82954b1ec1 Merge pull request #182 from Tria-plc/freight_feature/priority
Freight feature/priority
2026-06-16 17:31:28 +03:00
marshal
10364fe924 ass signature on the profile 2026-06-16 17:30:22 +03:00
Marshal
43a822a2ac Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 14:27:00 +00:00
Marshal
f6c28635bc add 'My signature' menu item to user menu 2026-06-16 14:26:17 +00:00
marshal
ea9b9c7346 Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 17:20:31 +03:00
Marshal
2d0f5ce6ee changes 2026-06-16 14:17:40 +00:00