Commit Graph

3377 Commits

Author SHA1 Message Date
Roba Boru
68cf5dbbd7 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-19 22:47:24 +03:00
Roba Boru
bb78c1880e Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-19 22:47:11 +03:00
Roba Boru
d43229528e Fix price inconsistency 2026-07-19 22:46:36 +03:00
Abubeker Yasin
2efd105a2d Merge pull request #819 from Tria-plc/alpha
fix: ( telebirr ) read transId from webhook for provider_txn_id
2026-07-19 22:37:39 +03:00
Abubeker Yasin
f48a4735c8 fix: ( telebirr ) read transId from webhook for provider_txn_id 2026-07-19 22:16:20 +03:00
robiman
38fc628df2 Merge pull request #815 from Tria-plc/alpha
Fix blocked seat count on booking result
2026-07-19 18:52:52 +03:00
Roba Boru
996c0d8896 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-19 18:51:41 +03:00
Roba Boru
ac2cbf7e7e Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-19 18:51:23 +03:00
Roba Boru
f57f8d4550 Fix blocked seat count on booking result 2026-07-19 18:50:37 +03:00
robiman
e62c9be31a Merge pull request #814 from Tria-plc/alpha
Fix migration
2026-07-19 18:30:01 +03:00
Roba Boru
1e08f98705 Fix migration 2026-07-19 18:29:23 +03:00
robiman
04215291ff Merge pull request #813 from Tria-plc/alpha
debug(passenger-api): expose Prisma error code in 500 response body
2026-07-19 18:21:38 +03:00
Roba Boru
1804fba5bb debug(passenger-api): expose Prisma error code in 500 response body
Adds prismaCode and prismaMeta fields to 500 responses so the exact
Prisma error code (P2022, P2023, etc.) is visible in curl/Swagger without
needing server log access. Temporary diagnostic aid.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-07-19 18:18:08 +03:00
robiman
bbb6056234 Merge pull request #812 from Tria-plc/alpha
fix(passenger-api): repair StopStatus enum values in deployed DB
2026-07-19 17:58:01 +03:00
Roba Boru
85cd6cdf2a fix(passenger-api): repair StopStatus enum values in deployed DB
The init migration created StopStatus with UPCOMING/APPROACHING/CURRENT/COMPLETED.
Migration 20260717000001 was an empty no-op file that claimed the rename was
"applied directly", but the ALTER TYPE RENAME VALUE SQL was never executed on
deployed environments. TripStopTime rows with status='UPCOMING' cause P2023
(PrismaClientKnownRequestError) on every search call that includes stopTimes.

This idempotent migration checks pg_enum before renaming so it is safe to run
whether or not the rename was previously applied.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-07-19 17:54:06 +03:00
Stephanos A.
7670bad793 Merge pull request #811 from Tria-plc/quick-fix-main
Passenger reports filter updates
2026-07-19 17:30:00 +03:00
Stephanos A.
723a5dcf92 Merge branch 'main' into quick-fix-main 2026-07-19 17:29:46 +03:00
Stephanos A
80915f94ec Passenger reports filter updates 2026-07-19 17:21:44 +03:00
robiman
a55ee7591e Merge pull request #810 from Tria-plc/alpha
fix: add partial WHERE clause to JourneySegment unique index migration
2026-07-19 17:15:40 +03:00
Roba Boru
df992eb794 fix: add partial WHERE clause to JourneySegment unique index migration
Without WHERE ("seatId" IS NOT NULL) the index creation fails in
environments that have JourneySegment rows with NULL seatId sharing
the same (scheduleId, departureStationId), which aborts the CI/CD
pipeline before the API server restarts.  Also adds the passenger.
schema prefix to match the DELETE statement above it.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-07-19 17:10:57 +03:00
Roba Boru
a07c9a6014 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-19 16:27:54 +03:00
marshal
9170c12a73 Merge pull request #808 from Tria-plc/freight_feature/usermanagement
add contract clearance detail page and enhance contract requests fil…
2026-07-19 13:25:44 +03:00
marshal
3ab7a09d2d Merge pull request #807 from Tria-plc/freight_feature/usermanagement
add contract clearance detail page and enhance contract requests fil…
2026-07-19 12:48:00 +03:00
Marshal
de816ea9d4 add contract clearance detail page and enhance contract requests filtering and ui fix 2026-07-19 09:47:36 +00:00
Marshal
5de1853c0d add contract clearance detail page and enhance contract requests filtering and ui fix 2026-07-19 09:37:48 +00:00
marshal
969caf90a1 Merge pull request #806 from Tria-plc/freight_feature/usermanagement
add contract clearance detail page and enhance contract requests fil…
2026-07-19 11:41:45 +03:00
Marshal
8816d50276 add contract clearance detail page and enhance contract requests filtering and ui fix 2026-07-19 08:41:03 +00:00
marshal
e2e111e663 Merge pull request #805 from Tria-plc/freight_feature/usermanagement
streamline booking detail components and enhance journey visualization
2026-07-19 10:07:48 +03:00
Marshal
17dc505d50 streamline booking detail components and enhance journey visualization
- Removed the BookingClearanceWorkflowBanner from ClearanceCard as the clearance progress is now integrated into the unified journey wizard.
- Eliminated the MilestoneTimeline component from DocumentsTab, consolidating customs progress into the JourneyWizard.
- Updated PageHeader to include a ContractReferenceLink for better navigation to contract details.
- Simplified ShipmentTrackingCard to focus on duty/tax payment slip upload, removing unnecessary milestone display.
- Integrated JourneyWizard component to visualize the booking journey, replacing the previous progress tracker.
- Enhanced ContractDetailPage to better categorize documents and improve user experience with clearer sections for profile, business license, clearance, and other documents.
- Introduced CSS for contracts table to manage column sizing and sticky headers effectively.
- Added ContractReferenceLink component for backoffice to link to contract details, ensuring consistent navigation across applications.
2026-07-19 07:06:58 +00:00
Stephanos A.
5069c2a5c1 Merge pull request #804 from Tria-plc/alpha
Reports update
2026-07-19 09:18:35 +03:00
Stephanos A
856d143874 Reports update 2026-07-19 09:16:36 +03:00
Stephanos A.
3c9a84a7a8 Merge pull request #803 from Tria-plc/alpha
Alpha
2026-07-19 09:10:02 +03:00
Stephanos A
20718d5b98 Build issue resolution 2026-07-19 09:08:30 +03:00
Stephanos A.
6115d7d782 Merge pull request #802 from Tria-plc/dev
Reports
2026-07-19 08:39:24 +03:00
Stephanos A.
3cf4a794f2 Merge branch 'alpha' into dev 2026-07-19 08:39:08 +03:00
Stephanos A.
b13400ea9b Merge pull request #801 from Tria-plc/quick-fix
Quick fix
2026-07-19 08:33:28 +03:00
Stephanos A.
e9590205f7 Merge branch 'dev' into quick-fix 2026-07-19 08:33:16 +03:00
Stephanos A.
455df87c5a Merge pull request #800 from Tria-plc/quick-fix
Report number updates
2026-07-19 08:20:22 +03:00
Stephanos A
93c583edf6 Report number updates 2026-07-19 08:07:59 +03:00
marshal
5ac48bf05b Merge pull request #799 from Tria-plc/freight_feature/usermanagement
add per-container handling options for hazardous, reefer, and return…
2026-07-18 22:22:46 +03:00
Marshal
0dead281ce add per-container handling options for hazardous, reefer, and return services
- Introduced new boolean fields (isHazardous, isReefer, isReturn) in UnitDraft and related interfaces to allow individual container handling options.
- Updated emptyUnit function to initialize these new fields.
- Modified GlCreateBookingForm to handle and display these options for each container.
- Adjusted calculations for hazardous, reefer, and return quantities based on the new handling options.
- Updated the schema for container units and booking container lines to include handling options.
- Added migration to support the new return flag in the database.
- Enhanced various components to reflect gross weight calculations, ensuring consistency across the application.
2026-07-18 19:20:45 +00:00
Roba Boru
03a22c372e Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-18 21:57:05 +03:00
Roba Boru
90b64bb6a6 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-18 21:53:35 +03:00
Roba Boru
7f0e28781c Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-18 21:53:16 +03:00
Roba Boru
c1858e76d4 Added stops departure and arrival datetime 2026-07-18 21:51:54 +03:00
Stephanos A.
5276b107c4 Merge pull request #798 from Tria-plc/quick-fix
Report figures correction updates
2026-07-18 20:17:51 +03:00
Stephanos A
4805a54bf7 Report figures correction updates 2026-07-18 20:16:24 +03:00
Stephanos A.
77f5ce656f Merge pull request #797 from Tria-plc/quick-fix
Build issue resolution
2026-07-18 19:53:28 +03:00
Stephanos A
554baf2595 Build issue resolution 2026-07-18 19:51:27 +03:00
Stephanos A.
3ebcfb03cb Merge pull request #796 from Tria-plc/quick-fix
Boarding icon added to dashboard
2026-07-18 19:13:05 +03:00