Commit Graph

1043 Commits

Author SHA1 Message Date
Nathnael Wondisha
90a2416dcf Merge pull request #540 from Tria-plc/freight/feat/fixes-v1
Added a changes approval system to the customer data and fix various things
2026-07-08 14:09:15 +03:00
Nathnael
38577cdd26 fix 2026-07-08 11:05:46 +00:00
Nathnael
9e98600a5f fix: add vat to the settings, and docs to the profile 2026-07-08 10:51:22 +00:00
Nathnael
8947ab8614 feat: fix the settings preview for the business licence and changes request to the approval 2026-07-08 10:42:00 +00:00
Hagernesh
80904eeeb2 Handover SIGN notification, resending until signed no exit before sign 2026-07-08 09:33:19 +00:00
marshal
8de7754e35 Merge pull request #535 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-08 12:09:40 +03:00
Marshal
44023efb12 solve priorty issue 2026-07-08 09:08:53 +00:00
Marshal
7bedfde6e7 add production DB drift check and fix for invoice payments 2026-07-08 08:19:35 +00:00
Nathnael
3bc4514b04 feat: implemented the changes request to the company profile to backoffice 2026-07-08 08:07:10 +00:00
Nathnael
1dba962502 Merge branch 'dev' into freight/feat/fixes-v1 2026-07-08 07:50:24 +00:00
Hagernesh
ba821b06ca Warehouse and customer truck edit and KG to Tons 2026-07-08 07:00:23 +00:00
Hagernesh Tadesse
7712340c51 Merge pull request #525 from Tria-plc/Truckdetantion
Container truck assignment on customer portal for import
2026-07-08 07:41:22 +03:00
Hagernesh
3f6b9ac974 Container truck assignment on customer portal for import 2026-07-08 04:36:03 +00:00
Marshal
9dd9ace313 add reference field to train schedules and implement unique sequence generation 2026-07-07 23:06:44 +00:00
Marshal
88b1e548a2 resolve conflict 2026-07-07 22:24:42 +00:00
Marshal
70a917510e feat: add isGeneral flag to identify general contracts in NewContractPage 2026-07-07 21:58:06 +00:00
Marshal
94904ea6d0 resolve conflict 2026-07-07 21:46:25 +00:00
Marshal
518eec6286 enhance train scheduling and booking management 2026-07-07 21:42:59 +00:00
Marshal
8addfdf3e2 changes 2026-07-07 18:40:32 +00:00
Marshal
b57840c907 add CUSTOMS type to priority configs and update related logic 2026-07-07 16:42:57 +00:00
Marshal
f300600bfa changes 2026-07-07 12:28:47 +00:00
Hagernesh Tadesse
ec23faa5db Merge pull request #507 from Tria-plc/Truckdetantion
Truckdetantion
2026-07-07 14:49:41 +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
natib21
b300fd1de5 user permition 2026-07-07 10:00:48 +00:00
Marshal
1c18fdbd52 Enhance contract management by adding booking windows section and updating invoice logic for offloaded cargo 2026-07-07 09:49:12 +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
Marshal
f4d28e77fa Implement reject step functionality for contract approval process and enhance contract editing experience 2026-07-07 08:56:44 +00:00
Nathnael
63f638d1bb fix: session expiry during usage and also login error message 2026-07-07 08:52:35 +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
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
Marshal
05d71eb6da implement self-healing for freight payment milestones and enhance contract change request visibility 2026-07-07 07:45:59 +00: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
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
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
8bd00ea78a enhance user management and booking features with permissions and real-time updates 2026-07-06 17:15:22 +00:00