mulish77
d4b8e9a564
Merge pull request #860 from Tria-plc/dev
...
Discripancy
2026-07-21 00:59:16 +03:00
Stephanos A.
9c27784157
Merge pull request #859 from Tria-plc/alpha
...
Alpha
2026-07-21 00:52:26 +03:00
Stephanos A
7f65bf1409
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-21 00:50:57 +03:00
Stephanos A
bcce93b156
Show discrepancy
2026-07-21 00:50:43 +03:00
mulish77
737190848b
Merge pull request #858 from Tria-plc/dev
...
Dev to Main merge
2026-07-21 00:44:14 +03:00
robiman
015e04283d
Merge pull request #857 from Tria-plc/alpha
...
Revert departure and arrival datetime of stops
2026-07-21 00:26:42 +03:00
Roba Boru
eaa4ebf825
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-21 00:25:01 +03:00
Roba Boru
119f841aba
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-21 00:24:52 +03:00
Roba Boru
be933c2c0d
Revert departure and arrival datetime of stops
2026-07-21 00:24:32 +03:00
Muluhabt
bc0105f656
Merge remote-tracking branch 'origin/dev' into tests
...
Merging dev to my local test branch
2026-07-21 00:08:49 +03:00
Stephanos A.
8a3bdba595
Merge pull request #856 from Tria-plc/alpha
...
Payment discrepancy paid amount update
2026-07-20 23:21:18 +03:00
Stephanos A
24872df0ba
Payment discrepancy paid amount update
2026-07-20 23:20:26 +03:00
robiman
7df50020ca
Merge pull request #855 from Tria-plc/alpha
...
Fix package price
2026-07-20 23:10:10 +03:00
Stephanos A
ec35b7d65e
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-20 23:09:49 +03:00
Stephanos A
2deb5a4a8e
Payment discrepancy fixes
2026-07-20 23:09:06 +03:00
Roba Boru
5adb145aca
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-20 23:08:59 +03:00
Roba Boru
2f52471fad
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-20 23:08:47 +03:00
Roba Boru
296e3af7dd
Fix package price
2026-07-20 23:08:32 +03:00
Stephanos A.
9b66e2e539
Merge pull request #854 from Tria-plc/alpha
...
Alpha
2026-07-20 22:52:59 +03:00
Stephanos A
226f839ad0
Hide previous payment discrepancy link
2026-07-20 22:52:17 +03:00
Stephanos A
eabc15eebf
Payment discrepancy report updates
2026-07-20 22:48:50 +03:00
marshal
370aa09c65
Merge pull request #853 from Tria-plc/freight_feature/usermanagement
...
changes
2026-07-20 22:44:22 +03:00
marshalyordanos
15705d6b26
changes
2026-07-20 22:43:22 +03:00
marshal
92375caa59
Merge pull request #852 from Tria-plc/freight_feature/usermanagement
...
Fix CSS formatting for bookings table class to ensure proper styling …
2026-07-20 22:35:50 +03:00
marshalyordanos
8e74604a07
Fix CSS formatting for bookings table class to ensure proper styling and layout.
2026-07-20 22:35:01 +03:00
Stephanos A.
6543ba5266
Merge pull request #851 from Tria-plc/alpha
...
Payment discrepancy report updates
2026-07-20 22:16:46 +03:00
Stephanos A
19fe977f40
Payment discrepancy report updates
2026-07-20 22:15:32 +03:00
marshal
d3324bc580
Merge pull request #850 from Tria-plc/freight_feature/usermanagement
...
Enhance BookingRequestsPage layout and styling
2026-07-20 22:11:14 +03:00
marshalyordanos
8aaccf3f36
Enhance BookingRequestsPage layout and styling
2026-07-20 22:10:48 +03:00
marshal
73f067aeed
Merge pull request #849 from Tria-plc/freight_feature/usermanagement
...
Add container and contract information cards to booking detail views
2026-07-20 21:55:57 +03:00
marshalyordanos
43df24142c
Add container and contract information cards to booking detail views
...
- Integrated CompanyInfoCard, ContainersCard, and ContractInfoCard into ChangesRequestedView, DraftBookingView, and ReadonlyBookingView components.
- Updated utils to handle new booking detail types and improve container summary calculations.
- Enhanced ShipmentDetailsCard and ScheduleCard to utilize updated booking detail structure and display relevant information more effectively.
2026-07-20 21:55:17 +03:00
Stephanos A.
8206f2485c
Merge pull request #848 from Tria-plc/alpha
...
Payment discrepancy report updates
2026-07-20 21:52:22 +03:00
Stephanos A
99eb35ff75
Payment discrepancy report updates
2026-07-20 21:50:34 +03:00
marshal
0a73b8edb5
Merge pull request #847 from Tria-plc/freight_feature/usermanagement
...
chnages
2026-07-20 20:52:57 +03:00
robiman
6dac2c2945
Merge pull request #844 from Tria-plc/alpha
...
Fix actual price minor
2026-07-20 17:06:08 +03:00
Roba Boru
e2f2158a09
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-20 17:03:57 +03:00
Roba Boru
49d62e3b96
Fix actual price minor
2026-07-20 17:03:31 +03:00
robiman
51db5d0977
Merge pull request #843 from Tria-plc/alpha
...
Fix payment discrepancy column
2026-07-20 16:56:39 +03:00
Roba Boru
6bd3fffa49
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-20 16:55:37 +03:00
Marshal
26f73cbe5f
chnages
2026-07-20 13:55:26 +00:00
Roba Boru
c71f4df6a1
Fix payment discrepancy column
2026-07-20 16:55:09 +03:00
robiman
7002d42879
Merge pull request #842 from Tria-plc/alpha
...
Fix paid minor calculation
2026-07-20 16:45:38 +03:00
Roba Boru
8f0eb0c48b
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-20 16:44:40 +03:00
Roba Boru
be7d6b2092
Fix paid minor calculation
2026-07-20 16:44:25 +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
robiman
bb03dfdccb
Merge pull request #841 from Tria-plc/alpha
...
Expand to show multiple passengers in payment discrepancy
2026-07-20 16:11:43 +03:00
Roba Boru
8054cefd45
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-20 16:10:47 +03:00
Roba Boru
ef2fb2e05c
Expand to show multiple passengers in payment discrepancy
2026-07-20 16:10:28 +03:00
Hagernesh Tadesse
2c16c50701
Merge pull request #840 from Tria-plc/intercity-load-unload
...
Fix Multiple truck self haul null plates
2026-07-20 15:57:10 +03:00
