Nathnael
5ad4efd7eb
feat: add pdf to the central invoice system
2026-06-30 11:58:28 +00:00
Nathnael
7fa18b8ee7
fix: reference type in payment service
2026-06-30 11:54:43 +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
7b9cd88712
fix: correct fuel module TypeScript errors
...
- Use @InjectRepository decorators for proper dependency injection
- Fix BaseRepository initialization with Repository instance
- Remove unnecessary DataSource references
- Add proper type annotations to reduce handlers
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2026-06-30 10:08:56 +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
SennayT
3c5f5b5861
fix: add docker cache for pnpm installations
2026-06-30 09:54:59 +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
b142552f17
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/hot_fix
2026-06-30 03:46:26 +00:00
natib21
25e91c6d93
fix: comment out isPostPaymentCompleted column decorator
...
Column doesn't exist in DB yet. Commenting out @Column decorator
prevents TypeORM from trying to select non-existent column.
Fixes 500 QueryFailedError on first-mile/last-mile list endpoints.
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2026-06-30 03:33:54 +00:00
marshal
dd9a7e639a
console
2026-06-30 06:15:57 +03:00
Marshal
f51c015814
Enhance payment module
2026-06-30 03:13:18 +00:00
marshal
c501effc32
Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat
2026-06-30 05:52:59 +03:00
Marshal
9674c9394d
Update logging configuration to use TYPEORM_LOGGING environment variable
2026-06-30 02:52:19 +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
marshal
d05f634948
Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat
2026-06-30 05:22:10 +03: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
Marshal
a072f04450
Enhance contract and booking request handling
2026-06-30 02:20:32 +00:00
marshal
abce3da6ce
merge conflict
2026-06-30 05:17:56 +03: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
Nathnael
10cde2b2e3
fix
2026-06-29 19:44:40 +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
Marshal
d91389daac
cfix payment
2026-06-29 15:46:17 +00:00
Marshal
ce3584cd4a
cfix payment
2026-06-29 15:41:00 +00:00
natib21
04bc9eded6
fix
2026-06-29 15:28:04 +00:00
Marshal
c6979a97c2
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/contrat
2026-06-29 15:25:53 +00:00
natib21
d94b73fe02
fix
2026-06-29 15:09:34 +00:00
natib21
c728b249c2
fix
2026-06-29 14:48:47 +00:00
natib21
6fa315db0f
fix
2026-06-29 14:45:22 +00:00
Nathnael
31a2e93c49
fix: rm the hardcode false for general contract
2026-06-29 14:42:53 +00:00
Nathnael Wondisha
4cf8e89780
Merge branch 'dev' into freight/feat/invoice
2026-06-29 17:24:29 +03:00
natib21
7dba546254
fix
2026-06-29 13:59:51 +00:00
Nathnael
69955bc0e6
feat: setup the invoice backend
2026-06-29 13:53:32 +00:00
natib21
8b6b6ec737
fix
2026-06-29 13:52:54 +00:00
natib21
f2826f2b9b
fix
2026-06-29 13:49:01 +00:00
Nathnael
f7f0f6aef3
fix: update the invoice generation to the new booking creation
2026-06-29 13:45:35 +00:00
natib21
93ca1485c8
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice
2026-06-29 13:24:32 +00:00
natib21
0d8ed45256
fix
2026-06-29 13:24:01 +00:00
marshal
7179f75a70
Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat
2026-06-29 16:05:46 +03:00
marshal
69df391f90
Update payment service and API base URL for local development
2026-06-29 16:03:53 +03:00
Marshal
0783ee1635
Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat
2026-06-29 13:01:48 +00:00
Marshal
0b1e330459
add payemnt test
2026-06-29 13:00:55 +00:00
