Commit Graph

758 Commits

Author SHA1 Message Date
marshal
10364fe924 ass signature on the profile 2026-06-16 17:30:22 +03:00
Marshal
43a822a2ac Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 14:27:00 +00:00
Marshal
f6c28635bc add 'My signature' menu item to user menu 2026-06-16 14:26:17 +00:00
marshal
ea9b9c7346 Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 17:20:31 +03:00
Marshal
2d0f5ce6ee changes 2026-06-16 14:17:40 +00:00
marshal
2592e604fb changes 2026-06-16 16:57:15 +03:00
Marshal
524d3b6418 add reusable per-user contract signatures with profile prefill and approval 2026-06-16 13:34:04 +00:00
Marshal
62ce2dc64f Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 13:27:29 +00:00
Marshal
366a335f85 add reusable per-user contract signatures with profile prefill and approval 2026-06-16 13:26:45 +00: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
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
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
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
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
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
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
8520c3add3 fix: ( payment ) remove /100 2026-06-16 11:02:07 +03:00
yaschalew10
36b9545be2 Merge pull request #166 from Tria-plc/freight/feature/user_management
Freight/feature/user management
2026-06-16 10:54:45 +03:00
Abubeker Yasin
e5877e5339 fix: ( telebirr ) fix query status 2026-06-16 10:52:36 +03:00
Nathnael
adba481f23 feat: setted up the schedule in the booking 2026-06-16 07:18:59 +00:00
natib21
deae339887 fix 2026-06-16 07:17:21 +00:00
natib21
9157e144ad fix 2026-06-16 07:03:10 +00:00
natib21
ab99c96d62 fix 2026-06-16 07:01:25 +00:00
natib21
e7e3d61975 fix 2026-06-16 06:45:14 +00:00
natib21
8362bd94c5 fix 2026-06-16 06:39:59 +00:00
natib21
0198b545c9 fix 2026-06-16 06:35:51 +00:00
natib21
2b5db67bcd fix 2026-06-16 06:33:43 +00: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
natib21
d55cc78bd9 auth 2026-06-16 06:14:44 +00:00
Abubeker Yasin
ca9a67837c feat: ( payment ) implement d-money payment 2026-06-16 08:49:41 +03:00
marshal
1f0a642c03 Merge branch 'freight_feature/payments' of github.com:Tria-plc/edr-platform into freight_feature/payments 2026-06-15 16:16:33 +03:00
Marshal
87c6e12fbd fix allocate bookigns 2026-06-15 13:15:22 +00:00
marshal
9ee8262df8 Merge branch 'freight_feature/payments' of github.com:Tria-plc/edr-platform into freight_feature/payments 2026-06-15 15:02:25 +03:00
Marshal
28ad9363d1 tracking ui 2026-06-15 12:01:44 +00:00