Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 13:10:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,927 Commits 96 Branches 0 Tags
d6938df66cb403f0bd50ecba5090502c81972dae
Commit Graph

404 Commits

Author SHA1 Message Date
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
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
Nathnael
0056dec924 style: clean up the invoice and setup event for warehouse. 2026-06-30 13:28:14 +00:00
Nathnael
fa3138f2ac refactor: migrate the warehouse invoice to use the central one 2026-06-30 12:54:04 +00:00
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
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
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
natib21
76b25bd214 fix 2026-06-30 02:33:29 +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
ce3584cd4a cfix payment 2026-06-29 15:41:00 +00:00
natib21
04bc9eded6 fix 2026-06-29 15:28:04 +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
Nathnael
f7f0f6aef3 fix: update the invoice generation to the new booking creation 2026-06-29 13:45:35 +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