Roba Boru
47fdb07019
Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-14 10:47:22 +03:00
Roba Boru
7cb6d028cf
Remove rate time
2026-07-14 10:46:27 +03:00
SennayT
799d15bf41
Revert "remove throttler again and increase limits"
...
This reverts commit fdb5e0f74c
2026-07-14 10:44:21 +03:00
Roba Boru
e7aed5a6e4
Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-14 10:41:59 +03:00
SennayT
fdb5e0f74c
remove throttler again and increase limits
2026-07-14 10:40:11 +03:00
SennayT
8f45d7ae1f
remove throttler
2026-07-14 10:30:22 +03:00
yonastewabe
173aad7b5c
feat(seo): Add metadata and SEO improvements to passenger portal
2026-07-14 10:16:44 +03:00
robiman
f2e2eab6b4
Merge pull request #660 from Tria-plc/alpha
...
Fix error message on passenger information
2026-07-14 10:16:10 +03:00
Roba Boru
08950f09c4
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-14 10:15:30 +03:00
Roba Boru
1f34c06130
Fix error message on passenger information
2026-07-14 10:14:42 +03:00
Yonas Tewabe
3aa4451e00
Merge pull request #658 from Tria-plc/resolve-conflict
...
Merge to prod
2026-07-14 09:55:52 +03:00
Yonas Tewabe
d980d0dc40
Merge branch 'main' into resolve-conflict
2026-07-14 09:55:18 +03:00
marshal
42f948b835
Merge pull request #659 from Tria-plc/freight_feature/usermanagement
...
enhance contract clearance and train scheduling logic; add filters fo…
2026-07-14 09:54:00 +03:00
Yonas Tewabe
c361092588
Merge pull request #657 from Tria-plc/seo-enhancement
...
feat(seo): Add metadata and SEO improvements to passenger portal
2026-07-14 09:07:38 +03:00
yonastewabe
35eb4b37ac
feat(seo): Add metadata and SEO improvements to passenger portal
2026-07-14 09:06:43 +03:00
robiman
2ac9f16dcc
Merge pull request #656 from Tria-plc/alpha
...
Updated sms text
2026-07-14 09:04:08 +03:00
Roba Boru
0e18df6ad9
Updated sms text
2026-07-14 09:03:10 +03:00
Marshal
957a185a4d
enhance contract clearance and train scheduling logic; add filters for clearance documents and improve booking validation
2026-07-13 21:40:10 +00:00
SennayT
1896c8d36c
remove skip for now button
2026-07-14 00:16:06 +03:00
robiman
fe133e3d7f
Merge pull request #655 from Tria-plc/alpha
...
Removed skip for now button from passenger information
2026-07-14 00:15:44 +03:00
Roba Boru
a2f234a128
Removed skip for now button from passenger information
2026-07-14 00:14:54 +03:00
Sennay
b9646be8f1
Merge pull request #654 from Tria-plc/dev
...
dev to main
2026-07-14 00:13:26 +03:00
robiman
2e558b00c0
Merge pull request #653 from Tria-plc/alpha
...
Fix voucher alignment
2026-07-13 22:55:30 +03:00
Roba Boru
4ed6fc389e
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-13 22:54:44 +03:00
Roba Boru
5b662a2ba1
Fix voucher alignment
2026-07-13 22:54:27 +03:00
robiman
b0c32ab0fe
Merge pull request #652 from Tria-plc/alpha
...
Fix roundtrip in voucher
2026-07-13 22:34:36 +03:00
Roba Boru
163645ce75
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-13 22:32:44 +03:00
Roba Boru
dc269bed89
Fix roundtrip in voucher
2026-07-13 22:31:35 +03:00
robiman
d6b8debc70
Merge pull request #651 from Tria-plc/alpha
...
Fix voucher pdf
2026-07-13 21:44:02 +03:00
Roba Boru
e2cc9772e6
Fix voucher pdf
2026-07-13 21:42:53 +03:00
Abubeker Yasin
87f530f1de
Merge pull request #649 from Tria-plc/alpha
...
Alpha
2026-07-13 20:45:39 +03:00
Stephanos A
5f9063bdcb
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-07-13 18:58:59 +03:00
Stephanos A
860dd230ed
Excess luggage rate UI restored to Tariff Rates page
2026-07-13 18:58:44 +03:00
Hagernesh Tadesse
7026e7f9cd
Merge pull request #648 from Tria-plc/uienhancement
...
Warehouse zone occupancy heatmap
2026-07-13 16:25:01 +03:00
Abubeker Yasin
d39bf43e45
refactor: ( payment ) increase timeout
2026-07-13 15:20:56 +03:00
Hagernesh
4e8d35a7fb
Warehouse zone occupancy heatmap
...
Visualize live per-zone occupancy on the warehouse detail page.
2026-07-13 12:09:43 +00:00
marshal
1034756bab
Merge pull request #647 from Tria-plc/freight_feature/usermanagement
...
update train scheduling logic to clear trainScheduleId when unassigni…
2026-07-13 14:48:06 +03:00
Marshal
3fe4ea72ac
update train scheduling logic to clear trainScheduleId when unassigning bookings
2026-07-13 11:47:27 +00:00
Abubeker Yasin
8424d3bc7f
feat: ( payment ) wire CAC Bank OTP flow through passenger-api, portal, and backoffice
2026-07-13 14:13:31 +03:00
marshal
19fc480cc1
Merge pull request #646 from Tria-plc/freight_feature/usermanagement
...
improve group window
2026-07-13 14:08:10 +03:00
Marshal
9e748d6291
improve group window
2026-07-13 11:07:14 +00:00
Hagernesh Tadesse
b25655dc6f
Merge pull request #645 from Tria-plc/uienhancement
...
Export Truck assignment
Added truck assignment between payment and Loading status
guarded assignment to maxmum number of truck to the number of containers
2026-07-13 13:10:11 +03:00
Hagernesh
f655289eec
:Merge branch 'dev' of github.com:Tria-plc/edr-platform into uienhancement
...
Please enter a commit message to explain why this merge is necessary,
:qa!
2026-07-13 09:57:21 +00:00
Hagernesh
ae30441f07
Truck assignment for Export before loading and import after arrival
2026-07-13 09:53:33 +00:00
marshal
7001bf9c7f
Merge pull request #644 from Tria-plc/freight_feature/usermanagement
...
remove Puppeteer from docker
2026-07-13 12:30:27 +03:00
Marshal
55bc36742b
remove Puppeteer from docker
2026-07-13 09:29:35 +00:00
Abubeker Yasin
bc3973cf0d
fix:( payment ): make CAC Bank confirm work end-to-end and callback-safe
2026-07-13 12:11:47 +03:00
marshal
61cc4fab00
Merge pull request #643 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-07-13 12:11:12 +03:00
Marshal
a31f6216ce
Puppeteer PDF rendering by adding necessary dependencies and skipping Chrome download
2026-07-13 09:09:39 +00:00
Marshal
93884a43e8
Puppeteer PDF rendering by adding necessary dependencies and skipping Chrome download
2026-07-13 09:02:04 +00:00
