Eyosiyas Girma
7c5e7408b0
Merge branch 'freight/develop' into freight/feature/telebirr-integration
2026-06-08 16:35:18 +03:00
Eyosiyas
3a66242f8b
working on dmoney
2026-06-08 16:29:20 +03:00
Eyosiyas
a1940c4901
telebirr out in the payment
2026-06-08 11:49:50 +03:00
marshal
675975bc08
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/change_to_mantine
2026-06-08 10:05:48 +03:00
marshal
88df20be6b
change price logic on the ,rule engine ui, auto generate the contrat
2026-06-08 10:04:23 +03:00
ghost2023
e152e7e986
fix: the request approaval pricing ui
2026-06-06 11:45:53 +03:00
Abubeker Yasin
1d11cbda4d
feat: ( payment ) create payment microservice
2026-06-05 21:29:55 +03:00
Nathnael Wondisha
4a0dee9b7b
Merge pull request #97 from Tria-plc/freight/feat/booking-pricing
...
Booking request approval ui
2026-06-05 15:02:24 +03:00
ghost2023
2760e715c7
feat: add more statuses to the booking deailt page and added handling of request approval
2026-06-05 11:40:44 +03:00
ghost2023
f77dd54390
feat: setup the recent booking endpoint and ui fixes
2026-06-05 11:36:13 +03:00
marshal
d226d7ef22
booking flow,summtion, approval, contract, mock payemnt and integration to back office, and also add permissions
2026-06-05 10:38:31 +03:00
marshal
8fea963ddb
dynamic contract templates and companyId on bookings
2026-06-04 16:53:14 +03:00
marshal
125ee18308
implement booking flow
2026-06-04 15:16:27 +03:00
ghost2023
a267526be5
refactor(bookings): Migrate new booking API payload to use reference data IDs
2026-06-01 16:39:11 +03:00
ghost2023
217f1bf097
feat(bookings): Implement skeleton loaders for new booking form steps
2026-06-01 16:39:11 +03:00
ghost2023
ff3cbed747
feat(freight): Introduce booking reference data endpoint & schemas
2026-06-01 16:39:11 +03:00
Stephanos A
5059a1fe58
First passenger and back office portal commit
2026-05-31 13:15:44 +03:00
ghost2023
bf51ead32d
feat(portal): Add Profile page, refactor booking details, and remove documents module
2026-05-29 17:37:02 +03:00
yaschalew10
bd08fb2351
Merge pull request #54 from Tria-plc/freight/feature/ui-sync
...
onboarding and bookin ui page
2026-05-29 16:40:26 +03:00
ghost2023
b58e2ee2be
refactor(bookings): Consolidate and remove steps for streamlined booking flow
2026-05-29 13:08:27 +03:00
yaschalew10
22e701b96f
Merge pull request #52 from Tria-plc/freight_feature/booking/minio
...
implement rule engine module with dynamic booking evaluation
2026-05-29 11:36:06 +03:00
marshal
800f036005
implement rule engine module with dynamic booking evaluation, 7 entities, and Postman endpoints
2026-05-29 10:00:45 +03:00
ghost2023
6457b692b8
chore: update create customer dto
2026-05-28 15:54:40 +03:00
ghost2023
67d9d13591
chore: sync Ibooking
2026-05-28 15:54:26 +03:00
Michael Abebe
39c3f3cf43
Merge branch 'freight/develop' into freight/feature/bootstrap_backoffice
2026-05-26 13:37:34 +03:00
Michael Abebe
516d2c8b45
feat(freight:backoffice): added org structure managemnet
2026-05-25 15:50:47 +03:00
ghost2023
dc41da3731
feat: wire up the create booking form
2026-05-23 11:54:13 +03:00
ghost2023
8a5652d7d9
feat(booking): Introduce comprehensive booking DTO, refine form validation, and enhance API docs
2026-05-23 11:21:17 +03:00
Michael Abebe
2272255bef
Merge remote-tracking branch 'origin/freight/develop' into freight/feature/bootstrap_backoffice
2026-05-22 17:58:43 +03:00
Michael Abebe
27e2cfcf6b
feat(freight:backoffice): added login page and basic authorization
2026-05-22 17:55:20 +03:00
Michael Abebe
2c9ca6f16b
feat(freight:backoffice): added basic frontend integration with auth(login) page
2026-05-22 17:15:46 +03:00
ghost2023
6287022a53
style: improve the switch component
2026-05-22 15:42:56 +03:00
ghost2023
37916a0cae
chore: add switch component from shadcn to ui-common
2026-05-22 11:37:24 +03:00
ghost2023
9fbe27e634
chore: add field component from shadcn to ui-common
2026-05-22 10:45:13 +03:00
yaschalew
c7347b88d7
customer registration api integration
2026-05-21 02:21:32 +03:00
yaschalew
fea308a6af
improve endpoints
2026-05-21 01:11:51 +03:00
ghost2023
995030a72c
feat: build a global smart file input field
2026-05-20 16:08:38 +03:00
ghost2023
5d3164074b
fix: styling conflict issues
2026-05-20 14:32:03 +03:00
ghost2023
0440206c06
chore: add dropdown and also updated tables to use dropdown instead
2026-05-20 13:49:17 +03:00
ghost2023
e1aa01724f
style: add components
2026-05-20 12:03:15 +03:00
Nathnael Wondisha
841d8c803f
Merge branch 'develop' into ui-comps
2026-05-20 11:40:54 +03:00
ghost2023
b9ef5a2b46
style: finish based global them
2026-05-20 11:35:00 +03:00
yaschalew
51d6df42bb
file upload settings
2026-05-20 08:15:29 +03:00
ghost2023
024871c127
chore: centralized the themeing and fix styles
2026-05-19 16:51:44 +03:00
ghost2023
f9b96c143e
chore(style): setup shadcn components
2026-05-19 16:50:40 +03:00
ghost2023
634747640a
feat(data-table): Introduce comprehensive DataTable component with full feature set
2026-05-19 16:50:01 +03:00
yaschalew
6aa8265bf5
update main color
2026-05-18 23:23:51 +03:00
yaschalew
7fe5be2438
Merge branch 'develop' of github.com:Tria-plc/edr-platform into feat/customer_registration
2026-05-18 12:10:12 +03:00
Michael Abebe
2478b0278b
feat(freight:auth): show real user profile in top bar and fix logout
...
- DashboardLayout now accepts userName, userEmail, userInitials, onLogout
props; computes initials from name; replaces hardcoded "John Doe" values
- Portal App.tsx pulls display name and email from useAuth user object and
passes them to DashboardLayout
- handleLogout performs unconditional local cleanup (cookies + localStorage
+ hard redirect to /auth) so a failed API call never leaves the user stuck
- main.tsx purges cookies whose value is the literal string "undefined",
clearing stale tokens written before the envelope interceptor fix
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com >
2026-05-18 11:52:03 +03:00
yaschalew
db1f0cc5d7
add customer portal
2026-05-18 11:25:33 +03:00
