Skip to content

release - #2330

Merged
charlietlamb merged 19 commits into
mainfrom
dev
Jul 22, 2026
Merged

release#2330
charlietlamb merged 19 commits into
mainfrom
dev

Conversation

@charlietlamb

@charlietlamb charlietlamb commented Jul 21, 2026

Copy link
Copy Markdown
Contributor

Summary by cubic

Shows unavoidable immediate charges (with tax) in create‑schedule previews when proration=none, auto‑releases dropped license assignments and warns affected entities, stabilizes dashboard fetch/preview defaults, deduplicates OAuth orgs, and aligns MCP org schema with organization/me.

  • Bug Fixes
    • Billing: Show immediate charges/tax in create‑schedule preview; skip proration items only when a stripeSubscription exists; automatically unassign entities when a plan removes a license pool (scoped to exact pools) with clearer ambiguous‑transition errors.
    • Dashboard: Wait for both route IDs before fetching a customer product; default plan_schedule to "immediate" for previews; show a license‑loss warning listing affected entities in the attach review.
    • Auth: Deduplicate organizations in the OAuth consent list.
    • MCP: Match organization/me by including id and optional user (accepts null); update mocks.

Written for commit 5d89832. Summary will update on new commits.

Review in cubic

Greptile Summary

This PR improves schedule previews and prevents incomplete customer-product requests. The main changes are:

  • Bug fixes: Add tax and invoice-credit data to create-schedule previews.
  • Bug fixes: Keep forced initial invoice items when no existing Stripe subscription is present.
  • Bug fixes: Wait for both customer and product route IDs before fetching a customer product.
  • Improvements: Add tests for taxed backdated schedules and guarded product queries.

Confidence Score: 5/5

This looks safe to merge.

  • No blocking issues found in the changed code.
  • The billing plan schema already supports the added preview data.
  • The new tests cover the intended billing and query behavior.

Important Files Changed

Filename Overview
server/src/internal/billing/v2/actions/createSchedule/previewCreateSchedule.ts Adds immediate tax and invoice-credit calculations to create-schedule preview plans.
server/src/internal/billing/v2/compute/finalize/finalizeLineItems.ts Keeps initial invoice items when no existing Stripe subscription can be prorated.
server/tests/integration/billing/create-schedule/backdate/create-schedule-backdate-preview.test.ts Tests a backdated no-proration schedule with a forced invoice and automatic tax.
vite/src/views/customers/customer/product/hooks/useCusProductQuery.tsx Disables customer-product fetching until both required route IDs are present.
vite/tests/views/customers/customer/product/hooks/use-cus-product-query.test.ts Tests query behavior with missing and complete route parameters.

Reviews (1): Last reviewed commit: "Merge pull request #2329 from useautumn/..." | Re-trigger Greptile

Context used:

  • Context used - When generating the key changes section of the sum... (source)

@capy-ai

capy-ai Bot commented Jul 21, 2026

Copy link
Copy Markdown
Contributor

Capy auto-review is paused for this organization because the usage-cycle auto-review limit has been reached. Increase the limit or turn it off in billing settings to resume automatic reviews.

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues found across 5 files

Confidence score: 5/5

  • Automated review surfaced no issues in the provided summaries.
  • No files require special attention.

Re-trigger cubic

@vercel

vercel Bot commented Jul 22, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

2 Skipped Deployments
Project Deployment Actions Updated (UTC)
checkout Ignored Ignored Jul 22, 2026 11:44am
landing-page Ignored Ignored Jul 22, 2026 11:44am

Request Review

@mcp-use

mcp-use Bot commented Jul 22, 2026

Copy link
Copy Markdown

Deployment #779 deployment failed

StatusLogsURLURLUpdated
FailedBuild Logs | Runtime Logs🔗 ProductionN/AJul 22 2026 11:44 am

View deployment details


Deployed on Manufact.com

…tion-list

fix(auth): deduplicate OAuth organization list
@vercel
vercel Bot temporarily deployed to staging – autumn-vite July 22, 2026 09:44 Inactive
fix(mcp): match getCurrentOrganization schema to organization/me response
@vercel
vercel Bot temporarily deployed to staging – autumn-vite July 22, 2026 10:17 Inactive
@charlietlamb
charlietlamb merged commit 450bd51 into main Jul 22, 2026
19 of 21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants