Commit Graph

2364 Commits

Author SHA1 Message Date
Abubeker Yasin
7bb3b3fa2a Merge pull request #465 from Tria-plc/alpha
Request to merge tourism package self booking and other updates
2026-07-05 14:20:29 +03:00
Marshal
3447394e32 add bookings management and settings 2026-07-05 10:22:58 +00:00
Marshal
dfdf7a025d fix(freight): guard booking-desk hours against overnight ranges
Review follow-ups on the window-close-hour feature:

- Reject windowCloseHour < windowOpenHour when saving global rules. The
  reopen engine (nextCycleOpensAt) assumes the daily desk runs within one
  EAT day; an overnight range would misroute a ready-time inside the span
  to the next morning. openHour === closeHour stays valid (24-hour desk).
- Derive the board projection's runaway cap from the real first-open →
  departure span over the minimum per-cycle advance, so a legitimate
  long-lead config is never silently truncated (was a flat 200).
- Document the open <= close precondition on nextCycleOpensAt and clarify
  the ready-before-open comment.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-05 09:07:21 +00:00
Marshal
93b8b69464 Add window close hour to booking desk configuration 2026-07-05 08:53:27 +00:00
Roba Boru
44306880e1 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-05 11:27:29 +03:00
Stephanos A
b6dbfe43e3 Documentations update 2026-07-05 10:18:59 +03:00
Stephanos A
aff0db6151 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-05 00:32:03 +03:00
Stephanos A
595be6e123 Tour package booking, app release, new endpoints, more updates and fixes 2026-07-05 00:28:06 +03:00
Hagernesh Tadesse
81ea676767 Merge pull request #464 from Tria-plc/CutomerTruckAssign
Cutomer truck assign
2026-07-04 12:57:51 +03:00
Nathnael Wondisha
0e6785177a Merge pull request #463 from Tria-plc/freight/feat/fixes-v1
fix
2026-07-04 12:54:14 +03:00
Hagernesh
5954f9a349 Merge remote-tracking branch 'origin/dev' into CutomerTruckAssign
:qa!
2026-07-04 09:53:28 +00:00
Nathnael
e910e6c5bd fix 2026-07-04 09:51:06 +00:00
Hagernesh
0a17018215 fix: don't block import train dispatch on loading confirmation
Loading (loaded-on-train step + per-booking loading status) no longer gates
dispatch/departure of a Djibouti import train. Per-booking loading status stays
tracking-only; a scheduled train dispatches once gatepass is granted, without
waiting on loading confirmation.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-04 09:50:25 +00:00
Hagernesh
d8da2e49cb fix 2026-07-04 09:42:09 +00:00
Nathnael Wondisha
0f9b030d8e Merge pull request #462 from Tria-plc/freight/feat/fixes-v1
Freight/feat/fixes v1
2026-07-04 12:35:51 +03:00
Hagernesh
00cd1fccf6 train loading for import 2026-07-04 09:33:07 +00:00
Nathnael
1d8fcaa4f1 Merge branch 'dev' into freight/feat/fixes-v1 2026-07-04 09:28:05 +00:00
Nathnael
66ffd51d5b style: update the multi file document ui 2026-07-04 09:27:38 +00:00
Nathnael
1c15a2117b feat: add verifcation on the document step 2026-07-04 09:27:22 +00:00
Yonas Tewabe
7a8e8dbc96 Update deploy.yml 2026-07-04 12:25:41 +03:00
marshal
4b9923d1e8 Merge pull request #461 from Tria-plc/freight_feature/usermanagement
changes
2026-07-04 12:23:43 +03:00
Marshal
9105e77439 changes 2026-07-04 09:21:16 +00:00
Nathnael
a70804da1c fix: gm step 2026-07-04 09:08:40 +00:00
marshal
ef2e8b6461 Merge pull request #460 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-04 12:04:03 +03:00
Marshal
e6328fc897 changes 2026-07-04 09:03:24 +00:00
Nathnael
b866b59478 feat: add etrade precheck 2026-07-04 09:02:49 +00:00
Hagernesh
5b4f624188 Per truck exit and per truck grn 2026-07-04 08:42:57 +00:00
Nathnael
a567218197 fix: document title 2026-07-04 08:41:51 +00:00
Nathnael
ee335e63ba style: sidebar ui 2026-07-04 08:39:16 +00:00
Marshal
c4a92c6482 changes 2026-07-04 08:23:08 +00:00
Nathnael
de87845f22 style: auth clean up 2026-07-04 08:22:18 +00:00
Hagernesh Tadesse
d6e4aa188f Merge pull request #459 from Tria-plc/CutomerTruckAssign
Cutomer truck assign

Fields: Truck Plate Number, Driver Name, Truck Type, Container Number to Load (now the Select I just wired) → Verify & Submit Assignment.
2026-07-04 10:59:48 +03:00
Hagernesh
8916182a62 Truck assign containers 2026-07-04 07:56:23 +00:00
marshal
4f31794abd Merge pull request #458 from Tria-plc/freight_feature/usermanagement
refactor: remove gate pass granting logic from clearance services and UI
2026-07-04 10:45:22 +03:00
Marshal
145240d3bd refactor: remove gate pass granting logic from clearance services and UI
- Removed the gate pass granting functionality from the BookingClearanceService and ContractClearanceService, replacing it with a new method to retrieve gate pass status from train schedules.
- Updated the ContractsController to eliminate endpoints related to gate pass granting.
- Refactored the UI components (ExportClearanceStepper and PhasedClearanceActionPanel) to reflect the new gate pass securing process, linking to the train scheduling interface instead.
- Cleaned up related constants and query hooks, removing unused code and references to the gate pass functionality.
- Adjusted types in the contracts to accommodate changes in the gate pass handling logic.
2026-07-04 07:43:03 +00:00
Hagernesh
e8e3e01f31 release order document fix 2026-07-04 07:36:53 +00:00
marshal
78b32fa605 Merge pull request #457 from Tria-plc/freight_feature/usermanagement
chages
2026-07-04 10:31:47 +03:00
Nathnael
619ffa5419 style(WIP): auth ui clean up. 2026-07-04 07:17:05 +00:00
Marshal
74118165c6 chages 2026-07-04 07:16:23 +00:00
Abubeker Yasin
2c98e672c1 Merge pull request #456 from Tria-plc/alpha
feat: ( iam ) OTP-gate registration via IAM signup + set-password
2026-07-04 10:12:56 +03:00
Abubeker Yasin
1c625cfb82 feat: ( iam ) OTP-gate registration via IAM signup + set-password 2026-07-04 10:10:26 +03:00
Hagernesh Tadesse
493af38ba2 Merge pull request #455 from Tria-plc/naming_convention
Handover customer sign
2026-07-04 10:04:23 +03:00
Nathnael
2f6f06b7c4 feat: add check validity to the user signup 2026-07-04 06:47:20 +00:00
Hagernesh
18f47481d7 Handover customer sign 2026-07-04 06:31:23 +00:00
marshal
8fbff3b91b Merge pull request #454 from Tria-plc/freight_feature/usermanagement
changes
2026-07-04 09:22:58 +03:00
Marshal
7058922987 changes 2026-07-04 06:19:35 +00:00
Nathnael
077512fdaf Merge branch 'dev' into freight/feat/fixes-v1 2026-07-04 05:54:26 +00:00
Nathnael
73ed58955e fix: refetch on focus 2026-07-04 05:53:46 +00:00
marshal
8084b411ca Merge pull request #453 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-04 08:00:26 +03:00
Marshal
f37078d51d update joins in repository services to use entity classes and enhance booking form with hazardous/reefer toggles 2026-07-04 04:59:51 +00:00