Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 09:42:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
995 Commits 96 Branches 0 Tags
3ad18277eae3ccfddaf797be461fcdcb00e6f66d
Commit Graph

995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marshal
3ad18277ea Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-18 17:04:35 +03:00
marshal
8258429c28 fix: hardcode payment API URL to production endpoint 2026-06-18 15:09:09 +03:00
yaschalew10
a9aa4876af Merge pull request #214 from Tria-plc/Demurrage_invoices 
fix migration
 2026-06-18 12:25:46 +03:00
natib21
398bc9330e fix migration 2026-06-18 09:11:10 +00:00
marshal
aef1214d1e Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-18 10:29:42 +03:00
Marshal
62038458f8 refactor: disable demo data seeders while retaining for easy re-enabling 2026-06-18 07:27:57 +00:00
yaschalew10
9cc40514c4 Merge pull request #212 from Tria-plc/freight_hotfix_2 
fix data integrity issue
 2026-06-18 10:14:21 +03:00
natib21
58fcf9ce3f fix data integrity issue 2026-06-18 07:13:08 +00:00
Marshal
16bb0b5246 changes 2026-06-18 06:58:01 +00:00
Yonas Tewabe
b9c43e9214 Update service paths in deploy workflow 2026-06-18 09:18:37 +03:00
Eyob T.
ad11f8c220 Merge pull request #211 from Tria-plc/alpha 
Fix missing booking columns
 2026-06-18 08:27:52 +03:00
Stephanos A
aefee5027a Fix missing booking columns 2026-06-18 08:26:05 +03:00
Hagernesh Tadesse
0c6cf97a59 Merge pull request #210 from Tria-plc/Demurrage_invoices 
Demurrage invoices
 2026-06-18 03:15:19 +03:00
Hagernesh
be12a9d496 fee invoice frontend 2026-06-18 00:12:59 +00:00
Hagernesh
3860d17304 demurrage invoices 2026-06-18 00:05:50 +00:00
Hagernesh
33b74a5da9 demurrage invoices 2026-06-18 00:04:07 +00:00
Hagernesh
01aec12ee9 feat(warehouse): Batch 5 — config-driven allocation + storage/demurrage fee rules 
- Allocation rules engine: cargo/container/trade criteria -> deterministic yard/warehouse/zone by code; wired into auto-unload (fallback to default)
- Storage/demurrage fee rules: configurable freeDays + ratePerDay; most-specific match; fee preview per inventory item
- Inventory demurrage timestamps: inspectionStartedAt, inspectionCompletedAt, readyForPickupAt, releaseDate, gateClearedAt
- Migration 1790000000000 (allocation_rules + fee_rules tables + inventory date columns)
- Frontend: Allocation & Fees config page, automatic Fee Preview modal, plumbing/hooks
- No invoice/payment (Batch 6)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-06-17 23:53:04 +00:00
Hagernesh
270e39edd6 fix: post-merge cleanup after freight/develop merge 
- Remove orphaned container publish route (service method dropped on develop)
- turbo.json concurrency as string "12" (parse + 11 persistent-task limit)
- database.config: synchronize false (migrations only; fixes weight_limit_rules boot crash)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-06-17 23:04:48 +00:00
Hagernesh
8db8bb1808 automation of loading and unloading 2026-06-17 22:33:51 +00:00
Hagernesh
89d651693b automation of loading and unloading 2026-06-17 22:33:06 +00:00
Hagernesh
ff79657018 automation 2026-06-17 22:16:01 +00:00
Hagernesh
5a6e1ef363 automation 2026-06-17 22:01:47 +00:00
Hagernesh
5b8cb16c1a automation 2026-06-17 22:00:53 +00:00
Hagernesh
1db1467ea1 automated loading and unloading 2026-06-17 21:45:22 +00:00
marshal
d062a74e27 Merge pull request #208 from Tria-plc/freight_feature/priority 
add payment currency field to booking forms with ETB/USD selection su…
 2026-06-17 23:05:03 +03:00
marshal
1d9e0f2108 add payment currency field to booking forms with ETB/USD selection support 2026-06-17 23:01:08 +03:00
Eyob T.
1f37803454 Merge pull request #207 from Tria-plc/alpha 
Pull request for enhancements and UAT feedback
 2026-06-17 22:31:22 +03:00
marshal
48b33f86f6 Merge pull request #206 from Tria-plc/freight_feature/priority 
Freight feature/priority
 2026-06-17 22:25:19 +03:00
marshal
8396b83f46 add price change confirmation modal and support document replacement for change-requested bookings 2026-06-17 22:23:48 +03:00
Stephanos A
a25ee13339 Updated to address requests and UAT feedback 2026-06-17 22:23:24 +03:00
marshal
507758ea39 fix: update booking data structure to use meta.total and add null coalescing for checkbox states 2026-06-17 21:14:00 +03:00
marshal
800c9fcb7c Merge pull request #205 from Tria-plc/freight_feature/priority 
Freight feature/priority
 2026-06-17 21:03:04 +03:00
marshal
ca7d5cb92b switch API base URL from localhost to production endpoint 2026-06-17 20:57:42 +03:00
marshal
1141370767 update signup phone validation to enforce Ethiopian mobile format and fix invoice default balance 2026-06-17 20:56:40 +03:00
Marshal
51e0d4897a update authentication pages with new layout and functionality 2026-06-17 17:49:16 +00:00
marshal
58e6e05458 add login image 2026-06-17 20:30:20 +03:00
Stephanos A
b3904caacb Refactor expireHolds to optimize expired seat hold deletion 2026-06-17 20:23:32 +03:00
Stephanos A
5a5e9b55ed Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-17 20:20:53 +03:00
Stephanos A
46d332e153 Seat hold updates 2026-06-17 20:20:40 +03:00
Abubeker Yasin
a6fb5e1b74 Merge pull request #204 from Tria-plc/feat/payment-microservice 
refactor: ( waafi ) use USD for demo
 2026-06-17 20:15:06 +03:00
Marshal
5b9fed57fe add payment success and failure pages with environment variable support 2026-06-17 17:13:19 +00:00
Abubeker Yasin
be64352bf1 refactor: ( waafi ) use USD for demo 2026-06-17 20:12:44 +03:00
Marshal
3798b28bcd implement auto-consolidation for freight bookings at submission time 2026-06-17 16:46:44 +00:00
Eyob T.
31fc93a9d5 Merge pull request #203 from Tria-plc/alpha 
Update email/sms service config
 2026-06-17 19:37:11 +03:00
Roba Boru
1dc7766078 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-17 19:33:27 +03:00
Roba Boru
e550c6ed36 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-17 19:33:10 +03:00
Marshal
bd0d90eddd Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-17 16:33:07 +00:00
Roba Boru
bc61578f80 Update email/sms service config 2026-06-17 19:32:40 +03:00
Eyob T.
ddf42f3a34 Merge pull request #202 from Tria-plc/alpha 
Pull request for round trip and transit related updates
 2026-06-17 18:47:31 +03:00
Stephanos A
4601ee0e60 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-17 18:12:58 +03:00