Commit Graph

1536 Commits

Author SHA1 Message Date
ghost2023
cdc2592bc7 fix: script fial 2026-07-02 13:30:09 +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
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
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
ghost2023
1c012ce1e2 refactor(payment): centralize invoice processing with detailed tracking and configurable logging 2026-07-02 11:47:35 +03:00
yaschalew
db8ead322c Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/hot_fix 2026-07-02 11:29:27 +03:00
yaschalew
54b2114e7f fix issue 2026-07-02 11:28:56 +03:00
Abubeker Yasin
d6938df66c feat: ( iam ) add forgot and change password to passenger backoffice 2026-07-02 10:27:08 +03:00
Abubeker Yasin
448e64da02 feat: ( iam ) add Station Master and Ticket Officer roles with positions 2026-07-02 09:38:30 +03:00
yaschalew
8b8a993953 fix conflict 2026-07-02 09:28:02 +03:00
marshal
9c18d086d7 changes 2026-07-01 20:55:17 +03:00
Roba Boru
305e850073 Added tour package booking option 2026-07-01 20:45:40 +03:00
Roba Boru
5bfcde0c40 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-01 19:26:49 +03:00
Nathnael Wondisha
0d41d4bd20 Merge pull request #393 from Tria-plc/freight/feat/invoice
Freight/feat/invoice integration enhancement expiry,payment and booking
2026-07-01 16:18:09 +03:00
ghost2023
2f79178496 fix: booking invoice issue 2026-07-01 16:11:47 +03:00
ghost2023
43d1634823 feat: add payment modal to the invoice detail page 2026-07-01 16:11:32 +03:00
ghost2023
174df0b7aa chore: fix script and add seed company 2026-07-01 15:46:25 +03:00
ghost2023
aef868bc40 fix: the invoice status syncing with booking payment window 2026-07-01 15:46:13 +03:00
Stephanos A
b511da2821 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-01 15:40:33 +03:00
Abubeker Yasin
a1d6d09056 Merge pull request #392 from Tria-plc/alpha
Alpha
2026-07-01 15:30:56 +03:00
Abubeker Yasin
33d90df5a9 feat: ( dmoney ) create redirect page to dmoney 2026-07-01 15:29:49 +03:00
Stephanos A
924cce5716 More production clearances 2026-07-01 15:20:39 +03:00
ghost2023
7e96fa65b9 feat: rm the hardcoded invoice types 2026-07-01 15:10:04 +03:00
Stephanos A
103117d88b Production checklists, issue fixes 2026-07-01 15:04:38 +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
Nathnael Wondisha
a4b9cf68b5 Merge pull request #391 from Tria-plc/freight/feat/script
Freight/feat/script
2026-07-01 14:39:03 +03:00
ghost2023
b7be6d6229 feat: add the seed schedules 2026-07-01 14:37:47 +03:00
ghost2023
abdf459289 feat: add the seed contracts 2026-07-01 14:26:32 +03:00
Stephanos A
0015f645cf Coach edit related fixes 2026-07-01 13:38:08 +03:00
Stephanos A
74bdbecefd Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-01 13:32:09 +03:00
Stephanos A
4f1fc6c439 Route stops distance and other fixes 2026-07-01 13:31:31 +03:00
ghost2023
c88c5ee450 chore: setup script 2026-07-01 12:26:37 +03:00
Abubeker Yasin
8705b98407 Update dmoney-webhook.service.ts 2026-07-01 12:08:05 +03:00
Abubeker Yasin
3308c775e6 feat: ( fayda ) use platform-specific Fayda redirect_uri 2026-07-01 10:24:42 +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
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
Stephanos A
0db0d3af78 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-01 09:03:37 +03:00
Stephanos A
b50a386b25 UAT findings resolutions and enhancements 2026-07-01 09:03:09 +03:00
Roba Boru
6312e93686 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-01 08:01:19 +03:00
Roba Boru
ff27a82bc1 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-01 08:01:03 +03:00