Commit Graph

174 Commits

Author SHA1 Message Date
yaschalew
47f87e8435 fix conflict 2026-07-03 17:31:29 +03:00
natib21
e881e8de84 fix 2026-07-03 14:21:46 +00:00
natib21
e14e02e7f2 fix 2026-07-03 14:07:43 +00:00
Hagernesh
01bd01cc05 approve-delivery exit-gate fix + Import Loading Confirmation frontend panel — done this session, not yet committed 2026-07-03 14:06:34 +00:00
marshal
7eb62a0ba2 Merge pull request #423 from Tria-plc/freight_feature/usermanagement
fix issues
2026-07-03 16:55:26 +03:00
Marshal
57d3752ea5 fix issues 2026-07-03 13:53:17 +00:00
natib21
782f4184ef fix 2026-07-03 13:49:55 +00:00
Hagernesh
e2867e3086 import loading backend 2026-07-03 13:47:45 +00:00
Marshal
52f48b688d fix issues 2026-07-03 13:40:10 +00:00
Nathnael
414c9610dc chore: migrate to otp table 2026-07-03 11:57:40 +00:00
natib21
b218179d72 :wqMerge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-03 09:10:31 +00:00
natib21
e4b0c73c63 fix fayda 2026-07-03 09:10:05 +00:00
marshal
01acd071cf Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2 2026-07-03 06:39:02 +03:00
Marshal
56de90892d Add booking window management and locomotive scheduling features
- Implemented migration to release stuck assigned locomotives.
- Added schedule window phases to train schedules.
- Created booking batch offers table for partial capacity bookings.
- Developed BookingSplitService to handle partial booking offers and splits.
- Introduced BookingWindowService to manage booking window lifecycle and transitions.
- Added BookingBatchOffer entity to represent offers made during booking splits.
- Enhanced locomotive options with warnings for scheduling.
- Created UpcomingWindowsSection component to display upcoming booking windows.
2026-07-03 03:36:06 +00:00
yaschalew
2b7e67b227 fix 2026-07-02 17:56:17 +03:00
natib21
b7da024968 fix 2026-07-02 14:37:38 +00:00
natib21
c2c29f0735 fix 2026-07-02 14:14:13 +00:00
natib21
1869790eab fix 2026-07-02 13:18:34 +00:00
natib21
e429a2cebf fix 2026-07-02 13:15:44 +00:00
natib21
64e346324b fix issue 2026-07-02 13:11:12 +00:00
hagiye
5af45c2643 Customer Truck Assignment and Portal Delivary Approval 2026-07-02 15:54:16 +03:00
natib21
58b3805d0b fix 2026-07-02 12:43:03 +00:00
natib21
ff7e20d2ee fix 2026-07-02 11:22:35 +00:00
marshal
7b3f9094ed changes 2026-07-02 13:02:33 +03:00
natib21
07abe9b679 fix 2026-07-02 08:51:21 +00:00
yaschalew
8b8a993953 fix conflict 2026-07-02 09:28:02 +03:00
hagiye
129448e437 frist mile receive to warehouse and last mile truck arrival integration 2026-07-02 01:08:37 +03:00
marshal
9c18d086d7 changes 2026-07-01 20:55:17 +03:00
hagiye
14a00af341 train gate pass, Telebirr and Wafi 2026-07-01 16:23:52 +03:00
marshal
612df8daff Enhance clearance milestone management and introduce new contract actions
- Added new milestones for 'Transit Permit Uploaded' and 'Export Transport Document Issued' in the clearance milestone catalog.
- Implemented methods in ClearanceMilestoneService to skip milestones and complete them with metadata.
- Updated ContractBookingService to check boundary conditions before booking creation.
- Introduced new endpoints in ContractsController for uploading customs declarations, advising duty, and handling various document uploads.
- Enhanced the UI to support new clearance actions and display relevant components based on milestone statuses.
2026-07-01 10:20:16 +03:00
Nathnael
8ab27a6721 feat: add expiration to invoice 2026-07-01 06:19:07 +00:00
Marshal
708bd75d1f enhance contract review and editing experience 2026-06-30 15:16:27 +00:00
Nathnael
fa3138f2ac refactor: migrate the warehouse invoice to use the central one 2026-06-30 12:54:04 +00:00
natib21
f436916c42 feat: complete maintenance tracking backend
Service/Controller/Module:
- scheduleMaintenanceAsync: schedule work
- recordMaintenanceCost: log expenses
- getUpcomingMaintenance: due items
- getVehicleMaintenanceStats: cost aggregation

Endpoints:
- POST /maintenance/schedules
- POST /maintenance/costs
- PATCH /maintenance/schedules/:id
- GET /maintenance/upcoming/:vehicleId
- GET /maintenance/history/:vehicleId
- GET /maintenance/stats/:vehicleId

Migration: idempotent maintenance tables creation

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 12:33:29 +00:00
Nathnael
228b840c26 Merge branch 'dev' into freight/feat/invoice 2026-06-30 11:26:32 +00:00
Nathnael
21cf24950d feat: add partial payment to match the warehouse invoice before migration 2026-06-30 10:50:43 +00:00
natib21
df6e417a56 feat: add fuel management system backend
- FuelPurchase entity: record fuel purchases with cost tracking
- FuelConsumption entity: monthly aggregation of fuel metrics
- FuelService: record purchases, calculate stats, efficiency
- FuelController: REST API for fuel operations
- FuelModule: integrated into app
- Migration: create fuel_purchases and fuel_consumption tables

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 10:07:13 +00:00
Nathnael Wondisha
fec235c433 Merge pull request #372 from Tria-plc/freight/fix/migrate-undo
fix
2026-06-30 08:39:57 +03:00
ghost2023
c299973bb0 fix 2026-06-30 08:38:27 +03:00
Nathnael Wondisha
b5a2bd537f Merge pull request #370 from Tria-plc/freight/fix/migrate-undo
fix
2026-06-30 08:32:29 +03:00
ghost2023
468ac8b28a fix 2026-06-30 08:31:26 +03:00
hagiye
831ac59a8e Merge branch 'dev' of github.com:Tria-plc/edr-platform into importhandover 2026-06-30 07:20:10 +03:00
hagiye
9f5c22c1ee Goods recieved notes and Booking delivery 2026-06-30 07:19:12 +03:00
natib21
14dde418f7 fix(migrations): check if tables exist before CREATE TABLE
Make invoices migration idempotent - skip table/index creation if they
already exist. Prevents 'relation already exists' errors on redeployment.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 03:55:57 +00:00
natib21
f9ef473cff fix(migrations): check pg_type before CREATE TYPE enum
PostgreSQL doesn't support IF NOT EXISTS on CREATE TYPE AS ENUM.
Query pg_type table to check if enum exists before creating.
Compatible with all PostgreSQL versions.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 02:45:37 +00:00
natib21
76b25bd214 fix 2026-06-30 02:33:29 +00:00
natib21
1c1e98960e fix 2026-06-30 02:24:52 +00:00
natib21
ec82f8eb9f fix(migrations): use CREATE TYPE IF NOT EXISTS for invoices enum
Allows migration to run when enum already exists in prod DB. Prevents
'type already exists' error on redeployment.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 02:22:09 +00:00
natib21
3ceacbe9a9 fix(migrations): use CREATE TYPE IF NOT EXISTS for invoices enum
Allows migration to run when enum already exists in prod DB. Prevents
'type already exists' error on redeployment.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2026-06-30 02:03:20 +00:00
marshal
97992da1b5 Merge pull request #351 from Tria-plc/freight_feature/contrat
Freight feature/contrat
2026-06-29 18:49:16 +03:00