Commit Graph

307 Commits

Author SHA1 Message Date
ghost2023
dcb2de7631 fix: settings page 2026-06-17 13:34:23 +03:00
ghost2023
2a0f16241b fix: improve the setting onboarding flow 2026-06-17 13:17:09 +03:00
ghost2023
e007b28285 fix: type errors 2026-06-17 13:16:06 +03:00
Nathnael Wondisha
cae2848db7 Merge pull request #195 from Tria-plc/freight/feat/portal-fixes
Freight/feat/portal fixes
2026-06-17 11:02:33 +03:00
Nathnael
8b7dcdb897 fixes 2026-06-17 08:00:58 +00:00
Nathnael
24f314150c fix 2026-06-17 08:00:58 +00:00
Nathnael
c59e100e5e style: ui fix in scheduling 2026-06-17 08:00:58 +00:00
Nathnael Wondisha
815c3f4548 Merge branch 'dev' into freight/develop 2026-06-17 10:19:43 +03:00
ghost2023
c96c863070 fix 2026-06-17 10:15:14 +03:00
Nathnael
3919464acb fix: the route direction 2026-06-17 07:14:21 +00:00
Nathnael
4f20b07d81 refactor: the portal dashboard 2026-06-17 07:02:15 +00:00
Nathnael
1ca98f32ea style: improved the review ui 2026-06-17 06:24:03 +00:00
marshal
0b7492c502 Switch API configuration from localhost to production URL in portal and add localhost comment in backoffice 2026-06-17 07:47:09 +03:00
Marshal
2de3f78fb0 Add payments management features including summary and listing, and integrate with the dashboard 2026-06-17 04:35:43 +00:00
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
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
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
6d8eb65a36 Add TypeScript type annotations to Vite config and dedupe Mantine dependencies 2026-06-16 23:26:03 +03:00
marshal
e815b4d976 Refactor API base URL configuration to use centralized constant across applications 2026-06-16 23:06:46 +03:00
ghost2023
1861d45f1e feat: add the payment to booking page 2026-06-16 20:38:48 +03:00
ghost2023
f3284a13d0 refactor(workflow): Revamp booking progress stages and status mapping 2026-06-16 20:37:40 +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
369f2892fb Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 18:13:25 +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
f6c28635bc add 'My signature' menu item to user menu 2026-06-16 14:26:17 +00:00
Marshal
2d0f5ce6ee changes 2026-06-16 14:17:40 +00:00
yaschalew10
fef2239d39 Merge pull request #181 from Tria-plc/freight_feature/priority
Freight feature/priority
2026-06-16 17:02:49 +03:00
Marshal
62ce2dc64f Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 13:27:29 +00:00
Marshal
366a335f85 add reusable per-user contract signatures with profile prefill and approval 2026-06-16 13:26:45 +00:00
Nathnael Wondisha
8777c5e26f Merge pull request #176 from Tria-plc/freight_feature/priority
Freight feature/priority
2026-06-16 16:19:55 +03:00
Nathnael Wondisha
ab3583d9ee Merge pull request #178 from Tria-plc/freight/fix/fixes
Freight/fix/fixes
2026-06-16 16:19:14 +03:00
Nathnael
edc63379bc fix: type error 2026-06-16 13:16:42 +00:00
Nathnael
9afa23cc47 feat: add dashboard summary endpoint and related DTOs for company KPIs 2026-06-16 13:11:56 +00:00
Nathnael
16f16e7d7e fix: booking payment 2026-06-16 13:11:56 +00:00
ghost2023
1d4edfc98c fix: type error to booking and edit booking 2026-06-16 16:11:07 +03:00
ghost2023
17dfce0d18 fixes 2026-06-16 15:45:58 +03:00
ghost2023
cf3db76bb1 type fixes 2026-06-16 15:13:11 +03:00
ghost2023
e0e6020020 fixes 2026-06-16 14:54:07 +03:00
marshal
166067fbe7 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 14:29:17 +03:00
Nathnael Wondisha
c0b6869232 Merge pull request #172 from Tria-plc/freight/fix/fixes
freight/fix/fixes
2026-06-16 14:28:24 +03:00
ghost2023
e47340c2c8 fixes 2026-06-16 14:27:17 +03:00
marshal
3ca564f073 simplify build script and add tinymce dependency 2026-06-16 14:26:47 +03:00
ghost2023
d6ad094d5a style: use mantine in settings page 2026-06-16 14:19:52 +03:00
ghost2023
b883c2d878 feat(onboarding): Implement company profile creation on Settings page 2026-06-16 14:10:31 +03:00