Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 09:42:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
817 Commits 96 Branches 0 Tags
b82e4ac46eebe0f81b6041aee0f16efbeece5ac9
Commit Graph

581 Commits

Author SHA1 Message Date
Nathnael Wondisha
b82e4ac46e Merge branch 'dev' into freight/develop 2026-06-16 16:22:38 +03:00
Nathnael Wondisha
8777c5e26f Merge pull request #176 from Tria-plc/freight_feature/priority 
Freight feature/priority
 2026-06-16 16:19:55 +03:00
Nathnael Wondisha
ab3583d9ee Merge pull request #178 from Tria-plc/freight/fix/fixes 
Freight/fix/fixes
 2026-06-16 16:19:14 +03:00
Nathnael
edc63379bc fix: type error 2026-06-16 13:16:42 +00:00
Nathnael
9afa23cc47 feat: add dashboard summary endpoint and related DTOs for company KPIs 2026-06-16 13:11:56 +00:00
Nathnael
16f16e7d7e fix: booking payment 2026-06-16 13:11:56 +00:00
ghost2023
1d4edfc98c fix: type error to booking and edit booking 2026-06-16 16:11:07 +03:00
ghost2023
17dfce0d18 fixes 2026-06-16 15:45:58 +03:00
Abubeker Yasin
c56e0e794c Update payments.module.ts 2026-06-16 15:25:14 +03:00
Abubeker Yasin
1ed2c4d2f0 Merge branch 'dev' into feat/payment-microservice 2026-06-16 15:24:33 +03:00
marshal
f682adc5be feat(bookings): add endpoint to list customer's payable bookings 
Add GET /bookings/my endpoint that returns bookings owned by the authenticated user's company that are ready for payment (FULLY_EXECUTED, SELECTED_FOR_BATCH, AWAITING_PAYMENT) and not yet PAID. Add paymentStatus and excludePaymentStatus filters to repository query builder and filter DTO.
 2026-06-16 15:24:16 +03:00
Abubeker Yasin
e5850fbc63 feat: ( payment ) return url based on payment method 2026-06-16 15:23:32 +03:00
Marshal
64fad99bdc Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 12:21:16 +00:00
Marshal
52a9462228 add booking endpoint for featch payable bookings 2026-06-16 12:20:49 +00:00
ghost2023
cf3db76bb1 type fixes 2026-06-16 15:13:11 +03:00
ghost2023
e0e6020020 fixes 2026-06-16 14:54:07 +03:00
Stephanos A
eb97c11ddb Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-16 14:41:33 +03:00
Stephanos A
e03c11e7ee Build issues resolution 2026-06-16 14:41:27 +03:00
Stephanos A
fc5f77c817 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-16 14:40:09 +03:00
marshal
166067fbe7 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 14:29:17 +03:00
Nathnael Wondisha
c0b6869232 Merge pull request #172 from Tria-plc/freight/fix/fixes 
freight/fix/fixes
 2026-06-16 14:28:24 +03:00
ghost2023
e47340c2c8 fixes 2026-06-16 14:27:17 +03:00
marshal
3ca564f073 simplify build script and add tinymce dependency 2026-06-16 14:26:47 +03:00
Roba Boru
1a71f654b1 Update email and sms services 2026-06-16 14:21:56 +03:00
ghost2023
d6ad094d5a style: use mantine in settings page 2026-06-16 14:19:52 +03:00
ghost2023
b883c2d878 feat(onboarding): Implement company profile creation on Settings page 2026-06-16 14:10:31 +03:00
marshal
811225c05d Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 13:50:54 +03:00
marshal
23272f972a Merge pull request #171 from Tria-plc/freight_feature/priority 
Freight feature/priority
 2026-06-16 13:34:18 +03:00
Stephanos A
75c8423f50 Round trip journeys, feedback items, backoffice documentation 2026-06-16 13:33:03 +03:00
Marshal
3afccbd660 fix priority ui 2026-06-16 10:24:22 +00:00
ghost2023
b6ece994fc Merge branch 'freight/feat/booking-schedule' into freight/develop 2026-06-16 12:39:56 +03:00
Marshal
0778021d86 implement priority 2026-06-16 09:26:57 +00:00
Nathnael
7044dcfb43 payment ui for booking 2026-06-16 09:20:31 +00:00
marshal
00d1263f6d fix seed issue 2026-06-16 12:15:48 +03:00
Roba Boru
e9f06a52aa Merge remove changes 2026-06-16 12:14:35 +03:00
Roba Boru
ed49470249 Update telebirr callback page query paramaters 2026-06-16 12:14:10 +03:00
Abubeker Yasin
d65ea24354 Merge pull request #168 from Tria-plc/feat/payment-microservice 
Feat/payment microservice
 2026-06-16 12:09:13 +03:00
Abubeker Yasin
38175cbdb7 Update seed.ts 2026-06-16 12:07:38 +03:00
Marshal
7151bce288 changes 2026-06-16 08:56:52 +00:00
Nathnael
570c5ee125 feat: setted up the renewal contract 2026-06-16 08:51:23 +00:00
Nathnael
05da2ce27a feat: ui status updates 2026-06-16 08:29:40 +00:00
yaschalew10
0cac604510 Merge pull request #167 from Tria-plc/freight_feature/payments 
Freight feature/payments
 2026-06-16 11:13:03 +03:00
Roba Boru
db54a6870d Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-16 11:13:01 +03:00
marshal
dc5929e7ae changes 2026-06-16 11:11:32 +03:00
marshal
a0dbb4ca6f backoffice cleen up 2026-06-16 11:04:36 +03:00
Abubeker Yasin
06c7fea330 Merge branch 'feat/payment-microservice' into alpha 2026-06-16 11:02:41 +03:00
Nathnael
adba481f23 feat: setted up the schedule in the booking 2026-06-16 07:18:59 +00:00
Roba Boru
03c4ec33c3 Added get ticketing info by reference number endpoint and update payment methods to dynamic 2026-06-16 09:47:05 +03:00
yaschalew10
ba4ebee59d Merge pull request #165 from Tria-plc/freight/feature/user_management 
Freight/feature/user management
 2026-06-16 09:20:08 +03:00
natib21
a1244609ce auth 2026-06-16 06:17:36 +00:00