Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 17:50:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
565 Commits 96 Branches 0 Tags
2d70f892a46c945fa91863f8831993a0fe61c836
Commit Graph

565 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marshal
2d70f892a4 Merge pull request #144 from Tria-plc/freight_feature/schedule 
backoffice ui fix
 2026-06-13 09:39:17 +03:00
Marshal
d3a479c142 ui fix 2026-06-12 14:21:07 +00:00
Marshal
6b79348074 ui fix 2026-06-12 12:59:01 +00:00
Marshal
db39e77e90 fix batch page ui 2026-06-12 12:46:51 +00:00
yaschalew10
9076664545 Merge pull request #142 from Tria-plc/freight/feat/ui-migration 
UI migration Again
 2026-06-12 15:24:46 +03:00
marshal
da387fd310 fix merge conflict 2026-06-12 14:58:39 +03:00
marshal
c2f44198d6 Merge pull request #141 from Tria-plc/freight_feature/schedule 
auto allocation and batch managemnt, tracking the train
 2026-06-12 14:46:47 +03:00
marshal
1288a18bbf fix merge conflict 2026-06-12 14:44:52 +03:00
marshal
ef0abf1c41 auto allocation and batch managemnt, tracking the train 2026-06-12 11:42:46 +03:00
Marshal
8618ea2aa8 add cron jobs and aslo 2026-06-11 20:59:24 +00:00
Marshal
132f2150a8 add cron jobs and aslo 2026-06-11 20:59:19 +00:00
Marshal
cde3e462ba automate the schedule 2026-06-11 19:42:23 +00:00
Nathnael
7c5dfa3ae1 fix: edit booking docs and prefill 2026-06-11 12:32:23 +00:00
Marshal
f85c13ce8c Merge branch 'freight_feature/schedule' of github.com:Tria-plc/edr-platform into freight_feature/schedule 2026-06-11 11:15:29 +00:00
Marshal
2fa2ed6bb2 ui fix 2026-06-11 11:12:41 +00:00
Nathnael
103ff53fe0 feat: add document upload to booking creation form 2026-06-11 09:11:35 +00:00
Nathnael
3fa09ec644 style: booking detail pages fix 2026-06-11 08:27:38 +00:00
Nathnael
e01a7faa20 style: auth pages fix 2026-06-11 08:27:14 +00:00
Nathnael
16f506062a feat: enhance auth guard 2026-06-11 08:22:39 +00:00
Marshal
20289621f3 fix ui 2026-06-11 08:19:16 +00:00
marshal
c871330f7f resolve merge conflict 2026-06-11 10:52:37 +03:00
Nathnael
2cd585a3ac style: ui fixes to booking detail page 2026-06-11 07:11:43 +00:00
Nathnael
83edb1e063 refactor: booking page refactor 2026-06-11 06:54:38 +00:00
ghost2023
2250a468cb style: ui fixes 2026-06-11 09:24:06 +03:00
marshal
10b011de8f merge conflict 2026-06-10 16:45:45 +03:00
Nathnael
12b1e54563 style: rebuild the booking detail page 2026-06-10 12:18:31 +00:00
Nathnael
38b3f747fb style: enhance UI components for New Booking page and Step Indicator 2026-06-10 11:07:02 +00:00
Nathnael
b37e0cf7a7 style: rebuild the my bookings page with new ui 2026-06-10 10:43:48 +00:00
Marshal
088295d81f schedule logic 2026-06-10 09:22:57 +00:00
Nathnael
97ed1c4b85 fix the layout style 2026-06-10 09:03:33 +00:00
Nathnael
f423fc2e6f style: update 2026-06-10 08:48:05 +00:00
Marshal
0335555892 overview, booking and train scheduling ui 2026-06-10 07:53:15 +00:00
ghost2023
02621d05d8 chore: migrate to mantine from shadcn for datatable 2026-06-10 10:02:09 +03:00
Marshal
2b5a0f4e96 ui design for schedule 2026-06-10 00:12:52 +00:00
Marshal
257428be18 ui design for schedule 2026-06-09 23:25:52 +00:00
marshal
5774d7db9d booking operations and trains scheduling also allocations 2026-06-10 00:48:32 +03:00
Nathnael Wondisha
1440c42f1e Merge branch 'freight/develop' into freight/feat/ui-migration 2026-06-09 12:13:03 +03:00
Nathnael
c70c10b0df fixes 2026-06-09 08:29:09 +00:00
ghost2023
4566033046 style: ui revamp 2026-06-09 09:27:14 +03:00
hagiye
eda21e22d8 Resolve merge conflicts from Train-Scheduling 2026-06-08 16:51:29 +03:00
Eyosiyas Girma
5786952ede Merge pull request #120 from Tria-plc/freight/feature/telebirr-integration 
Freight/feature/telebirr integration
 2026-06-08 16:35:33 +03:00
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
ghost2023
41061462ff feat(ui): Integrate Mantine UI library, introduce AppLayout, and refactor dashboard 2026-06-08 16:05:03 +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
Nathnael Wondisha
95fb544ec2 Merge pull request #116 from Tria-plc/freight/feat/payment 
freight/feat/payment
 2026-06-08 08:52:39 +03:00
ghost2023
df725015a1 fix(api): improve payment status API handling and frontend user experience 2026-06-08 08:51:54 +03:00
hagiye
bffa5020ac wagon types added UI with API integrations 2026-06-07 21:56:33 +03:00