Commit Graph

4701 Commits

Author SHA1 Message Date
marshal
1e67034968 Merge pull request #1329 from Tria-plc/freight_feature/usermanagement
feat(freight): offer built-train wagons per boarding yard on multi-ya…
2026-08-18 11:28:32 +03:00
Marshal
c723b660e2 feat(freight): offer built-train wagons per boarding yard on multi-yard consists 2026-08-18 08:27:18 +00:00
Nathnael Wondisha
983cc02e50 Merge pull request #1328 from Tria-plc/freight/nati-2
fix: vite env issue
2026-08-18 10:32:05 +03:00
Nathnael
2f293e4ae4 fix: vite env issue 2026-08-18 07:28:42 +00:00
Abubeker Yasin
db319d25ce Merge pull request #1327 from Tria-plc/alpha
fix: ( supplementary-charges ) pay in the selected method's currency,…
2026-08-18 10:22:49 +03:00
Abubeker Yasin
a9eac93fa3 fix: ( supplementary-charges ) pay in the selected method's currency, add CAC Bank and CBE 2026-08-18 10:16:59 +03:00
Hagernesh Tadesse
8e78b335b2 Merge pull request #1326 from Tria-plc/eims-integration
Eims integration
2026-08-17 21:18:37 +03:00
Hagernesh
e67ccbb9cd fix(eims): stop sending our internal fee-basis tag as MoR's ItemList Unit
Confirmed live 2026-08-17 on INV-20260817-00008: MoR rejected the
document with a SCHEMA ERROR on ItemList[0].Unit — 'PER_CONTAINER'
(from the line's own metadata.unit) fails MoR's enum
(LTR/MTR/101/PCS/ROL/MTS/PKG/SET/KLG), its 8-char max, and its
^[A-Za-z]{3,8}$ regex all at once.

line.metadata.unit is our own fee-basis tag (PER_CONTAINER/PER_TON/
PER_ITEM — how a charge is computed) and was never a MoR unit of
measure; the mapper was reusing the same field name for two unrelated
concepts. Every line now sends the single configured
EIMS_UNIT_DEFAULT instead of guessing a per-line value that doesn't
exist in MoR's vocabulary.
2026-08-17 18:10:55 +00:00
Hagernesh
7d8ab932c2 feat(eims): implement POST /v1/bulkCancel
New endpoint: POST invoices/eims/bulk-cancel, body { items: [{invoiceId,
reasonCode, remark?}] }. Same eimsCancel permission as single cancel — a
batch-scale version of the same irreversible-at-MoR action, not a new
capability.

Same local-eligibility doctrine as single cancel: an already-cancelled or
never-registered invoice is refused right here, no HTTP call, before it
gets a seat in the batch. Only genuinely eligible invoices go into the one
/v1/bulkCancel request; every outcome (local refusal or MoR's own
per-IRN result) is reported back independently — one invoice failing
never blocks the rest.

MoR's bulk response mixes success and error shapes in the same array,
disambiguated by Status (capital, error) vs status (lowercase, success)
— matched back to our invoices by IRN. Notably the bulk success shape
carries no cancellationDate at all, unlike single cancel.

Left out of this pass: bulkRegister. It's async (returns only a
conversationId immediately, results arrive via a webhook callback we
don't have yet) and needs manual counter/previousIrn management per
the collection's own docs — a materially different reservation model
than today's single-invoice TX1/TX2 pattern. Scoping that is a
separate, bigger piece of work.
2026-08-17 17:49:33 +00:00
Hagernesh Tadesse
8ed5642544 Merge pull request #1325 from Tria-plc/eims-integration
feat(eims): bake in a starter table of Ethiopia region/zone/woreda codes
2026-08-17 20:18:03 +03:00
Hagernesh
7946c16327 feat(eims): bake in a starter table of Ethiopia region/zone/woreda codes
EIMS_BUYER_REGION_CODES/WEREDA_CODES/CITY_CODES were hand-maintained,
empty-by-default env vars — every buyer from a not-yet-seen area
crashed filing until someone found the MoR code and redeployed.
Happened three times in one afternoon (2026-08-17): Somali region,
Fafan zone, Jigjiga woreda, even the Ethiopia country code were all
unset on the triaplc.com deployment.

Ethiopia's administrative divisions are fixed reference data, not
buyer-specific config. Added ethiopia-geo-codes.ts, a static table
(source: ethiopia_administrative_hierarchy_master.csv, supplied
2026-08-17 — a representative sample, not all ~1000 real woredas)
merged in as the fallback under the existing env vars, which still
win on a name collision — for a quick correction without a redeploy,
or a buyer profile spelled differently than the table (already hit:
DB has zone "Fafen", official spelling "Fafan").

Known limitation, documented in the file: zone/woreda names aren't
always unique nationwide (e.g. "North Shewa" is both an Amhara and
an Oromia zone) and Company stores region/zone/woreda as three
independent strings with no parent linkage, so a flat name map can't
always disambiguate. Only affects the optional City field — never
blocks filing, unlike Region/Wereda.
2026-08-17 14:13:16 +00:00
Nathnael Wondisha
b73939a768 Merge pull request #1324 from Tria-plc/freight/feat/element-chat
Freight/feat/element chat
2026-08-17 15:55:37 +03:00
Nathnael
7c6c894c78 Merge branch 'freight/nati-2' into freight/feat/element-chat 2026-08-17 12:53:39 +00:00
Nathnael
ab734aecc3 feat(chat): join users to rooms on sign-in 2026-08-17 12:53:08 +00:00
Nathnael Wondisha
ab2173e026 Merge pull request #1323 from Tria-plc/freight/nati-2
Freight/nati 2
2026-08-17 15:45:27 +03:00
Nathnael
7aa4405423 Merge branch 'dev' into freight/nati-2
Conflict in ClearanceDocumentsPage: this branch migrated the page to the
pill FilterBar, dev added filters to the Select stack it replaced. Kept
the FilterBar and carried dev's additions across as a "Booked by"
(customerKind) FilterDef plus the shipping-line search placeholder; dev's
startOfDayIso/endOfDayIso went away because dateRangeParams already does
that. The Ship icon import is needed by dev's shipping-line customer cell,
which merged cleanly on its own.
2026-08-17 12:43:35 +00:00
Nathnael
7143ba1040 feat(customers): notify marketing on returned changes, name actors in history
Three gaps on the backoffice customer detail page:

- Rejecting a change request or sending it back for correction notified
  nobody. Adds CompanyNotifierService.changeRequestReturned, which pings
  the customer desk with the reviewer, the outcome and the note. Marketing
  joins that desk via customers:view + customers:get_notification in the
  role preset — grants still come from the IAM UI, the preset only sets
  the default for new environments.
- submitted_by / reviewed_by / actor_id were stored but never resolved, so
  the History tab could say what changed but never who asked or who sent
  it back. Resolves them through a shared iam-user-name util (deduped from
  the private copy in contract-document-history.service) and renders
  "Requested by" / "Sent back to marketing by" lines. The
  changes_requested badge is relabelled to match the workflow.
- "View" opened an in-page modal one document at a time. Adds
  openFileInNewTab, which opens the tab inside the click gesture and fills
  it once the authenticated fetch resolves, and an "Open all" button that
  loops over the documents table so every file lands in its own tab.
2026-08-17 12:38:06 +00:00
Abubeker Yasin
e8e136193d Merge pull request #1322 from Tria-plc/alpha
fix: ( excess-baggage ) pay in the selected method's currency and rec…
2026-08-17 15:36:37 +03:00
Abubeker Yasin
fa16087a4a fix: ( excess-baggage ) pay in the selected method's currency and record settlement 2026-08-17 15:33:43 +03:00
Hagernesh Tadesse
9eb2dc6649 Merge pull request #1321 from Tria-plc/eims-integration
Eims integration
2026-08-17 15:12:43 +03:00
Hagernesh
0999bc0b8b fix(eims): a mapper failure after reservation also orphaned the block
toEimsInvoice/buildEimsContext sat outside the try/catch that calls
settleFailure — reservation happens (TX1), then request-building ran
unguarded, then submit() was the only thing actually wrapped. Any
exception during mapping (a validation error like an unmapped buyer
country, or a bug) skipped settleFailure entirely and left the
reservation permanently held: exactly the live incident just seen —
register 500'd, and every subsequent attempt on any invoice 409'd
'already in flight' until manually resolved.

Fix: the try block now starts right after reserve(), covering
request-building and submit() both. settleFailure's determinism
check is generalized to match — any error that is not an
EimsApiException is pre-wire and safe to release, not just
EimsConfigException (still labeled CONFIG; everything else pre-wire
is now labeled the new LOCAL kind). This is exhaustive by
construction: every error that actually touches the wire is already
normalized to EimsApiException inside EimsClientService.send()'s own
catch, so nothing outside that can be ambiguous.
2026-08-17 12:09:25 +00:00
Hagernesh
0464a44de4 fix(eims): a config error before signing must not block the whole system
settleFailure() treated any non-EimsApiException error as ambiguous
("might have reached MoR") and permanently blocked all further
filing until manually resolved. EimsConfigException (bad/missing
key, unparseable cert) is thrown by EimsSignerService before
EimsClientService.send()'s try/catch is even entered — by
construction it never reached the wire, so there is nothing
ambiguous about it.

This is exactly what happened live: a private-key parse failure
during the key/cert migration work reserved a counter, failed before
any HTTP call, and got treated as an unresolved in-flight submission
— blocking every other invoice from filing until someone manually
POSTs /eims/resolve.

Fix: EimsConfigException is now deterministic in settleFailure, same
treatment as a clean MoR rejection — both counters roll back, no
system-wide block, invoice marked FAILED (not UNKNOWN). Added a
CONFIG failure kind so the invoice's eimsLastError and the staff
alert both say plainly that the request never reached MoR, instead
of implying a MoR rejection.
2026-08-17 12:09:25 +00:00
Hagernesh Tadesse
bb86c2365a Merge pull request #1320 from Tria-plc/eims-integration
Add container size to Standalone container return
2026-08-17 14:05:29 +03:00
Hagernesh
c04859d333 fix(warehouses): add container size to standalone container-return form
Backend already accepted containerSize ('20'|'40') on
CreateEmptyContainerReturnDto and enforces one-40ft-or-two-20ft-per-wagon
via assertWagonLoad — the Standalone Return modal just never collected it.
Add a Container Type select and wire it into the submit payload.
2026-08-17 11:03:22 +00:00
Hagernesh
13f7bea590 feat(eims): accept private key/cert as raw PEM env vars
EIMS_PRIVATE_KEY / EIMS_CERTIFICATE — the PEM text pasted directly,
no encode/decode step at all. Precedence: raw PEM > base64 > path.

Motivated by the base64 path hitting a DECODER::unsupported error in
a live deployment with no way to tell whether the cause was transport
truncation, double-encoding, or an actually-bad file. Two fixes for
that class of problem together:
  - the raw-PEM var removes the encode/decode step entirely, so
    there's nothing left to corrupt in transit
  - a literal \\n (two chars) is unescaped to a real newline, for
    env stores that can't hold a literal line break
  - getPrivateKey() now checks the decoded bytes look like a PEM
    header before handing them to OpenSSL, so a still-bad value fails
    with byte count + safe preview instead of an opaque decoder error
2026-08-17 11:03:22 +00:00
Hagernesh Tadesse
13b0274da2 Merge pull request #1318 from Tria-plc/eims-integration
feat(eims): allow private key/cert as inline base64 env vars
2026-08-17 12:24:36 +03:00
Hagernesh
4a4b1981cb feat(eims): allow private key/cert as inline base64 env vars
EIMS_PRIVATE_KEY_BASE64 / EIMS_CERTIFICATE_BASE64, alternative to the
existing _PATH vars. Wins over the path when set; falls back to the
file otherwise. Neither var required at boot on its own — the
either/or check moved out of the flat REQUIRED_VARS list.

Lets a dockerized deployment receive the key/cert the same way it
already receives every other EIMS_* secret (plain env var into the
container) instead of needing a host bind mount into the container
filesystem.
2026-08-17 09:14:38 +00:00
marshal
76a1b98384 Merge pull request #1316 from Tria-plc/freight_feature/usermanagement
Enhance manual payment processing for USD and ETB invoices
2026-08-17 12:13:57 +03:00
Marshal
1ca7776143 Enhance manual payment processing for USD and ETB invoices
- Updated API documentation and summaries to reflect support for both USD and ETB invoices.
- Modified data structures to include trade direction for invoices.
- Adjusted UI components to accommodate manual payment confirmations and display relevant information.
- Implemented filtering options for currency in the manual payments worklist.
2026-08-17 09:13:09 +00:00
marshal
8490bb65ab Merge pull request #1314 from Tria-plc/freight_feature/usermanagement
fix issue
2026-08-17 11:02:06 +03:00
Nathnael
00bd1250ee feat: WIP element Chat intergration 2026-08-17 08:02:00 +00:00
Marshal
df488ebfaa chnages 2026-08-17 08:01:29 +00:00
marshal
88dd8894d1 Merge pull request #1312 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-08-17 10:57:20 +03:00
Marshal
c3c3d08a41 fix issue 2026-08-17 07:55:52 +00:00
Nathnael
339996d27f docs 2026-08-17 07:49:49 +00:00
Hagernesh Tadesse
899cdd17d6 Merge pull request #1311 from Tria-plc/eims-integration
Eims integration
2026-08-17 10:44:48 +03:00
Hagernesh
28c9dd93e0 feat(eims): seller identity enriched from e-Trade, cached (bootstrap only)
Ten EIMS_SELLER_* env vars were the only source of EDR's own seller identity,
duplicating data the platform already has via the same e-Trade lookup used
for every customer company at onboarding. EimsSellerCacheService now enriches
it — but static config remains the source of truth: MoR validates
SellerDetails against its own taxpayer registry (rule 7017, already cleared
against the current static values), so e-Trade fills a field only when the
static value is blank, never overrides one already confirmed. The static
config is therefore the durable fallback, not the cache; an in-memory
snapshot lost on restart is harmless.

ETradeService has no request timeout of its own and no AbortController, so
the cache enforces one locally (stops waiting, doesn't cancel the request)
and de-duplicates concurrent refresh() calls into the same in-flight promise.
getSellerDetails() is fully synchronous — zero I/O — so live registration
never depends on e-Trade being reachable, at boot or per invoice.

VatNumber and Email stay on static config permanently — confirmed by reading
e-Trade's actual response shapes, neither field exists anywhere in what it
returns. Region/Wereda/City reuse the existing EIMS_BUYER_*_CODES maps rather
than adding seller-specific ones — the geography is objective, not
buyer-specific.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-17 07:43:04 +00:00
Hagernesh
09bc7c74d7 feat(eims): derive buyer City/Country from company profile, not global config
City: EimsMapperContext.buyerCity was declared but never wired anywhere —
always null, silently, for every buyer. No dedicated city column on Company;
derives from Zone via a new EIMS_BUYER_CITY_CODES map, same lookup mechanism
as Region/Wereda but optional (an unmapped zone resolves to null rather than
throwing) — MoR has already accepted a live filing with City null.

Country: previously a single flat EIMS_BUYER_COUNTRY_CODE applied to every
buyer regardless of Company.country. Now reads company.country, resolved via
a new EIMS_BUYER_COUNTRY_CODES name-to-code map; the flat env var becomes a
domestic-only fallback (applies only when country is empty/Ethiopia), so an
unmapped foreign buyer fails locally instead of silently filing as Ethiopia.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-17 07:43:04 +00:00
Hagernesh
562ebf485c fix(eims): thermal page-length used viewport height, not content height
scrollHeight is defined as the larger of an element's content height and its
own (viewport) height — for a receipt shorter than the placeholder 1123px
viewport, it silently returned the viewport height back, producing a
correctly-formatted but page-length-tall PDF with a huge trailing blank
strip below the real content. Found by actually rendering one and looking
at it, not caught by unit tests (buildThermalHtml is pure string output,
never exercises page.pdf() sizing).

Fix: use a deliberately tiny (100px) viewport height for the thermal
measurement pass, forcing content to overflow it so scrollHeight always
reflects the receipt's real height. Also round the computed mm value before
templating it into the CSS length string.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-17 07:43:03 +00:00
Abubeker Yasin
f038bd5b48 Merge pull request #1309 from Tria-plc/alpha
feat: ( backoffice ) gate Master Data pages and sidebar on view permi…
2026-08-17 10:24:28 +03:00
Abubeker Yasin
41080c1650 feat: ( backoffice ) gate Master Data pages and sidebar on view permissions 2026-08-17 10:22:52 +03:00
Abubeker Yasin
1626bc2a2c Merge pull request #1308 from Tria-plc/alpha
feat: ( backoffice ) hide Generate Ticket action without tickets:gene…
2026-08-17 10:05:06 +03:00
Abubeker Yasin
b453b81ff5 feat: ( backoffice ) hide Generate Ticket action without tickets:generate 2026-08-17 09:55:02 +03:00
Abubeker Yasin
70663f91da Merge pull request #1307 from Tria-plc/alpha
fix: ( payments ) restrict force-confirm to tickets:generate permission
2026-08-17 09:48:40 +03:00
Abubeker Yasin
b9e000729d fix: ( payments ) restrict force-confirm to tickets:generate permission 2026-08-17 09:47:36 +03:00
Marshal
52fb705a3e changes 2026-08-17 06:18:16 +00:00
Marshal
0e228bfd8d changes 2026-08-17 06:14:25 +00:00
marshal
90c268d821 Merge pull request #1304 from Tria-plc/dev
freight
2026-08-17 08:45:17 +03:00
marshal
a2c30a3c96 Merge pull request #1303 from Tria-plc/freight_feature/usermanagement
feat: enhance booking and scheduling features with shipping line supp…
2026-08-16 11:20:09 +03:00
Marshal
5ce5cbe29d feat: enhance booking and scheduling features with shipping line support and improved search functionality 2026-08-16 08:18:40 +00:00