Commit Graph

  • 3bfff77bfb Merge pull request #1286 from Tria-plc/dev mulish77 2026-08-14 08:44:44 +03:00
  • a33494a3ae Fix price on voucher robiman 2026-08-14 08:25:12 +03:00
  • f3ac818d58 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into feature/report feature/report Roba Boru 2026-08-14 08:23:45 +03:00
  • f41402422b Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into feature/report Roba Boru 2026-08-14 08:23:17 +03:00
  • aa850146dc Fix price on voucher Roba Boru 2026-08-14 08:22:50 +03:00
  • 1a1e985d7f Merge pull request #1284 from Tria-plc/staging Abubeker Yasin 2026-08-13 23:46:16 +03:00
  • ec52f15039 Merge pull request #1283 from Tria-plc/dev Abubeker Yasin 2026-08-13 23:33:15 +03:00
  • 62bb190752 Merge pull request #1282 from Tria-plc/alpha Abubeker Yasin 2026-08-13 23:32:25 +03:00
  • 449dea78ab feat: ( dashboard ) add booking charts Abubeker Yasin 2026-08-13 23:31:20 +03:00
  • cdc9db77ae Updated financial report and exclude fayda for Ethiopian when origin is outside of Ethiopia robiman 2026-08-13 22:50:41 +03:00
  • 1f0d3d3a22 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into feature/report Roba Boru 2026-08-13 22:48:00 +03:00
  • 376c23a0ad Updated financial report and sms outside of Ethiopia Roba Boru 2026-08-13 22:47:22 +03:00
  • 553524ee56 Merge pull request #1280 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-13 22:16:04 +03:00
  • 6cee9a2676 fix:contract page Nathnael 2026-08-13 19:13:18 +00:00
  • e17df57a37 Merge pull request #1279 from Tria-plc/freight_feature/usermanagement marshal 2026-08-13 21:58:33 +03:00
  • b9ba830a09 shipping line Marshal 2026-08-13 18:56:52 +00:00
  • 147887b7c5 feat: dashbaord overview Nathnael 2026-08-13 18:13:42 +00:00
  • 0e00a98ef3 feat: implement shipping line booking completion functionality Marshal 2026-08-13 15:10:27 +00:00
  • 5837ac7b6e Merge branch 'dev' Marshal 2026-08-13 14:14:31 +00:00
  • df2faa1ee9 Merge pull request #1278 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-13 16:50:04 +03:00
  • 89cdc0ad06 style: ui fixes Nathnael 2026-08-13 13:46:46 +00:00
  • f5a19a705a Merge branch 'main' of https://github.com/Tria-plc/edr-platform into feature/report Roba Boru 2026-08-13 16:36:29 +03:00
  • be7ea17841 Merge pull request #1277 from Tria-plc/alpha Abubeker Yasin 2026-08-13 16:21:47 +03:00
  • 62b2080aaf feat: ( reports ) add fleet passenger overview to passengers landing page Abubeker Yasin 2026-08-13 16:20:21 +03:00
  • 9fff469ffa feat: implement shipping line bookings management marshalyordanos 2026-08-13 15:54:40 +03:00
  • 0df4be1820 style: overview revamp Nathnael 2026-08-13 12:44:06 +00:00
  • 2bb8d96eeb Merge pull request #1276 from Tria-plc/alpha Abubeker Yasin 2026-08-13 15:34:25 +03:00
  • aabf58320a feat: ( reports ) add fleet seat overview to seat status landing page Abubeker Yasin 2026-08-13 15:32:56 +03:00
  • c3c27d9fcf Merge pull request #1274 from Tria-plc/eims-integration Hagernesh Tadesse 2026-08-13 15:05:24 +03:00
  • adf28bd47b Merge pull request #1273 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-13 14:41:41 +03:00
  • 3190b9bd38 Merge branch 'dev' into freight/nati-2 Nathnael 2026-08-13 11:34:57 +00:00
  • 6c96b7ad94 fix(warehouses): free warehouse/yard/zone capacity on export dispatch Hagernesh 2026-08-13 11:27:15 +00:00
  • 86d69a9577 chore: group invoices, payments and usd payments Nathnael 2026-08-13 11:22:45 +00:00
  • 1088b47029 Merge pull request #1272 from Tria-plc/eims-integration Hagernesh Tadesse 2026-08-13 13:56:45 +03:00
  • c4bf3c9479 feat(freight): add company logo setting applied to every generated document Hagernesh 2026-08-13 10:53:42 +00:00
  • 63b40ea4f8 Merge pull request #1271 from Tria-plc/eims-integration Hagernesh Tadesse 2026-08-13 13:18:16 +03:00
  • e66e622ede eims cancellation Hagernesh 2026-08-13 09:52:43 +00:00
  • 89dba01cd7 feat(train-scheduling): notify customer of CAS on direct-to-train load Hagernesh 2026-08-13 09:27:01 +00:00
  • f78a19befb Merge pull request #1270 from Tria-plc/dev Abubeker Yasin 2026-08-13 12:30:07 +03:00
  • 4ae63d4e5c fix: report ordering Nathnael 2026-08-13 09:29:09 +00:00
  • ae6797ea05 Merge pull request #1269 from Tria-plc/alpha Abubeker Yasin 2026-08-13 12:23:49 +03:00
  • 1e97f46813 fix: ( notifications ) stop group-booking SMS greeting the wrong passenger Abubeker Yasin 2026-08-13 12:20:27 +03:00
  • 2fa2cae476 Merge pull request #1268 from Tria-plc/eims-integration Hagernesh Tadesse 2026-08-13 12:16:47 +03:00
  • cb27d82e8f test(freight-api): cover export field/limit/format resolution Nathnael 2026-08-13 09:07:49 +00:00
  • 58cb71a9cf feat(train-scheduling): add direct truck-to-train load action beside Load Hagernesh 2026-08-13 08:55:17 +00:00
  • 6a102bf938 feat(reports): header actions, single export dialog, date-range presets Nathnael 2026-08-13 08:53:03 +00:00
  • 58b47318e9 feat(freight-backoffice): consolidate Mantine from/to date filters into range pickers Nathnael 2026-08-13 08:45:29 +00:00
  • efc5a24380 feat(reports): add optional chart view to the report engine Nathnael 2026-08-13 08:34:08 +00:00
  • 6f14cf8bbf feat(freight-backoffice): add DateRangePicker, replace ad-hoc from/to date filters Nathnael 2026-08-13 08:33:59 +00:00
  • 833e62990e feat(train-scheduling): add wagon type, tare, equated length, station, seal no and note columns to import marshalling doc Hagernesh 2026-08-13 08:22:51 +00:00
  • 29913259f6 feat(freight-api): add 9 commercial/finance reports Nathnael 2026-08-13 08:23:19 +00:00
  • a53a9c7152 feat(freight-api): add 6 booking/train-lifecycle reports Nathnael 2026-08-13 08:14:17 +00:00
  • c0cdf80560 feat(freight-api): add 4 fleet-ops reports Nathnael 2026-08-13 08:08:13 +00:00
  • 9930bef8aa fix(freight-api): quote fallback sort aliases Nathnael 2026-08-13 07:54:44 +00:00
  • 081b9945cb feat(freight-backoffice): render reports from the server-driven catalog Nathnael 2026-08-13 07:52:29 +00:00
  • b7583df426 feat(freight-api): replace canned reports with a generic report engine Nathnael 2026-08-13 07:52:20 +00:00
  • 08804c84e9 feat(freight-api): seed a permission per report Nathnael 2026-08-13 07:52:10 +00:00
  • d261d6ea7c style: inter module integration Nathnael 2026-08-13 06:54:54 +00:00
  • 9aae132dd4 feat: add shipping line companies management marshalyordanos 2026-08-13 08:54:20 +03:00
  • 58ca7338f4 Merge pull request #1267 from Tria-plc/staging marshal 2026-08-12 20:42:25 +03:00
  • 216b358bdd Merge pull request #1266 from Tria-plc/dev marshal 2026-08-12 20:27:13 +03:00
  • f5e98ae67c Merge pull request #1265 from Tria-plc/freight_feature/usermanagement marshal 2026-08-12 20:21:26 +03:00
  • e37f1e0807 fix issue Marshal 2026-08-12 17:19:06 +00:00
  • e0f18f17b3 Merge pull request #1264 from Tria-plc/eims-integration Hagernesh Tadesse 2026-08-12 17:18:28 +03:00
  • 2d4da8110b eims integration master test complete Hagernesh 2026-08-12 14:08:28 +00:00
  • 8d53dc17ce docs(eims): confirm signing algorithm and cert format against MoR's guide Hagernesh 2026-08-12 08:08:03 +00:00
  • 5c2afe3454 fix(notifications): guard emitNew/emitUnreadCount against no WS server Hagernesh 2026-08-12 07:30:28 +00:00
  • bf67016588 Merge pull request #1263 from Tria-plc/dev marshal 2026-08-12 16:50:24 +03:00
  • 50e7ecc9eb Merge pull request #1262 from Tria-plc/freight_feature/usermanagement marshal 2026-08-12 16:49:27 +03:00
  • ff3cee12e3 feat: fuel surcharge per lane and cargo type Marshal 2026-08-12 13:47:53 +00:00
  • c93a6f8332 Merge pull request #1261 from Tria-plc/freight_feature/usermanagement marshal 2026-08-12 16:30:33 +03:00
  • dd39c2be7c baseLiters Marshal 2026-08-12 13:29:31 +00:00
  • 494b7aeca6 Merge pull request #1260 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-12 16:19:23 +03:00
  • 5a856027af feat: add email and password Nathnael 2026-08-12 12:27:15 +00:00
  • 0f1bac8080 feat(freight-api): add non-PII auth context to request log line Nathnael 2026-08-12 11:35:36 +00:00
  • 135c8e2b50 Merge pull request #1259 from Tria-plc/freight_feature/usermanagement marshal 2026-08-12 14:28:04 +03:00
  • ddcdcab518 merge conflict Marshal 2026-08-12 11:24:22 +00:00
  • 08c8b52f85 feat(portal): show payer account note and train number on booking windows Marshal 2026-08-12 11:23:19 +00:00
  • f882104ed3 fix(train-scheduling): move loose wagons and locomotives on train merge Marshal 2026-08-12 11:23:10 +00:00
  • 3dbda745dd feat(contracts): lazily expire lapsed contracts and price fuel surcharge Marshal 2026-08-12 11:23:04 +00:00
  • a02d24806b feat(rule-engine): add fuel surcharge rate trigger and cargo flag Marshal 2026-08-12 11:22:51 +00:00
  • f9167f84f7 Merge pull request #1258 from Tria-plc/dev Abubeker Yasin 2026-08-12 14:14:30 +03:00
  • 56da01dc4c Merge pull request #1257 from Tria-plc/alpha Stephanos A. 2026-08-12 13:50:44 +03:00
  • 057d68709b Backoffice build issue resolution Stephanos A 2026-08-12 13:44:52 +03:00
  • f6be3f4e32 Merge pull request #1255 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-12 13:23:29 +03:00
  • ec2b381870 Merge pull request #1256 from Tria-plc/alpha Stephanos A. 2026-08-12 13:23:00 +03:00
  • 2a816912fc fix(freight-permissions): split company stamp from per-officer teeter permission ghost2023 2026-08-12 13:18:29 +03:00
  • 9d19801535 Overall report and segment tariff override updates Stephanos A 2026-08-12 13:11:24 +03:00
  • 02a264930b fix: consolidate stamp settings into single company stamp page ghost2023 2026-08-12 13:04:18 +03:00
  • 068ee49a9f style: invoice Nathnael 2026-08-12 09:33:21 +00:00
  • bd9f7f354a feat(freight-api): enrich canonical request log line Nathnael 2026-08-12 09:31:31 +00:00
  • 4efd65c105 feat: key bulk templates by trade direction Marshal 2026-08-12 09:20:28 +00:00
  • b485e56a3e Merge pull request #1254 from Tria-plc/freight_feature/usermanagement marshal 2026-08-12 12:08:41 +03:00
  • 357aae7d82 fix issue Marshal 2026-08-12 09:08:08 +00:00
  • 6e1bd6e8aa Merge pull request #1253 from Tria-plc/freight_feature/usermanagement marshal 2026-08-12 11:58:06 +03:00
  • 08bd110e5b changes Marshal 2026-08-12 08:56:47 +00:00
  • 34fe55c8d7 Merge pull request #1252 from Tria-plc/freight_feature/usermanagement marshal 2026-08-12 11:44:22 +03:00
  • 61f261b8f0 fix issues Marshal 2026-08-12 08:42:42 +00:00
  • 8438a1ad5d Merge pull request #1251 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-12 11:42:35 +03:00
  • 879f0b890d fix: file size limit Nathnael 2026-08-12 08:42:16 +00:00