Commit Graph

111 Commits

Author SHA1 Message Date
marshal
0379de8147 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-24 02:49:24 +03:00
Marshal
2b4dfc6490 feat: implement staff price adjustment feature for bookings 2026-06-23 22:54:32 +00: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
Marshal
6485cbdd71 feat: implement document clearance workflow for bookings
- Added ClearanceCard component to display and manage clearance documents in ReadonlyBookingView.
- Introduced new API endpoints for clearance operations: getClearance, submitClearanceDocuments, and proceedToOperation.
- Created BookingDocumentReview entity and migration for document review status tracking.
- Developed GlClearancePage for Global Logistics to review and manage document submissions.
- Implemented utility functions for determining clearance setting codes based on trade direction and freight type.
- Added tests for booking transition clearance logic and clearance utility functions.
2026-06-23 21:33:34 +00:00
Marshal
080a08229d feat: enhance booking flow with multi-route support and onboarding document integration
- Introduced multi-route functionality in the booking process, allowing users to add additional routes for general contracts.
- Updated the StepDocuments component to display onboarding documents automatically attached to bookings.
- Refactored Step4Route to manage extra routes and quantities dynamically.
- Improved Step8Review to reflect the new onboarding document handling and updated submission readiness checks.
- Added new API endpoints and services for managing contract route lines and rejecting bookings.
- Removed the allowConsolidation field from the booking model as it is now managed by the system.
- Created migrations for the new contract route lines table and updated related entities.
2026-06-23 20:40:48 +00: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
Marshal
b6d5047d27 feat: Implement general contract booking orders functionality
- Add DTOs for creating booking orders and viewing contract quantities.
- Create entities for booking orders and booking order lines.
- Implement service for managing general contract operations, including activation after payment and retrieving quantity lines.
- Develop UI components for contract detail and list pages, including order placement dialog.
- Integrate API service for booking orders, enabling listing and creating orders against contracts.
- Enhance contract status display and quantity pool visualization in the UI.
2026-06-20 19:31:51 +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
4a0085ef57 feat: refactor exchange rate handling by integrating new ExchangeService and removing CbeExchangeService 2026-06-20 09:22:21 +00:00
Marshal
421e0266bc feat(train-scheduling): implement day-level booking pool
- Added `unplaced` method in `BookingNotifierService` to log warnings for bookings that cannot be placed on any train.
- Introduced `getAvailableDays` method in `TrainSchedulingService` to retrieve distinct days with open departures for a given route.
- Created `AvailableDaysQueryDto` for querying available days based on origin and destination yards.
- Updated `TrainSchedulingController` to expose an endpoint for available days.
- Modified frontend components to support day-level booking, allowing customers to select only a day without pinning to a specific train.
- Removed references to train schedules in booking forms and review steps, emphasizing day selection.
- Added a database migration to create an index for efficient querying of bookings by route and day.
2026-06-18 14:12:46 +00:00
Marshal
bd0d90eddd Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-17 16:33:07 +00:00
Marshal
7eb6228d31 feat: add shipment tracking feature with live updates
- Implemented tracking functionality for bookings, allowing users to track their shipments in real-time.
- Added new API endpoints for fetching tracking data.
- Created a ShipmentTrackingModal component to display tracking information, including current status, checkpoints, and estimated arrival times.
- Enhanced the booking detail view to include tracking options for eligible bookings.
- Updated the train scheduling service to include scheduled departure and arrival times in the response.
- Introduced utility functions for managing tracking stages and statuses.
2026-06-17 13:23:40 +00:00
Abubeker Yasin
5d0812ade1 Merge pull request #201 from Tria-plc/feat/payment-microservice
Feat/payment microservice
2026-06-17 16:00:52 +03:00
Abubeker Yasin
6ecc19c69c Update waafi.provider.ts 2026-06-17 15:59:46 +03:00
Abubeker Yasin
4ba91400d6 Merge pull request #196 from Tria-plc/feat/payment-microservice
fix: ( telebirr ) fix webhook return types
2026-06-17 12:12:34 +03:00
Abubeker Yasin
1b6bc47026 fix: ( telebirr ) fix webhook return types 2026-06-17 12:04:00 +03:00
marshal
6d8eb65a36 Add TypeScript type annotations to Vite config and dedupe Mantine dependencies 2026-06-16 23:26:03 +03:00
marshal
9329e6ca57 Refactor payment type exports to separate types from enums in index 2026-06-16 23:08:27 +03:00
Nathnael Wondisha
b82e4ac46e Merge branch 'dev' into freight/develop 2026-06-16 16:22:38 +03:00
Abubeker Yasin
30fecc3627 fix ( telebirr ) remove booking ref from title 2026-06-16 15:33:03 +03:00
ghost2023
e47340c2c8 fixes 2026-06-16 14:27:17 +03:00
ghost2023
b6ece994fc Merge branch 'freight/feat/booking-schedule' into freight/develop 2026-06-16 12:39:56 +03:00
Nathnael
7044dcfb43 payment ui for booking 2026-06-16 09:20:31 +00:00
Abubeker Yasin
d65ea24354 Merge pull request #168 from Tria-plc/feat/payment-microservice
Feat/payment microservice
2026-06-16 12:09:13 +03:00
marshal
dc5929e7ae changes 2026-06-16 11:11:32 +03:00
Abubeker Yasin
8520c3add3 fix: ( payment ) remove /100 2026-06-16 11:02:07 +03:00
Abubeker Yasin
e5877e5339 fix: ( telebirr ) fix query status 2026-06-16 10:52:36 +03:00
Nathnael
adba481f23 feat: setted up the schedule in the booking 2026-06-16 07:18:59 +00:00
Abubeker Yasin
ca9a67837c feat: ( payment ) implement d-money payment 2026-06-16 08:49:41 +03:00
Abubeker Yasin
f3d892f68e Merge pull request #164 from Tria-plc/feat/payment-microservice
fix: ( telebirr ) redirect_url
2026-06-15 22:06:28 +03:00
marshal
0aed9824ae cac payemnt integration and cbe rate exchange webscrabing 2026-06-15 14:54:20 +03:00
Abubeker Yasin
96ec2923c2 fix: ( telebirr ) redirect_url 2026-06-15 14:35:14 +03:00
marshal
fe1bed8c4b payment integration 2026-06-15 11:09:58 +03:00
ghost2023
3e2e07bb5f feat(bookings): Implement data-driven service type selection and configuration 2026-06-15 09:57:00 +03:00
ghost2023
9aecbb6508 feat(booking): Implement train schedule selection and update booking data structures 2026-06-15 09:56:59 +03:00
ghost2023
6058b870a1 feat(train-scheduling): implement API and types for bookable schedules 2026-06-15 09:52:17 +03:00
Eyob T.
39e32f4e0a Merge pull request #154 from Tria-plc/alpha
Merge request for lock file and lint issues resolution
2026-06-14 15:36:39 +03:00
Stephanos A
9c7f42982f Lockfile and lint issues resolution 2026-06-14 15:29:37 +03:00
marshal
c03d0ef3ab Merge branch 'feat/payment-microservice' of github.com:Tria-plc/edr-platform into freight_feature/payments 2026-06-14 02:38:19 +03:00
Abubeker Yasin
c35b5089ce refactor: ( payment ) use rabbitmq for webhooks event 2026-06-13 20:19:23 +03:00
yaschalew10
9076664545 Merge pull request #142 from Tria-plc/freight/feat/ui-migration
UI migration Again
2026-06-12 15:24:46 +03:00
Abubeker Yasin
ef7b85c8cb feat: ( payment ) integrate the passenger to payment microservice 2026-06-12 11:47:11 +03:00
marshal
ef0abf1c41 auto allocation and batch managemnt, tracking the train 2026-06-12 11:42:46 +03:00
Marshal
cde3e462ba automate the schedule 2026-06-11 19:42:23 +00:00
Abubeker Yasin
2b430f8e76 feat: ( payment ) create payment microservice 2026-06-11 15:25:24 +03:00
Marshal
f85c13ce8c Merge branch 'freight_feature/schedule' of github.com:Tria-plc/edr-platform into freight_feature/schedule 2026-06-11 11:15:29 +00:00
marshal
10b011de8f merge conflict 2026-06-10 16:45:45 +03:00
Abubeker Yasin
3235567b41 feat( waafi ): wire Waafi HPP into passenger API 2026-06-10 16:23:33 +03:00
Abubeker Yasin
3f1a673356 Merge branch 'alpha' into feat/telebirr-integration 2026-06-10 13:22:47 +03:00