Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-28 23:00:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,090 Commits 97 Branches 0 Tags
e14e02e7f2dc4a2512f7ec0ce36d8e4714859a0f
Commit Graph

818 Commits

Author SHA1 Message Date
natib21
e14e02e7f2 fix 2026-07-03 14:07:43 +00:00
natib21
782f4184ef fix 2026-07-03 13:49:55 +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
yaschalew
2b7e67b227 fix 2026-07-02 17:56:17 +03:00
natib21
eb5d8a7411 fix 2026-07-02 14:42:04 +00:00
natib21
2424e96e74 fix 2026-07-02 14:34:22 +00:00
natib21
e5fed081fc fix 2026-07-02 14:27:09 +00:00
natib21
7d85f5dc2e fix 2026-07-02 14:18:53 +00:00
Nathnael Wondisha
9d14414bf1 Merge pull request #410 from Tria-plc/freight/feat/fixes-v1 
fix: merge marker in invoice detial page
 2026-07-02 17:14:40 +03:00
natib21
c2c29f0735 fix 2026-07-02 14:14:13 +00:00
Nathnael
635d674bbe fix: merge marker in invoice detial page 2026-07-02 14:11:34 +00:00
natib21
34b87bbcee fix 2026-07-02 14:06:45 +00:00
natib21
d8f1ed8899 fix issue 2026-07-02 13:44:19 +00:00
Marshal
71894ae2d3 merge conflict 2026-07-02 13:43:07 +00:00
Marshal
860af20e0d Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2 2026-07-02 13:29:10 +00:00
Marshal
fec2a5d320 update import gl flow 2026-07-02 13:27:59 +00:00
hagiye
5af45c2643 Customer Truck Assignment and Portal Delivary Approval 2026-07-02 15:54:16 +03:00
natib21
c8b7d76073 fix 2026-07-02 12:50:49 +00:00
natib21
43a32f192f fix 2026-07-02 12:47:10 +00:00
natib21
58b3805d0b fix 2026-07-02 12:43:03 +00:00
natib21
657f3bd2ab fix 2026-07-02 12:39:47 +00:00
natib21
adde596289 fix 2026-07-02 11:32:16 +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
natib21
bab329e8e5 fix 2026-07-02 10:57:35 +00:00
natib21
e59a8f9802 fix delete api 2026-07-02 10:54:43 +00:00
natib21
f4f98575f1 fix error 2026-07-02 10:48:31 +00:00
ghost2023
79490d5979 fix 2026-07-02 13:44:20 +03:00
natib21
4519a1d75d fix 2026-07-02 10:33:32 +00:00
natib21
1c88bd8d68 fix 2026-07-02 10:27:01 +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
natib21
e0010695be fix 2026-07-02 09:41:52 +00:00
hagiye
ad9f9de7a8 Truck Assign by customer plus Handover signature on portal 2026-07-02 12:32:18 +03:00
marshal
56bb75c9a8 fix transi permit file upload 2026-07-02 12:22:07 +03:00
Nathnael
602453ff7a fix: invoice based payment on the client 2026-07-02 09:22:07 +00:00
marshal
4fefe4f827 finilize gl 2026-07-02 12:06:17 +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
ghost2023
43d1634823 feat: add payment modal to the invoice detail page 2026-07-01 16:11:32 +03:00
ghost2023
1754c18ede fix: apiconfig 2026-07-01 14:46:24 +03:00
ghost2023
fbda15bac8 Merge branch 'dev' into freight/feat/invoice 2026-07-01 14:40:58 +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
e5aab84f51 feat: ui changes and pdf setup on the clients 2026-07-01 06:56:58 +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