Commit Graph

232 Commits

Author SHA1 Message Date
Hagernesh Tadesse
f0eb96d2f9 Merge pull request #426 from Tria-plc/naming_convention
Naming convention no digit or symbol allowed
2026-07-03 17:45:18 +03:00
Hagernesh
44317a6bbc Naming convention no digit or symbol allowed 2026-07-03 14:39:47 +00:00
yaschalew
47f87e8435 fix conflict 2026-07-03 17:31:29 +03:00
natib21
c2535bec5e fix 2026-07-03 14:14:35 +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
Hagernesh
bf5b0b5dc8 approve-delivery exit-gate fix + Import Loading Confirmation frontend panel — done this session, not yet committed 2026-07-03 14:03:02 +00:00
Marshal
57d3752ea5 fix issues 2026-07-03 13:53:17 +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
Nathnael
3925a11dd4 feat: add invoice to customer detail on backoffice 2026-07-03 07:21:19 +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
marshal
fc5d49f34c Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2 2026-07-02 21:15:45 +03:00
Marshal
8d056c5014 finalize gl flow for import 2026-07-02 18:15:16 +00:00
marshal
d4561b948a Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2 2026-07-02 21:02:22 +03:00
Marshal
dd47068a4b finilize gl flow for export 2026-07-02 17:55:59 +00:00
yaschalew
2b7e67b227 fix 2026-07-02 17:56:17 +03:00
natib21
c2c29f0735 fix 2026-07-02 14:14:13 +00:00
natib21
d8f1ed8899 fix issue 2026-07-02 13:44:19 +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
58b3805d0b fix 2026-07-02 12:43:03 +00:00
marshal
7b3f9094ed changes 2026-07-02 13:02:33 +03: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
marshal
4fefe4f827 finilize gl 2026-07-02 12:06:17 +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
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
33d3aa9294 Enhance rule engine form to support currency formatting and suffix display 2026-06-30 15:18:30 +00:00
Marshal
708bd75d1f enhance contract review and editing experience 2026-06-30 15:16:27 +00: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
Marshal
a072f04450 Enhance contract and booking request handling 2026-06-30 02:20:32 +00:00
natib21
6fa315db0f fix 2026-06-29 14:45:22 +00:00
hagiye
9176df5e4b Marshaling document Receive Export and import handover to customer 2026-06-29 13:48:58 +03:00
marshal
1c01c792fc merge conflict 2026-06-29 12:45:40 +03:00
Marshal
0f7cac2b68 add booking request functionality for GENERAL customs contracts
- Create migration for booking_requests table with necessary fields and indexes.
- Implement BookingRequestRepository for database operations related to booking requests.
- Develop BookingRequestService to handle business logic for submitting, accepting, rejecting, and canceling booking requests.
- Create DTOs for creating booking requests and reviewing them.
- Define BookingRequest entity to map to the booking_requests table.
- Add UI components for managing shipment requests, including detail and list pages.
- Implement OperationDatePicker component for selecting available shipment days.
2026-06-29 09:30:44 +00:00
hagiye
d55f9312bf Marshaling document Receive Export and import handover to customer 2026-06-29 12:24:14 +03:00
Marshal
aeb5e0046e implement Global Logistics booking process for customs contracts and enhance contract document handling 2026-06-29 08:08:10 +00:00
Marshal
947dcbed3d ui on new contrat page 2026-06-28 23:39:35 +00:00
Marshal
47c91cad03 feat: enhance locomotive creation and management with optional code generation and default max pull weight 2026-06-28 23:02:40 +00:00
Marshal
506b269207 update booking process for customs clearance contracts, allowing customers to create bookings post-clearance finalization 2026-06-28 21:47:40 +00:00
Marshal
f45d260c53 enhance contract clearance details with service type and customs information 2026-06-28 21:34:06 +00:00