Commit Graph

54 Commits

Author SHA1 Message Date
hagiye
831ac59a8e Merge branch 'dev' of github.com:Tria-plc/edr-platform into importhandover 2026-06-30 07:20:10 +03:00
hagiye
9f5c22c1ee Goods recieved notes and Booking delivery 2026-06-30 07:19:12 +03:00
Nathnael Wondisha
4cf8e89780 Merge branch 'dev' into freight/feat/invoice 2026-06-29 17:24:29 +03:00
natib21
f2826f2b9b fix 2026-06-29 13:49:01 +00:00
Nathnael
c37e8acfdc Merge branch 'dev' into freight/feat/invoice 2026-06-29 10:58:12 +00:00
hagiye
d55f9312bf Marshaling document Receive Export and import handover to customer 2026-06-29 12:24:14 +03:00
hagiye
2a038c59db Import operation gate pass 2026-06-27 21:22:18 +03:00
hagiye
fee4365b70 Import operation gate pass 2026-06-27 21:04:27 +03:00
Nathnael
98e34593c4 feat: add government support to the companies. add seeding and constrain on booking 2026-06-27 09:08:15 +00:00
yaschalew
f8aa3b3968 fix 2026-06-27 10:02:05 +03:00
yaschalew
9f85d45b17 add package 2026-06-27 09:29:48 +03:00
yaschalew
33469801b7 resolve conflict 2026-06-27 08:14:05 +03:00
yaschalew
2373e0b8a4 user module 2026-06-27 08:11:06 +03:00
hagiye
f86bdb1c36 Merge branch 'dev' of github.com:Tria-plc/edr-platform into dev 2026-06-26 13:21:18 +03:00
hagiye
4efef9bab3 inspection status column fix 2026-06-26 13:20:26 +03:00
yaschalew
ed496b72ae add iam package 2026-06-26 12:38:31 +03:00
hagiye
2b7959fc82 fix conflict 2026-06-25 11:31:50 +03:00
hagiye
f4a90755c2 api 2026-06-25 11:00:40 +03:00
Muluhabt
2e138a73ea Updating package 2026-06-24 22:56:32 +03:00
Marshal
b031ddb204 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-22 11:43:38 +00:00
Muluhabt
41c51b7986 Adding local packages 2026-06-22 11:53:17 +03:00
Marshal
dc708a2473 Refactor phone input handling across onboarding and settings forms
- Replaced PhoneInput component with ControlledPhoneField for better integration with react-hook-form.
- Updated validation for phone numbers using isValidPhone function to ensure proper formatting.
- Removed country code handling from forms, simplifying phone number management.
- Introduced new phone field component with consistent styling and behavior.
- Added phone number validation on the backend using class-validator.
- Removed unused phone utility functions and cleaned up related code.
2026-06-21 10:34:40 +00:00
Marshal
4a0085ef57 feat: refactor exchange rate handling by integrating new ExchangeService and removing CbeExchangeService 2026-06-20 09:22:21 +00:00
Marshal
54587a8c55 feat: add nationality selection and business license upload functionality
- Introduced a new step in the onboarding process to select company nationality (Ethiopian or Foreign).
- Updated API and service layers to handle nationality data for companies.
- Added support for uploading multiple business license files for each operational profile.
- Refactored company and forwarder forms to include new license upload step.
- Created a reusable RoleLicenseStep component for managing license file uploads.
- Implemented utility functions for phone number handling.
- Added migrations to update the database schema for nationality and business license files.
2026-06-20 08:28:01 +00:00
Hagernesh
89d651693b automation of loading and unloading 2026-06-17 22:33:06 +00:00
Marshal
052829c7e6 Add freight demo data seeder and permissions management
- Introduced `DemoFreightDataSeeder` to seed demo freight data including wagons, approval rules, and staff users.
- Added `seed:freight-demo` script to `package.json` for easy execution.
- Updated permissions for operations officer and added permission checks in various components.
- Enhanced sidebar and booking actions to respect user permissions.
2026-06-16 15:28:10 +00:00
marshal
2592e604fb changes 2026-06-16 16:57:15 +03:00
marshal
484151d909 payments 2026-06-14 15:59:52 +03:00
yaschalew
eee7b719b0 user management 2026-06-13 14:32:26 +03:00
marshal
ef0abf1c41 auto allocation and batch managemnt, tracking the train 2026-06-12 11:42:46 +03:00
Marshal
cde3e462ba automate the schedule 2026-06-11 19:42:23 +00:00
marshal
10b011de8f merge conflict 2026-06-10 16:45:45 +03:00
marshal
5774d7db9d booking operations and trains scheduling also allocations 2026-06-10 00:48:32 +03:00
hagiye
eda21e22d8 Resolve merge conflicts from Train-Scheduling 2026-06-08 16:51:29 +03:00
hagiye
7facbeda22 Train scheduling API,Routes and UI 2026-06-08 16:31:28 +03:00
Eyosiyas
a1940c4901 telebirr out in the payment 2026-06-08 11:49:50 +03:00
hagiye
bffa5020ac wagon types added UI with API integrations 2026-06-07 21:56:33 +03:00
Michael Abebe
c31d87fc35 dep(freight): updated iam imports 2026-06-06 09:45:00 +03:00
Abubeker Yasin
1d11cbda4d feat: ( payment ) create payment microservice 2026-06-05 21:29:55 +03:00
hagiye
dc42838a43 Trains management CRUD issues solved 2026-06-05 21:07:04 +03:00
hagiye
c66b57d599 Merge freight/develop into feature/trains-management 2026-06-05 10:21:39 +03:00
hagiye
71ac89edc7 trains, wagons,containers and cargoes schema and API 2026-06-04 15:56:29 +03:00
marshal
324935a334 implement booking flow 2026-06-04 15:24:18 +03:00
marshal
125ee18308 implement booking flow 2026-06-04 15:16:27 +03:00
Tria
da10d067f8 multiple notification strategies 2026-06-03 16:17:36 +03:00
marshal
d08bc6d3fe add service-types and cargo-types CRUD modules with pagination, filtering 2026-05-28 11:34:24 +03:00
yaschalew
8a7a56766f add onboarding 2026-05-26 10:15:59 +03:00
yaschalew
5a4d6baec2 user account create 2026-05-26 05:40:53 +03:00
marshal
82c6b1284e implement contract booking functionality and MinIO setup 2026-05-23 09:31:52 +03:00
Michael Abebe
0e0d2ea450 feat(freight:api): initial backend work 2026-05-18 10:25:33 +03:00