Commit Graph

3408 Commits

Author SHA1 Message Date
marshalyordanos
15705d6b26 changes 2026-07-20 22:43:22 +03:00
marshalyordanos
8e74604a07 Fix CSS formatting for bookings table class to ensure proper styling and layout. 2026-07-20 22:35:01 +03:00
marshalyordanos
8aaccf3f36 Enhance BookingRequestsPage layout and styling 2026-07-20 22:10:48 +03:00
marshalyordanos
43df24142c Add container and contract information cards to booking detail views
- Integrated CompanyInfoCard, ContainersCard, and ContractInfoCard into ChangesRequestedView, DraftBookingView, and ReadonlyBookingView components.
- Updated utils to handle new booking detail types and improve container summary calculations.
- Enhanced ShipmentDetailsCard and ScheduleCard to utilize updated booking detail structure and display relevant information more effectively.
2026-07-20 21:55:17 +03:00
Marshal
26f73cbe5f chnages 2026-07-20 13:55:26 +00:00
Marshal
b90afadfba contrat nad booking modification 2026-07-20 12:24:58 +00:00
Marshal
eb532399d9 changes 2026-07-20 10:52:20 +00:00
Marshal
e22b336e8c Refactor clearance terminology to document approval across services and UI components 2026-07-20 07:46:38 +00:00
Marshal
771aa2a605 Add train deactivation feature and import train number management
- Introduced DEACTIVATED status for trains, allowing staff to park trains indefinitely.
- Implemented methods to deactivate and reactivate trains in the TrainBuilderService.
- Added UI components for train deactivation and reactivation in TrainBuilderDetailPage.
- Created a dropdown setting for admin-managed import train numbers, with corresponding migrations.
- Updated yard code length to accommodate soft-delete suffix.
- Enhanced train status handling to include DEACTIVATED state.
2026-07-20 07:04:23 +00:00
Marshal
ab355d0e16 Enhance cargo description handling in contract forms 2026-07-20 06:10:50 +00:00
Marshal
bac0fa7f48 changes 2026-07-20 05:51:21 +00:00
Marshal
8354804505 Merge branch 'main' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement 2026-07-20 03:07:42 +00:00
marshal
f672d66a92 Merge pull request #826 from Tria-plc/freight_feature/usermanagement
changes
2026-07-20 06:06:06 +03:00
Marshal
4969f62896 changes 2026-07-20 03:05:28 +00:00
Stephanos A.
13e9b1622b Merge pull request #825 from Tria-plc/quick-fix-main
Reports (overall, seats report, passenger export) updates
2026-07-20 00:42:46 +03:00
Stephanos A.
8d7a914ab7 Merge branch 'dev' into quick-fix-main 2026-07-20 00:42:25 +03:00
Stephanos A.
e683ed50b9 Merge pull request #824 from Tria-plc/quick-fix-main
Reports (overall, seats report, passenger export) updates
2026-07-20 00:39:59 +03:00
Stephanos A
c62491b236 Reports (overall, seats report, passenger export) updates 2026-07-20 00:37:10 +03:00
robiman
efa3c218fe Merge pull request #823 from Tria-plc/alpha
Include coach number to voucher
2026-07-20 00:22:00 +03:00
Roba Boru
3293040438 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-20 00:19:31 +03:00
Roba Boru
f5cbf512ea Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-20 00:17:32 +03:00
Stephanos A.
594e56b042 Merge pull request #822 from Tria-plc/quick-fix-main
Search schedule update
2026-07-19 23:58:35 +03:00
Roba Boru
c31a337a98 Include coach number to voucher 2026-07-19 23:58:14 +03:00
Stephanos A
57390647d8 Search schedule update 2026-07-19 23:57:16 +03:00
Stephanos A.
225f5df10e Merge pull request #821 from Tria-plc/quick-fix-main
Passenger list report filter updates
2026-07-19 22:53:18 +03:00
Stephanos A
8e84fcebd5 Passenger list report filter updates 2026-07-19 22:52:23 +03:00
robiman
903219eec1 Merge pull request #820 from Tria-plc/alpha
Fix price inconsistency
2026-07-19 22:50:41 +03:00
Roba Boru
a6e4f0538c Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-19 22:48:46 +03:00
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
Stephanos A.
d099222f4f Merge pull request #817 from Tria-plc/quick-fix-main
Quick fix main
2026-07-19 21:09:03 +03:00
Stephanos A
eb41f4bb5f Merge branch 'quick-fix-main' of github.com:Tria-plc/edr-platform into quick-fix-main 2026-07-19 21:03:27 +03:00
Stephanos A
264206b57a Passenger report updates 2026-07-19 20:58:00 +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