Commit Graph

4340 Commits

Author SHA1 Message Date
Marshal
45216c5624 fix: update payment currency handling to require explicit selection by customer 2026-08-04 11:40:08 +00:00
Marshal
56697d8fc5 implement exchange settings management and fallback rate handling 2026-08-04 11:22:47 +00:00
Hagernesh Tadesse
e55978f1df Merge pull request #1106 from Tria-plc/edrmiles
feat(warehouses): filters, pagination and charts on container returns
2026-08-04 12:56:10 +03:00
Hagernesh
50fab52b1c feat(warehouses): filters, pagination and charts on container returns
Returned-containers list now uses the shared DataTable + useListControls
(search, inclusive date range, status select, pagination) instead of a
hand-rolled table. Adds two charts below the list — returns per day by
truck type and returns by status — driven by the same filtered rows.
Series colors validated for CVD separation and surface contrast.
2026-08-04 09:54:15 +00:00
marshal
5189325a3b Merge pull request #1105 from Tria-plc/dev
Freight Deployment
2026-08-04 12:52:08 +03:00
marshal
5d93017476 Merge pull request #1104 from Tria-plc/freight_feature/usermanagement
add custom contrat templates
2026-08-04 12:51:07 +03:00
Marshal
7c78a815eb add custom contrat templates 2026-08-04 09:48:49 +00:00
Nathnael Wondisha
fafa42f8a6 Merge pull request #1103 from Tria-plc/fixes
Fix: add the payment drain tail
2026-08-04 12:24:10 +03:00
Nathnael
f0fd15b139 Merge branch 'dev' into fixes 2026-08-04 09:00:52 +00:00
Nathnael
acd2cfbe8c feat: add drain tail to the payments 2026-08-04 08:59:33 +00:00
Nathnael
a20498fd77 chore: more it test 2026-08-04 08:57:25 +00:00
marshal
1352b46c33 Merge pull request #1102 from Tria-plc/freight_feature/usermanagement
change ewit images
2026-08-04 11:43:01 +03:00
Marshal
aac1175964 change ewit images 2026-08-04 08:42:15 +00:00
Yonas Tewabe
eb972862c1 Create sonar-project.properties 2026-08-04 11:24:43 +03:00
marshal
61c3faa23e Merge pull request #1101 from Tria-plc/freight_feature/usermanagement
allow the custoemr to book while the payment window time
2026-08-04 11:15:02 +03:00
Marshal
2eb752e8c2 allow the custoemr to book while the payment window time 2026-08-04 08:10:00 +00:00
Hagernesh Tadesse
266a3aaf00 Merge pull request #1100 from Tria-plc/edrmiles
fix(bookings): gate export carriage acceptance sheet on GRN receipt
2026-08-04 11:03:57 +03:00
Hagernesh
87b04973d8 fix(bookings): gate export carriage acceptance sheet on GRN receipt
The sheet attests EDR has taken custody. Export custody happens at
warehouse receipt, so the shared received-with-GRN gate now runs even
when wagons are already allocated. Receipt-row query also accepts the
legacy notes GRN fallback, matching the loading gate.
2026-08-04 07:59:39 +00:00
Abubeker Yasin
19ab3af1cb chore: ( iam ) update iam package 2026-08-04 10:56:47 +03:00
Abubeker Yasin
85d5faed34 chore: ( iam ) update iam package 2026-08-04 10:27:59 +03:00
Hagernesh Tadesse
9d5c529be4 Merge pull request #1099 from Tria-plc/edrmiles
CAS
2026-08-04 10:01:29 +03:00
Abubeker Yasin
58febda715 Merge pull request #1098 from Tria-plc/dev
merge staging to dev
2026-08-04 09:58:16 +03:00
Hagernesh
dfc7dfec5a fix(freight): filter container returns by returned-by truck type
Top Returned Containers table ignored the EDR/Customer tab because
the backend never persisted which truck type performed the return.
Added returned_by column + DTO/entity field, wired create payload to
send it, and filtered the table by the active tab.
2026-08-04 06:55:22 +00:00
Hagernesh
5c33ea90bd Truck operations inside each bookings 2026-08-04 06:55:21 +00:00
marshal
237bb067ad Merge pull request #1097 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-08-04 01:11:09 +03:00
Marshal
05450d4693 add reports module with controller, service, and repository 2026-08-03 22:08:16 +00:00
Marshal
5e8eec9539 add reports module with controller, service, and repository 2026-08-03 21:58:35 +00:00
Marshal
c3979b08b6 add reports module with controller, service, and repository 2026-08-03 21:43:23 +00:00
Marshal
e68bdb7a1a Enhance overview and train scheduling features
- Updated OverviewContractsTabPanel to include a new donut chart for freight type distribution.
- Modified OverviewOperationsTabPanel to improve data visualization with additional charts and refactored data handling.
- Introduced CreateScheduleWindowFields component for configuring booking windows in train scheduling.
- Added new API endpoints for allocation candidates and booking allocation in trainScheduling.service.
- Enhanced BookingRequestsPage to support allocation of paid bookings with a modal for selecting alternative dates.
- Updated QUERY_KEYS and URLS constants to accommodate new operations and features.
- Improved type definitions for overview and train scheduling to support new functionalities.
2026-08-03 21:06:59 +00:00
marshal
e56905de57 Merge pull request #1096 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-08-03 22:53:30 +03:00
Marshal
488c2465be feat: add per-ton cargo loading limits and update related services 2026-08-03 19:16:28 +00:00
Abubeker Yasin
6101a377f1 feat: ( bookings ) search backoffice bookings by provider transaction ID 2026-08-03 16:56:36 +03:00
Marshal
9afc281d21 fix issue: user trade access 2026-08-03 13:06:43 +00:00
Nathnael Wondisha
24de108aef Merge pull request #1095 from Tria-plc/fixes
chore: more test cases
2026-08-03 16:01:00 +03:00
Nathnael
3b45990023 chore: more test cases 2026-08-03 12:57:32 +00:00
Marshal
106b07a02b add staff user list endpoint 2026-08-03 12:32:10 +00:00
Nathnael Wondisha
229fc8e2db Merge pull request #1094 from Tria-plc/fixes
Fixes
2026-08-03 15:01:08 +03:00
Nathnael
72532f36cd fix: seeder 2026-08-03 11:58:33 +00:00
Nathnael
f103b51de5 feat: integration tests 2026-08-03 10:51:43 +00:00
marshal
4ecb1cf297 Merge pull request #1093 from Tria-plc/dev
freight deploy
2026-08-03 12:00:47 +03:00
marshal
3a7ed7d24b Merge pull request #1092 from Tria-plc/freight_feature/usermanagement
expose per-side facility flags
2026-08-03 11:59:11 +03:00
Marshal
c12108d953 expose per-side facility flags 2026-08-03 08:49:07 +00:00
mulish77
3c4dd07128 Merge pull request #1091 from Tria-plc/mulufeatures
Adding more detail messages for seat blocking
2026-08-03 11:39:09 +03:00
Mulu Mehari
8594d75164 Adding more detail messages for seat blocking 2026-08-03 11:37:16 +03:00
marshal
e7d1143c26 Merge pull request #1090 from Tria-plc/freight_feature/usermanagement
expose per-side facility flags
2026-08-03 11:22:08 +03:00
Marshal
dfd27efb6b expose per-side facility flags 2026-08-03 08:20:18 +00:00
Hagernesh Tadesse
6e0be9a8cd Merge pull request #1088 from Tria-plc/edrmiles
Edrmiles
2026-08-03 10:50:45 +03:00
Abubeker Yasin
eea12bb57a Merge pull request #1086 from Tria-plc/dev
Merge dev to alpha
2026-08-03 08:37:05 +03:00
Nathnael Wondisha
7635bf700f Merge pull request #1084 from Tria-plc/dev
staging
2026-08-03 08:03:40 +03:00
Hagernesh
6a62ece814 feat(train-scheduling): auto-place intercity cargo on wagons freed mid-corridor
Intercity bookings ride the wagons freed by earlier unloads (e.g. import
containers uncoupled at Dire Dawa). loadBooking now auto-allocates a
DOMESTIC booking onto on-train slots whose cargo has all departed —
greedy in consist order by capacity, container numbers copied for the
marshalling tally. Falls back to unallocated load when nothing is free.
2026-08-02 23:07:59 +00:00