Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 13:10:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,763 Commits 96 Branches 0 Tags
2b64d835dced70a41b24e977e957cdf4ee942cb2
Commit Graph

2763 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yaschalew
2b64d835dc Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-11 08:35:09 +03:00
Stephanos A.
d927f543cf Fix checkout action version in deploy workflow 2026-07-11 01:10:10 +03:00
Stephanos A.
1d2f53a48f Merge pull request #611 from Tria-plc/alpha 
Alpha
 2026-07-11 00:56:45 +03:00
Stephanos A
3c3924b33f Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-11 00:55:09 +03:00
Stephanos A
8e2b8c9b87 Admin rule settings, minor issues resolution 2026-07-11 00:52:57 +03:00
Abubeker Yasin
3d6e1233a5 Merge pull request #610 from Tria-plc/alpha 
Fix voucher ticket number
 2026-07-11 00:52:32 +03:00
Roba Boru
874814c182 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-11 00:45:56 +03:00
Roba Boru
63881ef34a Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-11 00:45:37 +03:00
Roba Boru
c1db1c8a99 Fix voucher ticket number 2026-07-11 00:45:14 +03:00
Stephanos A.
bf85dec96a Merge pull request #609 from Tria-plc/alpha 
Alpha
 2026-07-11 00:19:01 +03:00
Stephanos A
756f670249 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-11 00:17:27 +03:00
Stephanos A
05b3cdf104 Prod test issues resolution 2026-07-11 00:16:53 +03:00
Roba Boru
b94c4480ea Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-10 21:54:15 +03:00
Roba Boru
a7a9b22bbe Update contact information 2026-07-10 21:53:42 +03:00
Abubeker Yasin
8f6fb27c32 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-10 21:31:05 +03:00
Abubeker Yasin
952d68be07 feat: ( fayda ) implement fayda for passengers 2026-07-10 21:30:20 +03:00
marshal
415e3ea2ef Merge pull request #608 from Tria-plc/freight_feature/usermanagement 
general contrat
 2026-07-10 21:00:01 +03:00
Marshal
b50075dc83 general contrat 2026-07-10 17:57:27 +00:00
Stephanos A
68c4f69cff Help content updates 2026-07-10 20:20:39 +03:00
natib21
15fc21a6c9 gps 2026-07-10 15:23:49 +00:00
yaschalew10
ca7a50c548 Merge pull request #606 from Tria-plc/freight/feature/user_management_UI 
fix
 2026-07-10 18:06:34 +03:00
natib21
4836f0e63b fix 2026-07-10 15:05:00 +00:00
yaschalew10
8b31ef85db Merge pull request #605 from Tria-plc/freight/feature/user_management_UI 
Freight/feature/user management UI
 2026-07-10 17:49:41 +03:00
natib21
7393db3d6d fix ui 2026-07-10 14:48:43 +00:00
natib21
d1d0afbd97 fix 2026-07-10 14:47:23 +00:00
yaschalew10
58c5a4c73e Merge pull request #604 from Tria-plc/freight/feature/user_management_UI 
Freight/feature/user management UI
 2026-07-10 17:23:03 +03:00
yaschalew
d30da99dfa Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-10 17:21:14 +03:00
Stephanos A.
403c4add4d Merge pull request #603 from Tria-plc/alpha 
Alpha
 2026-07-10 16:25:34 +03:00
yaschalew10
42f8fc5517 Merge pull request #602 from Tria-plc/freight/feature/user_management_UI 
Freight/feature/user management UI
 2026-07-10 16:24:37 +03:00
yaschalew
1c809764b9 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-10 16:21:51 +03:00
yaschalew
a35e48795b fix ui 2026-07-10 16:20:31 +03:00
natib21
bdb59b11bd language 2026-07-10 13:04:39 +00:00
yaschalew
060bfc28df add localize 2026-07-10 15:57:55 +03:00
natib21
a440ae6978 fix 2026-07-10 12:50:19 +00:00
Nathnael Wondisha
dd2c6e4fa3 Merge pull request #601 from Tria-plc/freight/feat/fixes-v1 
Fixing issues from the google sheets
 2026-07-10 15:26:01 +03:00
Nathnael
625b33733d Merge branch 'dev' into freight/feat/fixes-v1 2026-07-10 12:22:41 +00:00
marshal
c6d79253fb Merge pull request #600 from Tria-plc/freight_feature/usermanagement 
update booking logic for train schedules and customs contracts
 2026-07-10 15:14:27 +03:00
Marshal
a58650bdfb update booking logic for train schedules and customs contracts 2026-07-10 12:13:08 +00:00
Nathnael
f737e401b3 fix: the issue in the sheets file 2026-07-10 12:10:17 +00:00
natib21
72f0e114b1 fix ui 2026-07-10 12:09:27 +00:00
Stephanos A
3d3b0dc4c5 Mobile view dark mode toggle 2026-07-10 15:00:57 +03:00
Hagernesh Tadesse
4af75f394d Merge pull request #599 from Tria-plc/Truckdetantion 
Truckdetantion
Duplicate container number fix, 
Remove two GRN button and UUID
 2026-07-10 14:53:42 +03:00
Hagernesh
5b667715cc Merge branch 'Truckdetantion' of github.com:Tria-plc/edr-platform into Truckdetantion 
# Conflicts:
#	apps/edr-freight-web/backoffice/src/components/warehouses/ReceiveInventoryModal.tsx
 2026-07-10 11:50:24 +00:00
Stephanos A
84e6a3139c Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-10 14:43:15 +03:00
Stephanos A
5c22a9d327 Make manual ticket generation data mandatory 2026-07-10 14:41:24 +03:00
Hagernesh
267ccbca12 Merge branch 'dev' of github.com:Tria-plc/edr-platform into Truckdetantion 2026-07-10 11:39:14 +00:00
natib21
e6e44e773b fix ui 2026-07-10 11:25:59 +00:00
yaschalew
697799b00d fix 2026-07-10 14:24:58 +03:00
Hagernesh
9d147fbe26 fix(warehouses): truck-arrival crash on duplicate containers; auto-GRN on import unload 
Truck Arrival died with "[@mantine/core] Duplicate options are not supported"
when a booking carried the same container number on two container lines (the
unit uniqueness is per line, not per booking):
- bookingContainerWeights now GROUPs BY container number (MAX weight)
- the weighing modal dedupes both the containers MultiSelect and the
  assigned-trucks Select defensively, so bad data degrades instead of
  crashing the whole page

Import GRN is now issued automatically when the arrived train is unloaded:
autoUnloadArrivedBookings stamps GRN-IMPORT-<date>-<booking> on both the
create and update paths (never overwrites an existing GRN). The per-row GRN
button in the import queue lights up with no extra clicks.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-10 11:13:21 +00:00
Hagernesh
00875dd2f4 fix(billing): fallback PDF paginates long tables instead of truncating 
The marshalling manifest cut off at one page ("... 10 more row(s) not
shown") because the fallback drew rows only until it hit the bottom band.
Now the table flows across as many pages as it needs:

- page 1 keeps the full header + summary tiles; continuation pages get a slim
  "(continued — page N)" header and a re-drawn table header
- the verification notice and signature lines stay pinned to the final page,
  moving to a fresh page when rows run too deep for the bottom band
- the copy watermark repeats on every page of its copy
- a 12-page safety cap keeps the old truncation note as a last resort

Verified by standalone render: 50-row manifest -> 2 pages, all 50 rows, no
truncation; 5-row doc stays 1 page; two-copy freight order still renders 2
watermarked pages.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-10 11:13:21 +00:00