Stephanos A.
c5d26ddfb1
Merge pull request #509 from Tria-plc/alpha
...
Alpha
2026-07-07 15:48:30 +03:00
Stephanos A
222687f4ac
Build issues resolution
2026-07-07 15:46:46 +03:00
Stephanos A
1ee01a4c83
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-07 15:17:40 +03:00
Stephanos A
f424ca9f58
Package seat selection updates, round trip alternative trips updates
2026-07-07 15:17:25 +03:00
Abubeker Yasin
09bafdca57
Merge pull request #508 from Tria-plc/alpha
...
Alpha
2026-07-07 15:16:00 +03:00
Abubeker Yasin
fb72ae21df
Merge branch 'dev' into alpha
2026-07-07 15:14:07 +03:00
Abubeker Yasin
2398e24c1a
fix( dmoney ): make D-Money /go redirect
2026-07-07 15:12:16 +03:00
Hagernesh Tadesse
ec23faa5db
Merge pull request #507 from Tria-plc/Truckdetantion
...
Truckdetantion
2026-07-07 14:49:41 +03:00
Abubeker Yasin
5763a3946d
refactor: ( iam ) revert deleted EDR-branded OTP SMS messages
2026-07-07 14:40:01 +03:00
Hagernesh
25c9bdeecd
Export Load on train
2026-07-07 10:21:17 +00:00
Hagernesh
35ccf1bc95
truck type detantion
2026-07-07 10:02:43 +00:00
yaschalew10
501dbf7b0c
Merge pull request #506 from Tria-plc/freight/feature/first_mile_invoice
...
user permition
2026-07-07 13:02:07 +03:00
natib21
b300fd1de5
user permition
2026-07-07 10:00:48 +00:00
yaschalew10
03043bde7a
Merge pull request #505 from Tria-plc/freight/feature/first_mile_invoice
...
Freight/feature/first mile invoice
2026-07-07 12:09:45 +03:00
natib21
ffff212187
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-07 09:09:10 +00:00
natib21
00c5c4b67b
fix
2026-07-07 09:07:28 +00:00
marshal
2a8d514b98
Merge pull request #503 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-07-07 12:05:49 +03:00
Hagernesh Tadesse
5107d65100
Merge pull request #502 from Tria-plc/Truckdetantion
...
Truckdetantion
Truck Detention Cost added
Tiers and Rules applied integrated with last mile
Invoice generated
Detention UI completed and wired with the API endepoints
2026-07-07 11:57:45 +03:00
Marshal
f4d28e77fa
Implement reject step functionality for contract approval process and enhance contract editing experience
2026-07-07 08:56:44 +00:00
Hagernesh
48b36a2621
Merge remote-tracking branch 'origin/dev' into Truckdetantion
2026-07-07 08:49:20 +00:00
Marshal
75f30e2054
Add reject step functionality to contract approval process
...
- Implemented rejection handling in ContractApprovalStepsCard with a modal for rejection reasons.
- Updated useContractMutations to include rejectStep mutation.
- Added REJECT_STEP URL constant for API integration.
- Enhanced ContractClearanceDetailPage to utilize linkedBookingId for improved booking handling.
2026-07-07 08:46:31 +00:00
Hagernesh
392038852e
Truck detention on lastmile
2026-07-07 08:45:51 +00:00
yaschalew10
232e82fa01
Merge pull request #501 from Tria-plc/freight/feature/first_mile_invoice
...
Freight/feature/first mile invoice
2026-07-07 11:43:16 +03:00
natib21
5a7133b599
fix
2026-07-07 08:42:01 +00:00
natib21
fdd7b1711e
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-07 08:33:25 +00:00
natib21
811c1b7a54
fix icon
2026-07-07 08:24:18 +00:00
natib21
ba895e4ba4
add tracker
2026-07-07 08:19:30 +00:00
marshal
b3ea550b42
Merge pull request #500 from Tria-plc/freight_feature/usermanagement
...
run
2026-07-07 11:00:58 +03:00
Marshal
561d0b2344
run
2026-07-07 08:00:22 +00:00
natib21
66167e8ac5
fix
2026-07-07 07:55:15 +00:00
marshal
86c7e0cbe8
Merge pull request #499 from Tria-plc/freight_feature/usermanagement
...
implement self-healing for freight payment milestones and enhance con…
2026-07-07 10:51:23 +03:00
Abubeker Yasin
2f39ed6c5f
fix: ( iam ) allow re-registration of abandoned pending accounts
2026-07-07 10:51:02 +03:00
Marshal
05d71eb6da
implement self-healing for freight payment milestones and enhance contract change request visibility
2026-07-07 07:45:59 +00:00
Abubeker Yasin
4202c59eef
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-07 10:23:01 +03:00
Hagernesh Tadesse
ff0fa6bb9e
Merge pull request #498 from Tria-plc/Doublehandling
...
Doublehandling
2026-07-07 09:48:26 +03:00
natib21
75427ea63a
fix tracker
2026-07-07 06:39:02 +00:00
Hagernesh
24fa6ab83b
Doublehandling
2026-07-07 06:25:58 +00:00
marshal
a171cf1f96
Merge pull request #497 from Tria-plc/freight_feature/usermanagement
...
enhance booking and contract notification systems
2026-07-07 09:07:31 +03:00
Stephanos A.
323bc9fcca
Merge pull request #496 from Tria-plc/alpha
...
UAT - total fare amount display issues resolution
2026-07-07 08:52:42 +03:00
Stephanos A
30661a2699
Build issue resolutions
2026-07-07 08:52:00 +03:00
Stephanos A
ae0e48e6ed
UAT - total fare amount display issues resolution
2026-07-07 08:16:48 +03:00
Hagernesh
96b78fc72e
Login fixed — freight-api boots (PgBouncer search_path + migrations-table reconcile).
...
Invoice PDF styled (vector fallback, no Docker change).
Marshalling doc styled (table-aware fallback, portrait/landscape).
Load to Train tab — per-train arrived containers → multiselect → load onto wagons.
Yard/zone list filtered by freight type.
2026-07-06 21:09:56 +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
Hagernesh Tadesse
8b5ba8415f
Merge pull request #494 from Tria-plc/PertruckExit
...
Export Loading to train
2026-07-06 22:21:03 +03:00
Stephanos A.
22daeb7f17
Merge pull request #495 from Tria-plc/alpha
...
Alpha
2026-07-06 22:13:42 +03:00
Hagernesh
838895897d
Marshaling doc fix
2026-07-06 19:12:14 +00:00
Stephanos A
36055d0d82
Package booking new rules update, cascade delete option updates
2026-07-06 22:12:04 +03:00
Hagernesh
8785d992ab
export loading
2026-07-06 19:00:04 +00:00
Hagernesh
bc47a42e1e
export loading
2026-07-06 18:53:25 +00:00
marshal
7a9906279b
Merge pull request #493 from Tria-plc/freight_feature/usermanagement
...
enhance user management and booking features with permissions and rea…
2026-07-06 20:58:17 +03:00
