Commit Graph

1081 Commits

Author SHA1 Message Date
Abubeker Yasin
525e724461 fix: ( payment ) pass major amount to the payment provider 2026-06-19 10:19:11 +03:00
yaschalew10
9de10fd3a6 Merge pull request #221 from Tria-plc/freight/hotfix_3
fix file upload
2026-06-19 08:49:42 +03:00
yaschalew
5e1d53b866 fix file upload 2026-06-19 08:48:58 +03:00
Abubeker Yasin
c8e6e4a326 Merge pull request #220 from Tria-plc/alpha
fix: ( notification ) add notification templet and fix issues
2026-06-19 06:13:37 +03:00
Abubeker Yasin
42c020c97a fix: ( notification ) add notification templet and fix issues 2026-06-19 06:12:46 +03:00
marshal
f1dfbbcc3f Replace EDR logo image with Train icon in FreightSidebar 2026-06-19 01:13:52 +03:00
marshal
72b63c319e - Fix shipping line mapping to use ID instead of name in EditBookingPage and NewBookingPage 2026-06-19 01:07:05 +03:00
marshal
1a3d85e46a Remove unused ArrowLeft icon import from PaymentFailurePage 2026-06-19 00:53:29 +03:00
marshal
3f81f45c6d Update login page logo from SVG to PNG format 2026-06-19 00:47:46 +03:00
marshal
8264df133f Redesign payment verification UI with Mantine components and fix route direction logic
- Refactor CheckPaymentPage and PaymentFailurePage to use Mantine UI components with modern card-based layouts
- Add gradient headers, themed icons, and improved visual hierarchy for payment status states
- Implement PaymentCard wrapper component for consistent styling across payment pages
- Update route direction logic to trim country values and simplify Djibouti import/export detection
- Replace shadcn/ui components with M
2026-06-19 00:42:27 +03:00
Marshal
ed114b1999 feat(cargo-types): add route for cargo types detail view and enhance CargoTypesPage with breadcrumbs and improved navigation 2026-06-18 20:49:46 +00:00
Marshal
aa105a5e76 feat(cargo-types): add CargoTypesPage for managing freight cargo categories and types 2026-06-18 20:19:40 +00:00
Marshal
be7c569363 feat(train-scheduling): add day-level booking pool and available days query 2026-06-18 19:48:42 +00:00
Eyob T.
264df3b854 Merge pull request #219 from Tria-plc/alpha
Update seat map and sms payload
2026-06-18 22:14:56 +03:00
marshal
16b289e091 Merge pull request #218 from Tria-plc/freight/feat/company-profile
Freight/feat/company profile
2026-06-18 22:05:57 +03:00
Roba Boru
0211d4b733 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-18 22:04:28 +03:00
Roba Boru
804d67ecc5 Update seat map and sms payload 2026-06-18 22:03:12 +03:00
Nathnael Wondisha
1ea2f065c6 Merge branch 'freight/develop' into freight/feat/company-profile 2026-06-18 17:48:07 +03:00
Nathnael
c6179c046c feat(wip): up the settings onboaridng flow 2026-06-18 14:45:14 +00:00
Marshal
30bfc84f8f Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-18 14:13:50 +00:00
Marshal
421e0266bc feat(train-scheduling): implement day-level booking pool
- Added `unplaced` method in `BookingNotifierService` to log warnings for bookings that cannot be placed on any train.
- Introduced `getAvailableDays` method in `TrainSchedulingService` to retrieve distinct days with open departures for a given route.
- Created `AvailableDaysQueryDto` for querying available days based on origin and destination yards.
- Updated `TrainSchedulingController` to expose an endpoint for available days.
- Modified frontend components to support day-level booking, allowing customers to select only a day without pinning to a specific train.
- Removed references to train schedules in booking forms and review steps, emphasizing day selection.
- Added a database migration to create an index for efficient querying of bookings by route and day.
2026-06-18 14:12:46 +00:00
marshal
8642617770 Merge pull request #217 from Tria-plc/freight_feature/priority
Freight feature/priority
2026-06-18 17:05:24 +03:00
marshal
3ad18277ea Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-18 17:04:35 +03:00
ghost2023
e9149242b2 feat: setup the company profiles 2026-06-18 16:38:46 +03:00
Yonas Tewabe
e132471901 Update docker-compose.yaml 2026-06-18 16:26:35 +03:00
Marshal
578012dffd fix: improve route direction logic to align with backend derivation rules 2026-06-18 12:52:01 +00:00
Roba Boru
e7dcf71519 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-18 15:49:40 +03:00
Roba Boru
e5c7280bd5 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-18 15:49:25 +03:00
ghost2023
f3be5e3d84 feat(company): introduce CompanyProfile entity for detailed company roles 2026-06-18 15:32:44 +03:00
marshal
526096b101 Merge pull request #216 from Tria-plc/freight_feature/priority
fix: hardcode payment API URL to production endpoint
2026-06-18 15:10:08 +03:00
marshal
8258429c28 fix: hardcode payment API URL to production endpoint 2026-06-18 15:09:09 +03:00
ghost2023
cd1fa385a3 refactor: rm the unused ff client stuff 2026-06-18 14:46:11 +03:00
ghost2023
81a495ec61 refactor: cut off the old customre entity 2026-06-18 14:41:16 +03:00
Eyob T.
7bdcee04bc Merge pull request #215 from Tria-plc/alpha
Booking and pricing related updates
2026-06-18 14:06:29 +03:00
Stephanos A
b491f39d42 Booking and pricing related updates 2026-06-18 14:02:11 +03:00
yaschalew10
a9aa4876af Merge pull request #214 from Tria-plc/Demurrage_invoices
fix migration
2026-06-18 12:25:46 +03:00
natib21
398bc9330e fix migration 2026-06-18 09:11:10 +00:00
marshal
b069f95596 Merge pull request #213 from Tria-plc/freight_feature/priority
Freight feature/priority
2026-06-18 10:30:32 +03:00
marshal
aef1214d1e Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-18 10:29:42 +03:00
Marshal
62038458f8 refactor: disable demo data seeders while retaining for easy re-enabling 2026-06-18 07:27:57 +00:00
yaschalew10
9cc40514c4 Merge pull request #212 from Tria-plc/freight_hotfix_2
fix data integrity issue
2026-06-18 10:14:21 +03:00
natib21
58fcf9ce3f fix data integrity issue 2026-06-18 07:13:08 +00:00
Marshal
16bb0b5246 changes 2026-06-18 06:58:01 +00:00
Yonas Tewabe
b9c43e9214 Update service paths in deploy workflow 2026-06-18 09:18:37 +03:00
Eyob T.
ad11f8c220 Merge pull request #211 from Tria-plc/alpha
Fix missing booking columns
2026-06-18 08:27:52 +03:00
Stephanos A
aefee5027a Fix missing booking columns 2026-06-18 08:26:05 +03:00
Hagernesh Tadesse
0c6cf97a59 Merge pull request #210 from Tria-plc/Demurrage_invoices
Demurrage invoices
2026-06-18 03:15:19 +03:00
Hagernesh
be12a9d496 fee invoice frontend 2026-06-18 00:12:59 +00:00
Hagernesh
3860d17304 demurrage invoices 2026-06-18 00:05:50 +00:00
Hagernesh
33b74a5da9 demurrage invoices 2026-06-18 00:04:07 +00:00