Commit Graph

3640 Commits

Author SHA1 Message Date
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
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
Hagernesh
7b777792e3 feat(warehouse): expand an inventory row to see which containers ride which truck
The inventory table has one row per inventory item, so on a self-haul booking
with several trucks there was no way to tell which container sat on which
truck without opening a document. The plate column now lists every plate, but
not the mapping.

Each row with a customer truck gets a chevron that opens a per-truck
breakdown: plate, driver, type, the containers it carries, and whether it has
arrived. Bulk trucks show "Bulk" — they haul loose tonnage, not containers.

The breakdown fetches only when opened, so a table nobody expands costs no
extra requests, and it reuses the existing per-booking trucks endpoint rather
than widening the inventory query.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-07-20 12:54:10 +00:00
Hagernesh
0c0de284b0 feat(warehouse): show the trucks in the yard, not just a count of them
Multi-truck self-haul had no list anywhere on the warehouse side. The ops
dashboard counted trucks on site and offered no way to open the list, and
the inventory table showed a blank plate on exactly the bookings that have
several trucks: it read booking.customer_truck_plate_number, which
multi-truck self-haul leaves null because plates live in
customer_truck_assignments. Booking BK-2026-000033 has a truck and a driver
on file and displayed neither.

Adds a Trucks on Site page listing every truck that has arrived and not yet
departed, across bookings, with plate, driver, booking, customer, containers
and dwell time. It covers both haulage paths because the gate does — a
customer's own truck and an EDR last-mile truck reach the same barrier — and
flags anything sitting over four hours. It lives under Warehouse Management
rather than Imports or Exports, since the yard is not per-direction.

The inventory queries now read plates and drivers from the assignments and
keep the booking columns as the fallback for single-truck bookings written
before that table existed.

Both new statements were EXPLAIN-validated against the live schema; the
plate fix returns the data that was previously null.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-07-20 12:54:10 +00:00
robiman
cd80a29602 Merge pull request #839 from Tria-plc/alpha
Added payment discrepancy report
2026-07-20 15:52:59 +03:00
Roba Boru
6ea2216aeb Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-20 15:50:42 +03:00
Roba Boru
bc4c085d95 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-20 15:50:29 +03:00
Roba Boru
1e7324d276 Added payment discrepancy report 2026-07-20 15:50:03 +03:00
Abubeker Yasin
fd55b5c253 Merge pull request #838 from Tria-plc/alpha
fix: (payment ) store fractional payment intent amounts
2026-07-20 15:49:22 +03:00
Abubeker Yasin
800e1e21ed fix: (payment ) store fractional payment intent amounts 2026-07-20 15:47:37 +03:00
marshal
b9b2075207 Merge pull request #837 from Tria-plc/freight_feature/usermanagement
contrat nad booking modification
2026-07-20 15:25:51 +03:00
Marshal
b90afadfba contrat nad booking modification 2026-07-20 12:24:58 +00:00
Nathnael Wondisha
0adaba9ca1 Merge pull request #836 from Tria-plc/freight/feat/fixes-v1
Freight/feat/fixes v1
2026-07-20 15:13:49 +03:00
Nathnael
804c72f14a Merge branch 'dev' into freight/feat/fixes-v1 2026-07-20 12:12:30 +00:00
Nathnael
0549a88d57 feat: otp double sending 2026-07-20 12:10:49 +00:00
Nathnael
aa02700e4c fix: disable global errors 2026-07-20 11:52:08 +00:00
Roba Boru
5e9feab869 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-20 14:45:37 +03:00
Hagernesh Tadesse
1570c8e4bf Merge pull request #835 from Tria-plc/intercity-load-unload
Truck assignment on Bulk and Container
2026-07-20 14:44:10 +03:00
Nathnael
d60f354e9f fix: reuse the locaiton too 2026-07-20 11:44:07 +00:00
Hagernesh
c8a70593cf fix(mile): apply one truck-load rule to customer and EDR haulage alike
A truck holds one 40ft or two 20ft, a container booking takes no more trucks
than it has containers, and a bulk booking takes trucks until its tonnage is
hauled away. The same physics whoever drives, but the rule was written out
four times — addTruck, updateTruck, departTruck and LastMileService — beside
a byte-identical container-size query. Copies drift: that is how the
self-haul guard ended up enforced on one side only.

The bulk cap was the real gap. EDR summed net_weight_tons of departed trucks
and refused another once the booking was drawn down. The customer side had
no cap at all: for bulk it skipped straight past every check, so a self-haul
bulk booking could take unlimited trucks.

It could not simply reuse the EDR sum. customer_truck_assignments had no net
and no tare, only a gross_weight_kg that holds tonnes despite its name and
that nothing in the live flow ever wrote — release() recorded exit weights
against the EDR table alone, which is why all five customer trucks on dev
have neither weight nor departure. Any drawdown keyed on it would have
summed zero forever and never fired.

So the customer table now carries tare_weight_tons and net_weight_tons to
match the EDR one, release() records the customer truck's exit as it already
did for EDR, and the drawdown counts both sources — a booking hauls by one
path or the other and "until no tonnage is left" means the same either way.

Also locks a load once its truck has arrived on the EDR side, which the
customer side has always done, and fills the arrival form from the customer
truck on file: the prefill read booking.customer_truck_*, which multi-truck
self-haul leaves null, so a booking with a truck assigned opened blank.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-07-20 11:41:57 +00:00
Marshal
540f4a1ff6 changes 2026-07-20 11:41:57 +00:00
Marshal
0727de0f4d Refactor clearance terminology to document approval across services and UI components 2026-07-20 11:41:57 +00:00
Nathnael
b67aa813f9 fix: type error in portal 2026-07-20 11:41:57 +00:00