SennayT
f9706c9fb0
refactor: separate base image configuration into Dockerfile.base for improved build management
2026-07-15 10:51:35 +00:00
SennayT
3416585a01
add puppeteer support
2026-07-15 13:42:42 +03:00
marshal
7700aa6358
Merge pull request #701 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-07-15 13:32:37 +03:00
Marshal
c71a0043d6
implement wagon maintenance feature: add functionality to detach wagons and move them to maintenance status
2026-07-15 10:32:09 +00:00
Eyob T.
2c56928c6f
Merge pull request #700 from Tria-plc/alpha
...
Update seat availability
2026-07-15 12:52:32 +03:00
Roba Boru
30a91691c8
Update seat availability
2026-07-15 12:50:19 +03:00
Marshal
11771e5f92
remove reopen delay minutes from global rules and update related types
...
- Removed the field from and related components.
- Updated to reflect the removal of the reopen delay input field.
- Modified to include new train number fields: and .
- Added interface to manage active schedules with trade direction.
- Introduced interface to track wagon shortages in bookings.
- Updated logic to ensure consistent UI state representation.
- Created migrations to drop the column and add and columns to the table.
- Added tests for the new booking window display logic and wagon planning functionality.
2026-07-15 09:13:02 +00:00
Abubeker Yasin
6a0e333ff5
Merge pull request #699 from Tria-plc/dev
...
merge dev to main
2026-07-15 11:08:39 +03:00
Hagernesh Tadesse
1d143cf17f
Merge pull request #698 from Tria-plc/accrualdashboard
...
Disabled Receive to warehouse button once items are recieved to warehouse
replaced booking uuid by booking reference in the warehouse.
Added live occupancy to warehouse zones
2026-07-15 10:59:11 +03:00
Hagernesh
fd4c4d630f
fix(warehouse): disable Receive-At-Warehouse once booking is received
...
The Warehouse Information card kept the receive button active after the booking
already had an inventory record. Disable it (relabel "Received At Warehouse",
add a tooltip) when an inventory item exists.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com >
2026-07-15 07:54:23 +00:00
Hagernesh
b71a53c4a9
fix(warehouse): show booking reference instead of UUID in inventory table
...
The inventory table's Booking column rendered a truncated bookingId UUID; use
the bookingReference already attached to each row (fall back to the short UUID
only when absent). Keep the UUID in the tooltip.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com >
2026-07-15 07:54:23 +00:00
Stephanos A.
9c864a3121
Merge pull request #697 from Tria-plc/alpha
...
Fix seat class name assignment to ensure consistency with fare engine resolution
2026-07-15 10:53:05 +03:00
Stephanos A
6b84f22a91
Fix seat class name assignment to ensure consistency with fare engine resolution
2026-07-15 10:48:36 +03:00
Stephanos A.
c7e1ed5586
Merge pull request #696 from Tria-plc/alpha
...
Build issue resolution
2026-07-15 10:44:17 +03:00
Stephanos A
b4992546d1
Build issue resolution
2026-07-15 10:43:19 +03:00
mulish77
5f8266035b
Merge pull request #695 from Tria-plc/alpha
...
Alpha
2026-07-15 10:35:04 +03:00
Stephanos A
9347f932a1
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-15 10:28:14 +03:00
Stephanos A
e2529b9317
Payment amount for non ETB and exchange fixes
2026-07-15 10:27:17 +03:00
Marshal
9be7f356f0
enhance train scheduling logic to exclude cancelled trains and refine window filtering
2026-07-15 07:07:10 +00:00
mulish77
07ca838504
Merge pull request #694 from Tria-plc/alpha
...
Extend seat hold time if booking created
2026-07-15 09:17:26 +03:00
Roba Boru
d2f82fd097
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-15 09:16:09 +03:00
Roba Boru
6a9227b0f6
Extend seat hold time if booking created
2026-07-15 09:15:49 +03:00
Eyob T.
bf4b685748
Merge pull request #693 from Tria-plc/alpha
...
Fix expired seat
2026-07-15 08:16:21 +03:00
Roba Boru
7cca901913
Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-15 08:14:06 +03:00
Roba Boru
85f221065f
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-15 08:13:54 +03:00
Roba Boru
658b8d0077
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-15 08:13:39 +03:00
Roba Boru
64b362ff51
Fix expired seat
2026-07-15 08:13:23 +03:00
Abubeker Yasin
28ddc7b1c5
Merge pull request #692 from Tria-plc/dev
...
Merge to main
2026-07-15 01:03:47 +03:00
Abubeker Yasin
1faf936869
Merge pull request #691 from Tria-plc/alpha
...
Alpha
2026-07-15 01:02:07 +03:00
Abubeker Yasin
89ae06a5a8
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-15 00:45:39 +03:00
Abubeker Yasin
f8658d63b8
feat: ( currency ) add multiple from currency
2026-07-15 00:45:24 +03:00
Abubeker Yasin
ad737d861b
Merge pull request #690 from Tria-plc/alpha
...
Alpha
2026-07-15 00:42:29 +03:00
Stephanos A
c0b99b50a9
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-15 00:40:08 +03:00
Stephanos A
25fdf88a77
Booking currency updates, audit logging updates
2026-07-15 00:39:53 +03:00
Abubeker Yasin
7e1e600702
Merge pull request #689 from Tria-plc/alpha
...
Show seat left on booking result
2026-07-14 23:03:21 +03:00
Roba Boru
ae2db7feb4
remove fare from seat selection summary
2026-07-14 22:59:46 +03:00
Roba Boru
0aed560296
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-14 22:51:59 +03:00
Roba Boru
effc9cefe2
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-14 22:51:43 +03:00
Roba Boru
7dc130d0ad
Show seat left on booking result
2026-07-14 22:51:26 +03:00
Abubeker Yasin
761d28f994
Merge pull request #688 from Tria-plc/alpha
...
Alpha
2026-07-14 22:46:48 +03:00
Stephanos A
5aa1892e19
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-14 22:44:07 +03:00
Stephanos A
d92d1cdaa4
Segment price override enabled
2026-07-14 22:43:57 +03:00
robiman
2300fc5e3b
Merge pull request #687 from Tria-plc/alpha
...
Fix seat label
2026-07-14 22:00:36 +03:00
Roba Boru
93133ed0a1
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-14 21:58:17 +03:00
Roba Boru
36ecbbe6d0
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-14 21:58:02 +03:00
Roba Boru
89b99b0a08
Fix seat label
2026-07-14 21:57:34 +03:00
Abubeker Yasin
ef7ce03318
Merge pull request #686 from Tria-plc/alpha
...
Alpha
2026-07-14 21:30:57 +03:00
Abubeker Yasin
0d29a940a6
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-14 21:26:36 +03:00
Abubeker Yasin
43aecf8376
Update page.tsx
2026-07-14 21:25:27 +03:00
robiman
4521d7b496
Merge pull request #685 from Tria-plc/alpha
...
Fix route datetime on lookup page
2026-07-14 21:24:02 +03:00
