Commit Graph

4533 Commits

Author SHA1 Message Date
marshalyordanos
9aae132dd4 feat: add shipping line companies management
- Implement ShippingLineCompaniesService for registering and managing shipping line companies.
- Create ResendActivationAction component for resending activation links to shipping lines.
- Develop ShippingLineCompaniesPage for listing and registering shipping lines with validation.
- Introduce shippingLineCompanies.service for API interactions related to shipping lines.
- Define types for shipping line companies, including registration and pagination.
- Add placeholder pages for shipping line portal, including home, bookings, help, invoices, and settings.
2026-08-13 08:54:20 +03:00
Marshal
e37f1e0807 fix issue 2026-08-12 17:19:06 +00:00
Marshal
ff3cee12e3 feat: fuel surcharge per lane and cargo type 2026-08-12 13:47:53 +00:00
Marshal
dd39c2be7c baseLiters 2026-08-12 13:29:31 +00:00
Marshal
ddcdcab518 merge conflict 2026-08-12 11:24:22 +00:00
Marshal
08c8b52f85 feat(portal): show payer account note and train number on booking windows 2026-08-12 11:23:19 +00:00
Marshal
f882104ed3 fix(train-scheduling): move loose wagons and locomotives on train merge 2026-08-12 11:23:10 +00:00
Marshal
3dbda745dd feat(contracts): lazily expire lapsed contracts and price fuel surcharge 2026-08-12 11:23:04 +00:00
Marshal
a02d24806b feat(rule-engine): add fuel surcharge rate trigger and cargo flag 2026-08-12 11:22:51 +00:00
Stephanos A.
56da01dc4c Merge pull request #1257 from Tria-plc/alpha
Backoffice build issue resolution
2026-08-12 13:50:44 +03:00
Stephanos A
057d68709b Backoffice build issue resolution 2026-08-12 13:44:52 +03:00
Nathnael Wondisha
f6be3f4e32 Merge pull request #1255 from Tria-plc/freight/nati-2
Freight/nati 2
2026-08-12 13:23:29 +03:00
Stephanos A.
ec2b381870 Merge pull request #1256 from Tria-plc/alpha
Overall report and segment tariff override updates
2026-08-12 13:23:00 +03:00
ghost2023
2a816912fc fix(freight-permissions): split company stamp from per-officer teeter permission 2026-08-12 13:18:29 +03:00
Stephanos A
9d19801535 Overall report and segment tariff override updates 2026-08-12 13:11:24 +03:00
ghost2023
02a264930b fix: consolidate stamp settings into single company stamp page 2026-08-12 13:04:18 +03:00
Nathnael
068ee49a9f style: invoice 2026-08-12 09:33:21 +00:00
Nathnael
bd9f7f354a feat(freight-api): enrich canonical request log line
Emit the request line as raw JSON on stdout (level/time/logger as fields)
instead of through Nest's console logger, whose prefix made it unparsable.

Collect data points via logCtx at the flow chokepoints: BaseRepository
writes (status changes, creates, deletes), invoice transitions, payment
intent lifecycle + outbound payment-service calls, booking/contract entry
state, review-note reasons, signatures and OTP verify outcomes.
2026-08-12 09:31:31 +00:00
Marshal
4efd65c105 feat: key bulk templates by trade direction
Bulk contract templates are now unique per (cargo type, trade direction,
customs option) instead of (cargo type, customs option). Intercity is
domestic and crosses no border, so it carries no customs variant:
with_customs stays null there, enforced by a check constraint.

Contract resolution already passed the trade direction through but the
bulk lookup dropped it, so one template served all three directions.

Container templates are unchanged — cargo_type_id is null on those rows,
which keeps them out of both the new index and the constraint.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-08-12 09:20:28 +00:00
marshal
b485e56a3e Merge pull request #1254 from Tria-plc/freight_feature/usermanagement
fix issue
2026-08-12 12:08:41 +03:00
Marshal
357aae7d82 fix issue 2026-08-12 09:08:08 +00:00
marshal
6e1bd6e8aa Merge pull request #1253 from Tria-plc/freight_feature/usermanagement
changes
2026-08-12 11:58:06 +03:00
Marshal
08bd110e5b changes 2026-08-12 08:56:47 +00:00
marshal
34fe55c8d7 Merge pull request #1252 from Tria-plc/freight_feature/usermanagement
fix issue
2026-08-12 11:44:22 +03:00
Marshal
61f261b8f0 fix issues 2026-08-12 08:42:42 +00:00
Nathnael Wondisha
8438a1ad5d Merge pull request #1251 from Tria-plc/freight/nati-2
Freight/nati 2
2026-08-12 11:42:35 +03:00
Nathnael
879f0b890d fix: file size limit 2026-08-12 08:42:16 +00:00
Marshal
325cbbc882 fix issue 2026-08-12 08:40:02 +00:00
Nathnael
abeb296157 fix: file upload seeder 2026-08-12 08:39:54 +00:00
robiman
73cd870a84 Merge pull request #1250 from Tria-plc/feature/report
Feature/report
2026-08-12 11:30:48 +03:00
Roba Boru
5249441422 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into feature/report 2026-08-12 11:27:05 +03:00
Nathnael
2a3a231665 fix: auto select ethiopian when chosing the coop option 2026-08-12 08:25:39 +00:00
Roba Boru
bdcdb4f047 Added financial report 2026-08-12 11:24:12 +03:00
Nathnael Wondisha
4652a95688 Merge pull request #1244 from Tria-plc/freight/nati-2
fix: an issue
2026-08-12 11:03:47 +03:00
Nathnael
85bdaa4afb Merge branch 'dev' into freight/nati-2 2026-08-12 08:03:10 +00:00
marshal
e2c4894154 Merge pull request #1249 from Tria-plc/freight_feature/usermanagement
fix issue
2026-08-12 10:57:50 +03:00
Marshal
86979afccd fix issue 2026-08-12 07:57:20 +00:00
Nathnael
03e498d6e8 fixes 2026-08-12 07:53:05 +00:00
marshal
f935d7edce Merge pull request #1248 from Tria-plc/freight_feature/usermanagement
fix issue
2026-08-12 10:50:57 +03:00
Marshal
bc7790392c fix issue 2026-08-12 07:49:31 +00:00
marshal
e5cbf74a10 Merge pull request #1247 from Tria-plc/freight_feature/usermanagement
fix issue
2026-08-12 10:34:04 +03:00
Marshal
4098d25ca1 fix issue 2026-08-12 07:33:13 +00:00
Nathnael Wondisha
21881a348d Merge pull request #1246 from Tria-plc/deps-fix
chore: deps
2026-08-12 10:29:53 +03:00
ghost2023
4bf1aa8053 chore: deps 2026-08-12 10:28:56 +03:00
marshal
7ef289efa3 Merge pull request #1245 from Tria-plc/freight_feature/usermanagement
chore: update package overrides in pnpm-workspace.yaml for dependencies
2026-08-12 10:19:19 +03:00
Marshal
4b8fea2d76 chore: update package overrides in pnpm-workspace.yaml for dependencies 2026-08-12 07:17:13 +00:00
Nathnael
d4767e0d06 fix: an issue 2026-08-12 07:12:04 +00:00
marshal
1060a6456a Merge pull request #1243 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-08-12 09:47:05 +03:00
Marshal
6434bb266c Merge branch 'dev' 2026-08-12 06:44:30 +00:00
marshalyordanos
5da36eb128 feat: add wagon usage computation and maintenance logging features
- Implemented  utility to calculate wagon usage metrics for train schedules.
- Created  for sending wagons to maintenance with optional notes.
- Added unit tests for train builder maintenance functionalities, including formatting train run labels and building maintenance notes.
- Developed  component for merging train schedules with detailed previews and reasons for merging.
- Introduced  component for selecting wagons with search functionality and selection limits.
- Created  for displaying and filtering audit logs, including detailed views of individual log entries.
- Added  for handling API interactions related to audit logs, including fetching logs and entity types.
2026-08-12 09:36:50 +03:00