Commit Graph

251 Commits

Author SHA1 Message Date
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
Nathnael
9cd3ac42b4 feat: add the support to the client 2026-07-07 14:09:28 +00:00
Marshal
f300600bfa changes 2026-07-07 12:28:47 +00:00
Marshal
05d71eb6da implement self-healing for freight payment milestones and enhance contract change request visibility 2026-07-07 07:45:59 +00:00
Marshal
05b13e84a8 enhance booking and contract notification systems
- Added detailed logging for socket connection events in useBookingWindowSocket.
- Introduced new notification types for contract status and schedule updates.
- Updated notification visuals to include new icons for contract status.
- Enhanced notification href resolution for contract status and schedule updates.
- Implemented booking lifecycle notifier service for customer and staff notifications.
- Created contract notifier service for managing contract lifecycle notifications.
- Added end-to-end tests for booking window socket functionality.
2026-07-06 21:03:08 +00:00
Marshal
fed5f2f43f implement intercity booking management and booking window websocket integration 2026-07-06 13:28:21 +00:00
Nathnael
4800d1db35 Merge branch 'dev' into freight/feat/fixes-v1 2026-07-06 10:58:57 +00:00
Nathnael
298ad6227b style: ui improvement to the notification cards. 2026-07-06 10:54:43 +00:00
Nathnael
ca3a6072d8 style: improve the ui of the toast for notifications 2026-07-06 10:38:27 +00:00
Nathnael
abe26c2c60 feat: update the ui of the notification 2026-07-06 10:29:59 +00:00
Nathnael
68c60f9e61 feat: add destination to the notification 2026-07-06 09:02:18 +00:00
Marshal
1b92c57e23 refactor contract handling to support single route per contract and improve reference generation logic 2026-07-06 08:36:11 +00:00
Nathnael
01b92072aa chore: add notification to packages 2026-07-06 06:52:47 +00:00
Marshal
5192c6b949 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement 2026-07-05 22:22:34 +00:00
Marshal
57a504867b add contract reference to bookings list and enhance search functionality 2026-07-05 16:41:11 +00:00
Hagernesh
5954f9a349 Merge remote-tracking branch 'origin/dev' into CutomerTruckAssign
:qa!
2026-07-04 09:53:28 +00:00