Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 22:30:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,785 Commits 96 Branches 0 Tags
28c1089ce677cbfc5fc121b01b5a1f9dcbc1498c
Commit Graph

479 Commits

Author SHA1 Message Date
Marshal
28c1089ce6 Remove estimated shipment date from contract forms and related components 2026-07-01 02:42:05 +00:00
Marshal
708bd75d1f enhance contract review and editing experience 2026-06-30 15:16:27 +00:00
Marshal
f51c015814 Enhance payment module 2026-06-30 03:13:18 +00:00
Marshal
9674c9394d Update logging configuration to use TYPEORM_LOGGING environment variable 2026-06-30 02:52:19 +00:00
Marshal
a072f04450 Enhance contract and booking request handling 2026-06-30 02:20:32 +00: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
Marshal
c6979a97c2 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 15:25:53 +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
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
yaschalew
0d4587cf52 Merge branch 'freight/feature/last_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice 2026-06-29 15:26:54 +03:00
natib21
fc95d48d28 fix 2026-06-29 12:25:36 +00:00
marshal
4e632123c0 Merge pull request #340 from Tria-plc/freight_feature/contrat 
payemnt
 2026-06-29 15:21:01 +03:00
marshal
6685a3ba76 payemnt 2026-06-29 15:17:51 +03:00
natib21
aac790292b Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice 2026-06-29 12:15:53 +00:00
natib21
a64e531324 fix 2026-06-29 12:15:30 +00:00
yaschalew
75ff175538 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice 2026-06-29 15:09:20 +03:00
marshal
f958a7639a Merge pull request #336 from Tria-plc/freight_feature/contrat 
payemnt
 2026-06-29 15:08:50 +03:00
natib21
b22ab739db fix 2026-06-29 12:08:16 +00:00
marshal
09e1429c38 payemnt 2026-06-29 15:08:12 +03:00
marshal
1795bb8830 Merge pull request #335 from Tria-plc/freight_feature/contrat 
Freight feature/contrat
 2026-06-29 15:07:25 +03:00
marshal
b688a76550 payemnt 2026-06-29 15:05:50 +03:00
marshal
1491db304b payemnt 2026-06-29 15:04:01 +03:00
yaschalew10
db7f0cb601 Merge pull request #334 from Tria-plc/freight/feature/last_mile_invoice 
Freight/feature/last mile invoice
 2026-06-29 15:03:00 +03:00
natib21
5c36c09dae fix 2026-06-29 12:01:19 +00:00
Nathnael
662d96571e fix 2026-06-29 11:14:42 +00:00
natib21
835facc65a fix 2026-06-29 11:12:51 +00:00
Nathnael
c37e8acfdc Merge branch 'dev' into freight/feat/invoice 2026-06-29 10:58:12 +00:00
hagiye
9176df5e4b Marshaling document Receive Export and import handover to customer 2026-06-29 13:48:58 +03:00
Nathnael
2551f76f8a fix: reference type in payment and billing 2026-06-29 09:50:29 +00: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
Nathnael
4be4286fbf feat: rewired up the billing and payment with the booking 2026-06-29 09:25:46 +00:00
hagiye
d55f9312bf Marshaling document Receive Export and import handover to customer 2026-06-29 12:24:14 +03:00
Nathnael
9cd24d9b51 feat(WIP): Wire up the invoice with the booking. 2026-06-29 08:29:07 +00:00
Nathnael
36711eace4 chore: type updates on the billing service 2026-06-29 08:28:12 +00:00
Marshal
aeb5e0046e implement Global Logistics booking process for customs contracts and enhance contract document handling 2026-06-29 08:08:10 +00:00
Nathnael
1da5af94ab feat: scoped the payables by type 2026-06-29 07:32:42 +00:00
Nathnael
5bad245ce8 feat: setup billing services 2026-06-29 07:11:52 +00:00
Marshal
4be4cc9054 feat: implement first and last mile trucking pricing logic in booking and contract services 2026-06-28 23:54:51 +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