yaschalew
86090d5c37
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:19:09 +03:00
natib21
7d85f5dc2e
fix
2026-07-02 14:18:53 +00:00
yaschalew
8f152466e8
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:14:31 +03:00
natib21
c2c29f0735
fix
2026-07-02 14:14:13 +00:00
yaschalew
86b1534ed4
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 16:56:04 +03:00
yaschalew
fb8dcb0217
fix
2026-07-02 16:55:51 +03:00
natib21
7f6c9c6313
fix
2026-07-02 13:55:08 +00:00
Marshal
f77e4d150b
Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2
2026-07-02 13:44:50 +00:00
ghost2023
2c5e553d7c
Merge branch 'dev' into freight/feat/fixes-v1
2026-07-02 16:43:16 +03:00
ghost2023
df60c4750e
fix: warehouse query
2026-07-02 16:32:35 +03:00
Marshal
860af20e0d
Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2
2026-07-02 13:29:10 +00:00
ghost2023
b75a3ab54b
fix: first-mile error
2026-07-02 16:25:45 +03:00
Marshal
fe40d9f4be
update import gl flow
2026-07-02 13:24:39 +00:00
ghost2023
79c3293a72
fix: booking paid trigger
2026-07-02 16:18:46 +03: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
ghost2023
4098b5476f
fix(temp): invoice no for the telebirr
2026-07-02 15:37:49 +03:00
natib21
a0f4de05f8
log full error
2026-07-02 12:37:02 +00:00
Nathnael
787da1ccc0
chore: fix the invoice event
2026-07-02 12:35:43 +00:00
natib21
ff7e20d2ee
fix
2026-07-02 11:22:35 +00:00
Nathnael
03740ee719
fix: types isses
2026-07-02 11:09:25 +00:00
Marshal
7d3eb39625
fix error
2026-07-02 10:40:31 +00:00
natib21
4519a1d75d
fix
2026-07-02 10:33:32 +00:00
yaschalew
10e442deb1
fix
2026-07-02 13:18:49 +03:00
Marshal
adddb24033
add public to InternalPaymentController
2026-07-02 10:16:58 +00:00
marshal
7b3f9094ed
changes
2026-07-02 13:02:33 +03:00
Nathnael Wondisha
e874de25fe
Merge pull request #397 from Tria-plc/feight/fix/ui-ux-issues
...
Feight/fix/UI ux issues
2026-07-02 12:49:07 +03:00
Nathnael
41fc0cabdf
fix: duplicate invoice
2026-07-02 09:44:56 +00:00
Nathnael
5aafa436c1
fixes
2026-07-02 09:38:14 +00:00
hagiye
ad9f9de7a8
Truck Assign by customer plus Handover signature on portal
2026-07-02 12:32:18 +03:00
Nathnael
63937db32b
fix: update the updateStatus iss
2026-07-02 09:22:25 +00:00
marshal
56bb75c9a8
fix transi permit file upload
2026-07-02 12:22:07 +03:00
marshal
4fefe4f827
finilize gl
2026-07-02 12:06:17 +03:00
natib21
07abe9b679
fix
2026-07-02 08:51:21 +00:00
ghost2023
1c012ce1e2
refactor(payment): centralize invoice processing with detailed tracking and configurable logging
2026-07-02 11:47:35 +03:00
yaschalew
54b2114e7f
fix issue
2026-07-02 11:28:56 +03: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
ghost2023
2f79178496
fix: booking invoice issue
2026-07-01 16:11:47 +03:00
ghost2023
aef868bc40
fix: the invoice status syncing with booking payment window
2026-07-01 15:46:13 +03:00
ghost2023
7e96fa65b9
feat: rm the hardcoded invoice types
2026-07-01 15:10:04 +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
94982d3c5a
feat: setup pdf on the central billing
2026-07-01 06:25:24 +00:00
Nathnael
8ab27a6721
feat: add expiration to invoice
2026-07-01 06:19:07 +00:00
marshal
ccd5d6de31
Implement contract document download functionality and enhance clearance review status checks
...
- Added methods to assert clearance reviewable, finalizable, and uploadable statuses in the ContractClearanceService.
- Introduced a new endpoint in ContractsController for downloading contract PDFs.
- Implemented download functionality in the contracts service for both backoffice and portal applications.
- Updated UI components to include download buttons for contract PDFs in relevant pages.
- Enhanced contract request and view pages to support contract document downloads.
2026-07-01 07:27:53 +03:00
marshal
7654b18385
Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat
2026-07-01 05:45:46 +03:00
Marshal
28c1089ce6
Remove estimated shipment date from contract forms and related components
2026-07-01 02:42:05 +00:00
marshal
dc55ebda29
Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat
2026-06-30 18:23:56 +03:00
