Commit Graph

64 Commits

Author SHA1 Message Date
marshal
1c01c792fc merge conflict 2026-06-29 12:45:40 +03:00
Marshal
d6ae1ac18d implement BookingsManager component for managing batch bookings with search and filter functionality 2026-06-28 22:23:51 +00:00
Marshal
3dff7ec189 Refactor contract form steps and improve UI components
- Updated Step 3: Cargo Scope to use Select and MultiSelect components for better user experience.
- Simplified loading states and improved layout in Step 4: Route.
- Enhanced Step 8: Review with a new SummaryItem component for better readability and organization.
- Adjusted navigation labels in payment pages to reflect contracts instead of bookings.
- Introduced RecentContractsSection component to display recent contracts with improved UI and functionality.
- Added clamping logic for step navigation in useContractDraft to handle older drafts.
2026-06-27 17:09:01 +00:00
Nathnael
9c9348d12d fix: unused imports 2026-06-26 13:07:29 +00:00
Nathnael
723c403699 fix: finish cleaning up the file syncing 2026-06-26 13:00:11 +00:00
Nathnael
552e6bcd16 fix: make the file sync work on onboarding 2026-06-26 12:31:08 +00:00
marshal
99a29ada51 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-25 10:37:34 +03:00
marshal
f8036a617a merge 2026-06-25 10:37:21 +03:00
Marshal
859e16c2be enhance onNavigate prop to accept options for navigation state 2026-06-25 07:35:07 +00:00
Nathnael Wondisha
d41013890b Merge branch 'dev' into freight/fix/type-errors 2026-06-25 09:27:14 +03:00
Nathnael
360f6885d5 feat: setup contact person verification 2026-06-25 06:17:57 +00:00
Marshal
d4c58e7d78 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-24 23:56:07 +00:00
Marshal
e0c3044933 feat(train-sets): implement multi-locomotive support for train sets
- Added TrainSetLocomotive entity to link multiple locomotives to a train set.
- Updated TrainSet entity to include a OneToMany relationship with TrainSetLocomotive.
- Modified the train scheduling logic to require at least two locomotives for a train set.
- Enhanced the UI components to support selecting multiple locomotives.
- Introduced new permissions for viewing customs clearance.
- Updated migrations to create the train_set_locomotives table and backfill existing data.
- Implemented utility functions for managing train numbers based on cargo type and direction.
- Added tests for train number utilities to ensure correct functionality.
2026-06-24 23:54:45 +00:00
Nathnael
2261675e21 chore: add api errors 2026-06-24 12:48:42 +00:00
Nathnael
66d3ae8093 fix: onboarding 2026-06-24 12:18:31 +00:00
Nathnael
9b48955eaf feat: centralized the user onboaridn requriements 2026-06-24 11:50:28 +00:00
Nathnael
9d5c195d94 style: improvment to the booking 2026-06-24 08:16:49 +00:00
marshal
b1dfdeb4c5 fix(freight-web): comment out unused onBlur prop and UserCheck import 2026-06-24 11:09:45 +03:00
marshal
72df5ce689 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-24 01:22:31 +03:00
Nathnael
10d74a65b0 fix: type error and fixes 2026-06-23 14:20:16 +00:00
Marshal
6a63ae2fa6 refactor login page to simplify identifier normalization and remove unused login methods 2026-06-23 11:33:04 +00:00
Marshal
6fd1b68389 enhance company approval workflow and TIN validation; add pending approval handling in booking and onboarding forms 2026-06-23 08:37:15 +00:00
Marshal
1d77f377f3 enhance service filtering and dashboard functionality with company profile support 2026-06-23 07:54:36 +00:00
Marshal
39f2c99395 feat: add phone number normalization to Ethiopian E.164 format in CompanyProfileForm 2026-06-22 12:35:01 +00:00
Marshal
30b022356c feat: update onboarding and company role handling to support multiple service types 2026-06-22 12:30:44 +00:00
Marshal
ad0043b580 feat: enhance service profile handling for customer companies 2026-06-22 12:11:10 +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
dc708a2473 Refactor phone input handling across onboarding and settings forms
- Replaced PhoneInput component with ControlledPhoneField for better integration with react-hook-form.
- Updated validation for phone numbers using isValidPhone function to ensure proper formatting.
- Removed country code handling from forms, simplifying phone number management.
- Introduced new phone field component with consistent styling and behavior.
- Added phone number validation on the backend using class-validator.
- Removed unused phone utility functions and cleaned up related code.
2026-06-21 10:34:40 +00:00
Marshal
171e02cf7f feat(bookings): enhance booking filtering and pagination
- Added createdFrom and createdTo filters to BookingListFilterOptions and FilterBookingDto for date range filtering.
- Updated BookingsService and BookingsRepository to handle pagination metadata in responses.
- Enhanced BookingsController to return pagination metadata when no company is linked.
- Introduced ModeIndicator component to display current operational mode across various pages.
- Added ContainersCard and KeyFactsStrip components for detailed booking views.
- Implemented CargoModeCell, BookingTypeBadge, and PaymentBadge for consistent display of booking attributes.
- Updated MyBookings and ContractsList pages to include new filters and display enhancements.
2026-06-21 07:41:04 +00:00
Marshal
72b6c9875d feat: integrate eTradeInfo component for auto-filling company information and enhance TIN input handling 2026-06-20 10:39:53 +00:00
Marshal
1f92a04ecf feat: add eTrade fields to company entity and onboarding process
- Added new fields to the Company entity: licenceNumber, statusDescription, dateRegistered, renewedFrom, renewalDate, renewedTo, region, zone, woreda, kebele, houseNo, and etradePhone.
- Updated onboarding wizard to include a new contact step and fetch company information from eTrade using TIN.
- Created ETradeInfo component to handle fetching and displaying eTrade data.
- Implemented ETradeService to interact with eTrade API and extract relevant company registration data.
- Added new DTOs for fetching eTrade data and handling responses.
- Updated CompanyProfileForm to integrate new fields and handle eTrade data.
- Created hooks for managing eTrade data fetching and error handling.
2026-06-20 10:27:41 +00:00
Marshal
54587a8c55 feat: add nationality selection and business license upload functionality
- Introduced a new step in the onboarding process to select company nationality (Ethiopian or Foreign).
- Updated API and service layers to handle nationality data for companies.
- Added support for uploading multiple business license files for each operational profile.
- Refactored company and forwarder forms to include new license upload step.
- Created a reusable RoleLicenseStep component for managing license file uploads.
- Implemented utility functions for phone number handling.
- Added migrations to update the database schema for nationality and business license files.
2026-06-20 08:28:01 +00:00
Marshal
ce8189d5fe feat: enhance onboarding forms with error handling and step persistence 2026-06-19 23:04:39 +00:00
Marshal
9f5d287139 feat: implement onboarding process with draft company and profile creation 2026-06-19 22:50:24 +00:00
Marshal
19dea313b7 feat: implement onboarding wizard enhancements and resume functionality 2026-06-19 22:24:59 +00:00
Marshal
ed91f817ff feat: enhance onboarding process and company profile management
- Updated CompanyInfoResponseDto to include company profile data in response.
- Enhanced ResponseExternalProfileDto to include active profile type and onboarding details.
- Added new fields to ExternalProfile entity for active profile type and onboarding status.
- Implemented onboarding wizard dialog in the frontend to guide users through the onboarding process.
- Introduced API endpoints for managing company profiles and onboarding steps.
- Created migrations to add new columns for active mode and onboarding status in the database.
- Added functionality to switch between operational modes (importer/exporter) and create profiles as needed.
- Improved user experience by ensuring onboarding is enforced for new users and those without completed profiles.
2026-06-19 22:07:58 +00:00
ghost2023
2b4da2397c style: ui fix to the auth shell 2026-06-19 16:02:12 +03:00
Nathnael
653f39ec65 feat: add the company profile support to the ui 2026-06-19 12:32:55 +00:00
Marshal
51e0d4897a update authentication pages with new layout and functionality 2026-06-17 17:49:16 +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
ghost2023
cf3db76bb1 type fixes 2026-06-16 15:13:11 +03:00
ghost2023
e0e6020020 fixes 2026-06-16 14:54:07 +03:00
Nathnael
e01a7faa20 style: auth pages fix 2026-06-11 08:27:14 +00:00
ghost2023
2250a468cb style: ui fixes 2026-06-11 09:24:06 +03:00
Nathnael
38b3f747fb style: enhance UI components for New Booking page and Step Indicator 2026-06-10 11:07:02 +00:00
Nathnael
97ed1c4b85 fix the layout style 2026-06-10 09:03:33 +00:00
Nathnael
f423fc2e6f style: update 2026-06-10 08:48:05 +00:00
ghost2023
4566033046 style: ui revamp 2026-06-09 09:27:14 +03:00