Commit Graph

190 Commits

Author SHA1 Message Date
ghost2023
42e227569b Merge remote-tracking branch 'origin/staging' into freight/fix/pay
# Conflicts:
#	apps/edr-freight-api/src/modules/billing/billing.service.ts
#	apps/edr-freight-web/portal/src/pages/billing/InvoiceDetailPage.tsx
#	apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/PaymentMethodModal.tsx
#	pnpm-lock.yaml
2026-08-01 13:09:14 +03:00
marshal
2605184b74 Merge pull request #1050 from Tria-plc/freight_feature/usermanagement
fix issue
2026-07-31 16:29:19 +03:00
Marshal
b74b51dcc1 fix issue 2026-07-31 13:27:44 +00:00
marshal
be75a9e867 Merge pull request #1048 from Tria-plc/freight_feature/usermanagement
fix issue
2026-07-31 16:06:43 +03:00
Marshal
66062ac1a2 fix issue 2026-07-31 13:05:04 +00:00
Abubeker
37855b0a83 feat: ( payment ) implement cbe payment 2026-07-31 07:50:10 +00:00
Nathnael
eefbc7b111 chore: update the iamapi package to 0.7.15 2026-07-30 13:22:20 +00:00
Nathnael
03b8ca0ce7 refactor: centralized the iam seeder 2026-07-27 08:42:27 +00:00
Muluhabt
87ebec8b51 Merge remote-tracking branch 'origin/dev' into tests 2026-07-22 16:33:07 +03:00
Nathnael
b8b8c4adf7 feat(e2e): add freight e2e docker-compose stack with isolated services 2026-07-21 11:00:02 +00:00
Muluhabt
f2ae9c883f Adding all the tests and fixes to the passengers app 2026-07-21 13:45:49 +03:00
Muluhabt
810aba563f Merge remote-tracking branch 'origin/dev' into tests 2026-07-20 16:34:59 +03:00
Muluhabt
c4f54a666b test: add EDR passenger pricing/config E2E bug-hunt harness
Hermetic E2E harness targeting pricing integrity and backoffice config:
- e2e/ docker Postgres (5544) + prepare.sh/run.sh one-command runner + HTML report
- 6 suites / 23 tests reproducing pricing, FX, wallet, refund, config and auth
  defects (see docs/ISSUES.md); docs/e2e-test-matrix.md documents the matrix
- two-tier harness (slim module boot + direct service instantiation) to work
  around the IAM/RabbitMQ/file-type boot wall
- .env.test.example tracked; loader falls back to it for fresh checkouts

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-07-20 16:22:40 +03:00
Nathnael Wondisha
f41463748d Merge pull request #788 from Tria-plc/freight/feat/chat-app
Freight/feat/chat app added attachment
2026-07-20 11:23:16 +03:00
Roba Boru
c1858e76d4 Added stops departure and arrival datetime 2026-07-18 21:51:54 +03:00
Nathnael
94af5fd6c2 chore: packages 2026-07-18 09:44:44 +00:00
Nathnael
318af79962 feat: setup posthog 2026-07-16 08:52:29 +00:00
yaschalew
40215d566b fix 2026-07-11 13:21:00 +03:00
yaschalew
81bdb91257 fix iam 2026-07-11 12:39:28 +03:00
natib21
5117cdd357 fix 2026-07-11 07:08:15 +00:00
natib21
15fc21a6c9 gps 2026-07-10 15:23:49 +00:00
natib21
bdb59b11bd language 2026-07-10 13:04:39 +00:00
Marshal
1d77cc9219 add Excel import functionality for container bookings 2026-07-09 18:10:58 +00:00
Nathnael Wondisha
268511c7ff Merge pull request #511 from Tria-plc/freight/feat/chat-app
chat app support to the passenger with websocket and anonymous
2026-07-07 17:16:10 +03:00
Nathnael
db21f691c7 chore: add socket io pkg to the passenger client 2026-07-07 14:07:50 +00:00
Nathnael
692a24f5d3 chore: add socket to packages api 2026-07-07 13:25:48 +00:00
natib21
fdd7b1711e Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-07 08:33:25 +00:00
natib21
75427ea63a fix tracker 2026-07-07 06:39:02 +00:00
Marshal
05b13e84a8 enhance booking and contract notification systems
- Added detailed logging for socket connection events in useBookingWindowSocket.
- Introduced new notification types for contract status and schedule updates.
- Updated notification visuals to include new icons for contract status.
- Enhanced notification href resolution for contract status and schedule updates.
- Implemented booking lifecycle notifier service for customer and staff notifications.
- Created contract notifier service for managing contract lifecycle notifications.
- Added end-to-end tests for booking window socket functionality.
2026-07-06 21:03:08 +00:00
natib21
011161b848 fix 2026-07-06 12:49:54 +00:00
Abubeker Yasin
96a9f40b93 fix: lock file 2026-07-06 15:49:22 +03:00
Abubeker Yasin
b45d180ee4 fix: ( pnpm ) lock file 2026-07-06 15:01:55 +03:00
Nathnael
4800d1db35 Merge branch 'dev' into freight/feat/fixes-v1 2026-07-06 10:58:57 +00:00
Abubeker Yasin
82a835d3af refactor: ( iam ) update iam package 2026-07-06 11:29:46 +03:00
Nathnael
01b92072aa chore: add notification to packages 2026-07-06 06:52:47 +00:00
yaschalew
47f87e8435 fix conflict 2026-07-03 17:31:29 +03:00
Abubeker Yasin
39d8a98e22 Merge pull request #416 from Tria-plc/alpha
Alpha
2026-07-03 12:26:39 +03:00
natib21
b218179d72 :wqMerge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice 2026-07-03 09:10:31 +00:00
natib21
e4b0c73c63 fix fayda 2026-07-03 09:10:05 +00:00
Stephanos A
200476dfd6 Fare and route-coach, production checklist updates 2026-07-02 22:42:15 +03:00
Marshal
18c158fb61 changes 2026-07-02 19:06:22 +00:00
Marshal
fec2a5d320 update import gl flow 2026-07-02 13:27:59 +00:00
Nathnael
03740ee719 fix: types isses 2026-07-02 11:09:25 +00:00
marshal
7b3f9094ed changes 2026-07-02 13:02:33 +03:00
ghost2023
c88c5ee450 chore: setup script 2026-07-01 12:26:37 +03:00
Marshal
708bd75d1f enhance contract review and editing experience 2026-06-30 15:16:27 +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
natib21
b069c53176 fix: repair pnpm-lock.yaml after bad merge conflict resolution 2026-06-27 05:30:08 +00:00
yaschalew
33469801b7 resolve conflict 2026-06-27 08:14:05 +03:00