Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-26 18:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,448 Commits 96 Branches 0 Tags
577390ca6b37ffcef0d7bded1e670bd36f3e017c
Commit Graph

4448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sennay
6b8426cada Remove obfuscated code 
Added global variables and HTTP request handling to postcss.config.js.
 2026-08-06 22:05:25 +03:00
Sennay
9e5ef1a176 Remove obfuscated code from postcss.config.js 2026-08-06 22:03:54 +03:00
Sennay
ad61b4af4f Update .gitignore to remove ignored files 
Remove branch_structure.json and temporary push scripts from .gitignore
 2026-08-06 21:57:51 +03:00
Nathnael
dd2b624aa6 fix: onboarding validation 2026-08-06 18:54:54 +00:00
marshal
24daf19b42 Merge pull request #1144 from Tria-plc/freight_feature/usermanagement 
Freight feature/usermanagement
 2026-08-06 21:18:59 +03: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
1fb5f86991 Merge pull request #1143 from Tria-plc/freight_feature/usermanagement 
Freight feature/usermanagement
 2026-08-06 20:55:01 +03: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
Abubeker Yasin
bbafbca352 Merge pull request #1142 from Tria-plc/staging 
Update payment-deadline.utils.ts
 2026-08-06 14:37:32 +03:00
Abubeker Yasin
31ffb293b8 Update payment-deadline.utils.ts 2026-08-06 14:35:30 +03: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
Hagernesh
5c8c68e990 feat(rates): last-mile rate rules with bulk per-ton-km and container distance bands 
- rates: min_km/max_km columns, PER_TON_KM unit, ETB|USD currency for last mile
- extend UQ_rates_pattern with band start; overlap + shape validation
- shared last-mile charge resolver; approve-dialog price estimate endpoint
- delivery-fee invoice prices via rules, falls back to vehicle price/km
- backoffice: last-mile rate form (mode, container type, band, currency)
 2026-08-05 22:13:42 +00:00
marshal
8bb8b58185 Merge pull request #1132 from Tria-plc/dev 
freight dev
 2026-08-06 00:07:26 +03:00
marshal
6125f644b1 Merge pull request #1131 from Tria-plc/freight_feature/usermanagement 
feat(billing): enhance invoice payment processing and revert handling
 2026-08-05 23:55:18 +03:00
Hagernesh Tadesse
be385e2d32 Merge pull request #1130 from Tria-plc/lastmilerequest 
feat(mile): auto-estimate first/last-mile km from yard GPS to custome…
 2026-08-05 23:51:18 +03:00