Commit Graph

266 Commits

Author SHA1 Message Date
marshal
1a3fa4bc5a Merge pull request #738 from Tria-plc/freight_feature/usermanagement
fix issue
2026-07-16 16:00:07 +03:00
Marshal
b50adc4666 fix issue 2026-07-16 12:59:28 +00:00
Abubeker Yasin
cc56ad7748 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-16 15:37:25 +03:00
Roba Boru
9161b24f98 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-16 13:54:22 +03:00
Abubeker Yasin
8b7f4dc563 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-16 12:06:00 +03:00
Abubeker Yasin
c6ca5ed8e8 add provider detail on the 2026-07-16 12:05:47 +03:00
Stephanos A
8a77f23701 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-16 11:43:14 +03:00
Stephanos A
a852b4e619 Seats report, supplementary change for bookings added 2026-07-16 11:43:04 +03:00
Abubeker Yasin
edbef5ccf2 add permissions 2026-07-16 11:01:31 +03:00
Marshal
234a74e812 implement empty-container return service: add return quantity handling, update related DTOs, services, and UI components 2026-07-15 22:48:04 +00:00
Marshal
fc44eee25e implement update train details feature: add DTO, service method, and UI modal for editing train name and run numbers 2026-07-15 20:14:39 +00:00
Marshal
19c9da28ae changes 2026-07-15 13:29:01 +00:00
Marshal
11771e5f92 remove reopen delay minutes from global rules and update related types
- Removed the  field from  and related components.
- Updated  to reflect the removal of the reopen delay input field.
- Modified  to include new train number fields:  and .
- Added  interface to manage active schedules with trade direction.
- Introduced  interface to track wagon shortages in bookings.
- Updated  logic to ensure consistent UI state representation.
- Created migrations to drop the  column and add  and  columns to the  table.
- Added tests for the new booking window display logic and wagon planning functionality.
2026-07-15 09:13:02 +00:00
Marshal
01459bd73c train 2026-07-14 13:11:38 +00:00
Marshal
b5a97d344a train 2026-07-14 13:10:00 +00:00
marshal
f7f311660b Merge pull request #672 from Tria-plc/freight_feature/usermanagement
train
2026-07-14 14:09:18 +03:00
Marshal
6d0cf50b4d train 2026-07-14 11:06:49 +00:00
natib21
e63e6a2fc0 fix ui 2026-07-14 08:47:46 +00:00
natib21
359d1091f7 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-14 07:20:19 +00:00
natib21
1d18248795 ui 2026-07-14 07:20:01 +00:00
Abubeker Yasin
87f530f1de Merge pull request #649 from Tria-plc/alpha
Alpha
2026-07-13 20:45:39 +03:00
Abubeker Yasin
d39bf43e45 refactor: ( payment ) increase timeout 2026-07-13 15:20:56 +03:00
Abubeker Yasin
bc3973cf0d fix:( payment ): make CAC Bank confirm work end-to-end and callback-safe 2026-07-13 12:11:47 +03:00
marshal
43cd0223aa Merge pull request #642 from Tria-plc/freight_feature/usermanagement
add wagon allocation snapshot to train schedules
2026-07-13 11:57:24 +03:00
Marshal
a4ccdb1173 add wagon allocation snapshot to train schedules 2026-07-13 08:56:06 +00:00
marshal
2e87e60776 Merge pull request #641 from Tria-plc/freight_feature/usermanagement
enhance booking and contract management features
2026-07-13 09:44:36 +03:00
Marshal
95b17b2729 enhance booking and contract management features
- Added support for comma-separated ops-clearance lifecycle statuses in contracts service.
- Display reference number in Upcoming Windows section if available.
- Updated badge label for document requirements in constants.
- Improved logic for identifying phased bookings in BookingClearanceWorkflowBanner.
- Introduced tabs in ReadonlyBookingView for better organization of booking details.
- Enhanced KeyFactsStrip to reflect the general nature of drawdown bookings.
- Updated status titles and descriptions for clarity in StatusHero and constants.
- Added contractKind field to IBooking interface for better identification of booking types.
- Created DocumentsTab component to manage and display all relevant documents for bookings.
2026-07-13 06:43:17 +00:00
marshal
3c3a7595a2 Merge pull request #640 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-13 08:13:01 +03:00
Marshal
84ba56f7d0 implement batch board notification system for schedule changes and updates 2026-07-12 12:01:05 +00:00
Marshal
4b7f6d2548 enhance contract and booking services with server-side search and validation improvements
- Added  parameter to  and  for server-side free-text search on contract reference, company name, and booking details.
- Introduced new validation errors in  for container clashes and space issues when creating bookings.
- Implemented paginated dropdown settings retrieval in .
- Updated  to fetch active yards using a new method that handles pagination.
- Enhanced  with a  method to fetch all records by walking through pages.
- Refactored  to support filtering and pagination in schedule listings.
- Improved  to return a paginated list of facilities.
- Updated UI components in  and  to utilize debounced search inputs for better performance.
- Added alerts in  to inform users about booking constraints related to splits and capacity.
- Enhanced  to display notifications for split bookings and capacity usage.
2026-07-12 10:51:31 +00:00
marshal
179471fc33 Merge pull request #622 from Tria-plc/freight_feature/usermanagement
change
2026-07-11 10:36:16 +03:00
Marshal
6695c5448e change 2026-07-11 07:34:24 +00:00
Nathnael
625b33733d Merge branch 'dev' into freight/feat/fixes-v1 2026-07-10 12:22:41 +00:00
Nathnael
f737e401b3 fix: the issue in the sheets file 2026-07-10 12:10:17 +00:00
Marshal
1abef3ce34 enhance shipment requests page with filtering and sorting options
- Added status and cargo filters to the ShipmentRequestsPage.
- Implemented date range filtering for preferred dates.
- Introduced sorting options for shipment requests based on submission date and reference.
- Enhanced the display of shipment request details, including status badges and customer information.
- Updated the UI to include a search input with clear functionality and improved layout for filters.

feat: add equipment return option in new shipment form

- Introduced a toggle for equipment return in the NewShipmentPage.
- Updated form schema to include  field for container contracts.
- Enhanced user experience with visual feedback on the equipment return selection.

fix: update booking DTO to include equipment return option

- Added  field to CreateBookingUnderContractDto for per-shipment override.
- Updated related types and schemas to accommodate the new field for better contract handling.
2026-07-10 10:32:41 +00:00
Marshal
e4429592d3 fix issues 2026-07-09 20:26:14 +00:00
Abubeker Yasin
d71ee6ed1b Update cac-bank.provider.ts 2026-07-08 23:33:31 +03:00
Abubeker Yasin
0f580e40f3 Update cac-bank.provider.ts 2026-07-08 23:11:28 +03:00
Hagernesh
73baf97045 delivery approve notification 2026-07-08 13:00:17 +00:00
Abubeker Yasin
93aa40569e Merge pull request #544 from Tria-plc/alpha
feat: ( notification ) add notification management
2026-07-08 15:58:46 +03:00
Abubeker Yasin
78bee6dbe3 Update cac-bank.provider.ts 2026-07-08 15:57:16 +03:00
Abubeker Yasin
43b3e49ffc Merge pull request #542 from Tria-plc/alpha
Update waafi.provider.ts
2026-07-08 15:08:09 +03:00
Abubeker Yasin
8b957e956e Update waafi.provider.ts 2026-07-08 15:06:54 +03:00
Nathnael
8947ab8614 feat: fix the settings preview for the business licence and changes request to the approval 2026-07-08 10:42:00 +00:00
Nathnael Wondisha
2c12f02862 Merge pull request #526 from Tria-plc/freight/feat/chat-app
feat: make the support require nothing
2026-07-08 08:41:08 +03:00
Nathnael
a817976db8 feat: make the support require nothing 2026-07-08 05:33:02 +00:00
Marshal
94904ea6d0 resolve conflict 2026-07-07 21:46:25 +00:00
Abubeker Yasin
08fe2bfac6 fix: ( telebirr ) remove hard coded private key 2026-07-07 23:38:40 +03:00
Marshal
b57840c907 add CUSTOMS type to priority configs and update related logic 2026-07-07 16:42:57 +00:00
Nathnael Wondisha
268511c7ff Merge pull request #511 from Tria-plc/freight/feat/chat-app
chat app support to the passenger with websocket and anonymous
2026-07-07 17:16:10 +03:00