Skip to content

feat(shipments): complete cancellation, ETA, and template workflows - #1617

Merged
mftee merged 2 commits into
CodeGirlsInc:mainfrom
devbackend513-ux:feature/cancellation-eta-and-shipment-templates
Sep 25, 2026
Merged

feat(shipments): complete cancellation, ETA, and template workflows#1617
mftee merged 2 commits into
CodeGirlsInc:mainfrom
devbackend513-ux:feature/cancellation-eta-and-shipment-templates

Conversation

@devbackend513-ux

@devbackend513-ux devbackend513-ux commented Sep 25, 2026

Copy link
Copy Markdown
Contributor

Summary

  • enforce cancellation-fee tiers and settle the fee atomically through the Stellar escrow flow
  • expose the dynamic ETA estimator through a validated API and reject unknown or conflicting zones
  • replace process-local shipment templates with TypeORM-backed, user-owned CRUD endpoints

Changes

  • add refund_payment_with_fee escrow settlement so the shipper receives the net refund and the platform admin receives the fee
  • add ETA DTO/controller/module wiring, explicit regional resolution, and route-shadowing coverage
  • add the shipment-template entity, migration, DTOs, ownership enforcement, and repository-backed service
  • repair the pre-existing duplicated batch-create fragments and missing admin response types required for a clean backend build

Testing

  • npm run build
  • focused backend Jest suites: shipment, cancellation, payment, Stellar fee-refund, and migration coverage passed
  • git diff --check
  • Rust tests could not complete in this environment because the repository-pinned Rust dependency set requires a newer Cargo edition; the new settlement paths are covered by added Rust tests for CI

Closes #1543
Closes #1544
Closes #1545
Closes #1546

@vercel

vercel Bot commented Sep 25, 2026

Copy link
Copy Markdown

@devbackend513-ux is attempting to deploy a commit to the Mftee's projects Team on Vercel.

A member of the Team first needs to authorize it.

@drips-wave

drips-wave Bot commented Sep 25, 2026

Copy link
Copy Markdown

@devbackend513-ux Great news! 🎉 Based on an automated assessment of this PR, the linked Wave issue(s) no longer count against your application limits.

You can now already apply to more issues while waiting for a review of this PR. Keep up the great work! 🚀

Learn more about application limits

@mftee
Merge remote-tracking branch 'origin/main' into feature/cancellation-…
ef397dd 
…eta-and-shipment-templates

# Conflicts:
#	backend/src/data-source.ts
#	backend/src/migrations/migrations.spec.ts
@mftee
mftee merged commit eb81fcf into CodeGirlsInc:main Sep 25, 2026
1 check failed
@grantfox-oss grantfox-oss Bot mentioned this pull request Sep 25, 2026
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment