Commit Graph

1062 Commits

Author SHA1 Message Date
Yonas Tewabe
0a13fd0605 Update deploy.yml 2026-06-23 11:26:46 +03:00
SennayT
b2767a1cbf fix package issue for freight api 2026-06-23 11:22:41 +03:00
Abubeker Yasin
aede976973 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into dev 2026-06-22 20:09:56 +03:00
Eyob T.
e6cdefdf69 Merge pull request #244 from Tria-plc/alpha
Added manage booking,voucher download options and fix email and phone number for guest user
2026-06-22 18:34:44 +03:00
Yonas Tewabe
be1461c792 Update deployment workflow to use dynamic runner 2026-06-22 17:00:57 +03:00
Muluhabt
ee90d178ae Adding local packages 2026-06-22 16:52:49 +03:00
Roba Boru
9cfd0fc2eb Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-22 16:46:55 +03:00
Roba Boru
aadf1644fb Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-22 16:46:44 +03:00
Roba Boru
1456ca7e9c Added download voucher option and manage booking 2026-06-22 16:46:24 +03:00
Eyob T.
25bba23579 Merge pull request #240 from Tria-plc/fix/security_patch
Fix/security patch
2026-06-22 15:12:33 +03:00
Eyob T.
f06526cfd6 Merge pull request #237 from Tria-plc/fix/security_patch
Fix/security patch
2026-06-22 15:07:19 +03:00
Eyob T.
6108e7bb67 Security patch
Remove specific temporary files from .gitignore.
2026-06-22 15:06:40 +03:00
Eyob T.
8d0080f074 Security patch 2026-06-22 15:06:08 +03:00
Yonas Tewabe
25d160d39e Update .gitignore 2026-06-22 09:16:58 +03:00
Abubeker Yasin
51a7651eb1 Merge pull request #226 from Tria-plc/alpha
fix: ( payment ) change the amount to number
2026-06-20 09:28:59 +03:00
Abubeker Yasin
45383a4f43 Merge pull request #226 from Tria-plc/alpha 2026-06-19 23:28:59 -07:00
Abubeker Yasin
77ab3cf632 fix: ( payment ) change the amount to number 2026-06-20 09:27:46 +03:00
marshal
93ec1fbdbb Merge pull request #225 from Tria-plc/freight/develop
Freight/develop
2026-06-19 16:13:54 +03:00
marshal
aaaa8eed4f Merge pull request #224 from Tria-plc/freight_feature/priority
Freight feature/priority
2026-06-19 16:11:36 +03:00
marshal
ca5877d25a Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-19 15:58:36 +03:00
marshal
85110adc3f Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-19 15:57:26 +03:00
Abubeker Yasin
ae26333dca Merge pull request #223 from Tria-plc/alpha
Alpha
2026-06-19 15:50:37 +03:00
Abubeker Yasin
2288a9efda feat: ( notifications ) add payment/cancellation events and ticket confirmation 2026-06-19 15:49:30 +03:00
Nathnael Wondisha
f8cb3ecd06 Merge pull request #222 from Tria-plc/freight/feat/company-profile
Freight/feat/company profile
2026-06-19 15:35:51 +03:00
Nathnael
653f39ec65 feat: add the company profile support to the ui 2026-06-19 12:32:55 +00:00
Nathnael
7ce5f23005 style: profile page ui improvment 2026-06-19 12:32:55 +00:00
Nathnael
9284e72c14 fix: document uploaded 2026-06-19 12:32:55 +00:00
Nathnael
8e278a3bd6 feat: add company selection to settings onboarding 2026-06-19 12:32:55 +00:00
Marshal
3591abd27f feat(bookings): enhance booking details with consolidation notices and streamline form handling 2026-06-19 10:45:11 +00:00
Abubeker Yasin
fcbc59e95b refactor: ( notifications ) remove dead SendGrid/Twilio adapters and legacy code 2026-06-19 11:41:31 +03:00
Abubeker Yasin
a2b2ed787e fix: ( sms ) change the key sms to text 2026-06-19 11:17:56 +03:00
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