marshal
73edf1fffa
Merge pull request #1152 from Tria-plc/freight_feature/usermanagement
...
fix wagon cancellation
2026-08-07 10:19:57 +03:00
Marshal
fc7f40a373
fix wagon cancellation
2026-08-07 07:18:12 +00:00
marshal
605b523a36
Merge pull request #1151 from Tria-plc/freight_feature/usermanagement
...
fix wagon cncellation
2026-08-07 10:00:21 +03:00
Marshal
296878cbde
fix wagon cncellation
2026-08-07 06:59:31 +00:00
SennayT
5145827feb
remove obfuscated code
2026-08-07 09:51:56 +03:00
marshal
19847277e7
Merge pull request #1150 from Tria-plc/freight_feature/usermanagement
...
fix wagon cncellation
2026-08-07 09:32:27 +03:00
Marshal
3db14bc09a
fix wagon cncellation
2026-08-07 06:31:25 +00:00
marshal
1a8659c697
Merge pull request #1149 from Tria-plc/freight_feature/usermanagement
...
fix wagon cncellation
2026-08-07 09:11:44 +03:00
Marshal
750dfc0720
fix wagon cncellation
2026-08-07 06:11:12 +00:00
marshal
0435157024
Merge pull request #1148 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-08-07 09:02:45 +03:00
Marshal
f2a5e89d9c
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement
2026-08-07 05:58:43 +00:00
marshal
66d15be6c3
Merge pull request #1147 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-08-07 08:55:04 +03:00
Marshal
17f6230129
fix wagon cancellation
2026-08-07 05:53:55 +00:00
Marshal
eb1349e846
fix wagon cncellation
2026-08-07 05:48:23 +00:00
Marshal
2321c9b893
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement
2026-08-06 23:49:48 +00:00
Marshal
0f4aa1128f
giveme git commit message 50 char
2026-08-06 23:48:06 +00:00
Marshal
29f7d05800
allow create inside lead window
2026-08-06 23:18:48 +00:00
Nathnael Wondisha
eff60885cd
Merge pull request #1146 from Tria-plc/freight/nati-2
...
Freight/nati 2
2026-08-07 01:41:42 +03:00
marshal
4a02eca537
Merge pull request #1145 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-08-07 01:35:39 +03:00
Marshal
96a4dd2e7f
exclude self from container clash
2026-08-06 22:34:53 +00:00
Marshal
1b8c7e4296
full change-booking flow for op revisions
2026-08-06 21:57:08 +00:00
Marshal
c61b66fd23
feat(bookings): show allocated wagons in portal
2026-08-06 20:40:28 +00:00
Nathnael
30b0eff603
feat: add faq, help, privacy policy and tos
2026-08-06 20:40:05 +00:00
Marshal
4eb0d56faf
feat(bookings): show allocated wagons in portal
2026-08-06 20:25:08 +00:00
Marshal
7db03ea347
customer cancel + revise edit flow
2026-08-06 20:16:48 +00:00
Marshal
9a50df2be3
add cancellation for booking
2026-08-06 20:05:13 +00:00
Nathnael
dd2b624aa6
fix: onboarding validation
2026-08-06 18:54:54 +00:00
Marshal
8e75ebf5dc
fix(cbe): update response for settled transactions to indicate Already paid
2026-08-06 18:18:02 +00:00
Marshal
9366dd9752
simplify response descriptions and improve error
2026-08-06 18:14:36 +00:00
Marshal
533de3cc93
fix(cbe): update response code from 3 to 2 for business failures in CBE integration
2026-08-06 17:50:27 +00:00
Marshal
3a2f1a46d6
fix(auth): resolve position-type permissions so GL staff can open clearance pages
2026-08-06 13:24:42 +00:00
Nathnael
ab7069e335
fix
2026-08-06 10:26:32 +00:00
Nathnael
23e756e0c7
fix(billing): ceil CBE invoice amounts to whole birr
2026-08-06 09:16:01 +00:00
Hagernesh Tadesse
eda3a82a6c
Merge pull request #1141 from Tria-plc/lastmilerequest
...
Lastmile Payment in Birr
2026-08-06 11:59:49 +03:00
Hagernesh
95fad6f095
Bulk (per ton per km) last-mile rates now carry From/To km bands like
...
container mode: the Add Rate dialog offers the multi-tier editor in both
modes, each tier is created as its own rate row, and overlapping bulk
bands are rejected. Pricing picks the tier whose half-open band holds
the trip km, falling back to the legacy bandless bulk rate.
2026-08-06 08:56:35 +00:00
Hagernesh
69f6fd36a9
fix(rates): render stored rate currency, default last mile to birr
...
The rate matrix currency cell hardcoded USD, so a last-mile rate
priced in ETB still displayed as dollars. formatCell now takes the
row and reads its currency code, falling back to USD.
Last-mile currency select gets defaultValue ETB (new generic
FormFieldDef.defaultValue for create-time pre-selection) and lists
ETB (Birr) first; USD stays selectable. Backend already persisted
and validated the chosen currency.
2026-08-06 08:56:35 +00:00
Hagernesh Tadesse
b4ac92e14e
Merge pull request #1140 from Tria-plc/lastmilerequest
2026-08-06 01:19:08 -07:00
Hagernesh Tadesse
a5b89a3aa0
Merge pull request #1139 from Tria-plc/dev
...
Merge pull request #1138 from Tria-plc/lastmilerequest
2026-08-06 11:15:43 +03:00
Hagernesh Tadesse
4199e48b42
Merge pull request #1138 from Tria-plc/lastmilerequest
...
Last mile Contract
2026-08-06 10:21:30 +03:00
Hagernesh
4786c896b5
feat(last-mile): customer-signed LM contract gates the advance invoice
...
Approval now snapshots the rate estimate and generates a last-mile
contract instead of invoicing immediately. The customer picks a delivery
date on the confirm form, then reviews and signs the contract in the
portal (saved signature or drawn); the signed PDF is stored as
LM_<CustomerName>.pdf and only then is the advance invoice issued.
Backoffice shows signature status and the contract download.
2026-08-06 07:11:23 +00:00
Hagernesh
4716aa14c3
feat(rates): multi-tier distance band entry in last-mile rate form
...
- tierList field type in rule-engine form dialog (add/remove rows,
overlap + open-ended validation, From km auto-continues)
- create submits one rate row per tier sequentially
- editing a band row keeps the single From/To/value form
2026-08-06 07:11:23 +00:00
Stephanos A.
ea9df4407e
Merge pull request #1137 from Tria-plc/alpha
...
Restored EXCESS_BAGGAGE as PaymentReferenceType
2026-08-06 08:58:41 +03:00
Stephanos A
3b49c49e42
Restored EXCESS_BAGGAGE as PaymentReferenceType
2026-08-06 08:54:21 +03:00
Nathnael Wondisha
7f90ccc1b5
Merge pull request #1135 from Tria-plc/staging
...
Staging
2026-08-06 08:37:23 +03:00
Stephanos A.
ad186ece57
Merge pull request #1136 from Tria-plc/alpha
...
Excess baggage payment link quick fix
2026-08-06 08:30:33 +03:00
Stephanos A
405ba908c3
Excess baggage payment link quick fix
2026-08-06 08:14:34 +03:00
Stephanos A.
15c4113b28
Merge pull request #1118 from Tria-plc/alpha
...
Alpha
2026-08-06 07:49:35 +03:00
marshal
5ba414db00
Merge pull request #1134 from Tria-plc/freight_feature/usermanagement
...
add metadata to ignore audit logging in payment events
2026-08-06 01:28:56 +03:00
Marshal
5933795116
add metadata to ignore audit logging in payment events
2026-08-05 22:26:04 +00:00
Hagernesh Tadesse
9bf776859f
Merge pull request #1133 from Tria-plc/lastmilerequest
...
feat(rates): last-mile rate rules with bulk per-ton-km and container …
2026-08-06 01:14:47 +03:00
