Commit Graph

2876 Commits

Author SHA1 Message Date
Yonas Tewabe
2520f10807 Change runner configuration to dynamic selection
Updated the deployment configuration to use dynamic runner selection based on the GitHub reference name.
2026-07-14 12:09:13 +03:00
Abubeker Yasin
5faed7f51f Merge pull request #650 from Tria-plc/dev
merge dev to staging
2026-07-13 20:47:26 +03:00
Abubeker Yasin
87f530f1de Merge pull request #649 from Tria-plc/alpha
Alpha
2026-07-13 20:45:39 +03:00
Stephanos A
5f9063bdcb Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-13 18:58:59 +03:00
Stephanos A
860dd230ed Excess luggage rate UI restored to Tariff Rates page 2026-07-13 18:58:44 +03:00
Hagernesh Tadesse
7026e7f9cd Merge pull request #648 from Tria-plc/uienhancement
Warehouse zone occupancy heatmap
2026-07-13 16:25:01 +03:00
Abubeker Yasin
d39bf43e45 refactor: ( payment ) increase timeout 2026-07-13 15:20:56 +03:00
Hagernesh
4e8d35a7fb Warehouse zone occupancy heatmap
Visualize live per-zone occupancy on the warehouse detail page.
2026-07-13 12:09:43 +00:00
marshal
1034756bab Merge pull request #647 from Tria-plc/freight_feature/usermanagement
update train scheduling logic to clear trainScheduleId when unassigni…
2026-07-13 14:48:06 +03:00
Marshal
3fe4ea72ac update train scheduling logic to clear trainScheduleId when unassigning bookings 2026-07-13 11:47:27 +00:00
Abubeker Yasin
8424d3bc7f feat: ( payment ) wire CAC Bank OTP flow through passenger-api, portal, and backoffice 2026-07-13 14:13:31 +03:00
marshal
19fc480cc1 Merge pull request #646 from Tria-plc/freight_feature/usermanagement
improve group window
2026-07-13 14:08:10 +03:00
Marshal
9e748d6291 improve group window 2026-07-13 11:07:14 +00:00
Hagernesh Tadesse
b25655dc6f Merge pull request #645 from Tria-plc/uienhancement
Export Truck assignment
Added truck assignment between payment and Loading status
guarded assignment to maxmum number of truck to the number of containers
2026-07-13 13:10:11 +03:00
Hagernesh
f655289eec :Merge branch 'dev' of github.com:Tria-plc/edr-platform into uienhancement
Please enter a commit message to explain why this merge is necessary,
:qa!
2026-07-13 09:57:21 +00:00
Hagernesh
ae30441f07 Truck assignment for Export before loading and import after arrival 2026-07-13 09:53:33 +00:00
marshal
7001bf9c7f Merge pull request #644 from Tria-plc/freight_feature/usermanagement
remove Puppeteer from docker
2026-07-13 12:30:27 +03:00
Marshal
55bc36742b remove Puppeteer from docker 2026-07-13 09:29:35 +00: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
61cc4fab00 Merge pull request #643 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-13 12:11:12 +03:00
Marshal
a31f6216ce Puppeteer PDF rendering by adding necessary dependencies and skipping Chrome download 2026-07-13 09:09:39 +00:00
Marshal
93884a43e8 Puppeteer PDF rendering by adding necessary dependencies and skipping Chrome download 2026-07-13 09:02:04 +00: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
Yonas Tewabe
11acc9785e Update deploy.yml 2026-07-13 10:20:51 +03:00
Yonas Tewabe
c846bd04ed Simplify runs-on property in deploy workflow
Updated the 'runs-on' property to use 'self-hosted' directly for both jobs.
2026-07-13 10:20:16 +03:00
Abubeker Yasin
594dd76ab7 feat: ( payment ) implement d-money 2026-07-13 09:51:17 +03: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
e7e5b93ffc add customs clearing filter and enhance clearance documents page for non-customs contracts 2026-07-12 14:14:21 +00:00
yaschalew10
ce43613425 Merge pull request #639 from Tria-plc/freight/feature/user_management_UI
Freight/feature/user management UI
2026-07-12 15:07:27 +03:00
yaschalew
312d4a1a01 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-12 15:04:28 +03:00
Marshal
84ba56f7d0 implement batch board notification system for schedule changes and updates 2026-07-12 12:01:05 +00:00
yaschalew
3159722ad3 reset url fix 2026-07-12 14:59:48 +03: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
robiman
3c0dae3aef Merge pull request #638 from Tria-plc/alpha
Fix booking widget
2026-07-11 17:20:12 +03:00
Roba Boru
6ff04a35dc Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-11 17:14:34 +03:00
Roba Boru
a5f4ced260 Fix booking widget 2026-07-11 17:14:09 +03:00
robiman
3b053c58fa Merge pull request #637 from Tria-plc/alpha
Update booking widget text
2026-07-11 16:43:27 +03:00
Roba Boru
b0ce0142cc Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-11 16:41:04 +03:00
Roba Boru
2be33306f5 Update booking widget text 2026-07-11 16:40:40 +03:00
robiman
e93fa0f515 Merge pull request #636 from Tria-plc/alpha
Fix voucher and payment on booking detail page
2026-07-11 16:26:13 +03:00
Roba Boru
3ce866f3f0 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-11 16:22:04 +03:00
Roba Boru
40d380a26a Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-11 16:21:49 +03:00
Roba Boru
66f258ca4c Fix voucher and payment on booking detail page 2026-07-11 16:21:29 +03:00
Stephanos A.
cbcceb7e3b Merge pull request #635 from Tria-plc/alpha
Package link updates
2026-07-11 16:00:04 +03:00
Stephanos A
481fa4c872 Package link updates 2026-07-11 15:57:28 +03:00
Stephanos A.
2ccaf69cd8 Merge pull request #634 from Tria-plc/alpha
Alpha
2026-07-11 15:49:35 +03:00
Stephanos A
df3d8f3c35 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-11 15:46:19 +03:00