@fantastic.dev/better-stripe 0.71.0 → 0.72.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/README.md +1 -1
- package/dist/client/billing/checkoutPages.d.ts.map +1 -1
- package/dist/client/billing/checkoutPages.js +0 -1
- package/dist/client/billing/checkoutPages.js.map +1 -1
- package/dist/client/connect/payoutAdoptionTestHelpers.d.ts +524 -50
- package/dist/client/connect/payoutAdoptionTestHelpers.d.ts.map +1 -1
- package/dist/client/connect/payoutExecutionTestHelpers.d.ts +246 -9
- package/dist/client/connect/payoutExecutionTestHelpers.d.ts.map +1 -1
- package/dist/client/connect/payoutLargeAdoptionTestHelpers.d.ts +524 -50
- package/dist/client/connect/payoutLargeAdoptionTestHelpers.d.ts.map +1 -1
- package/dist/client/connect/payoutSyncTestHelpers.d.ts +246 -9
- package/dist/client/connect/payoutSyncTestHelpers.d.ts.map +1 -1
- package/dist/client/paymentSource/resolver.d.ts +6 -1
- package/dist/client/paymentSource/resolver.d.ts.map +1 -1
- package/dist/client/paymentSource/resolver.js +49 -41
- package/dist/client/paymentSource/resolver.js.map +1 -1
- package/dist/client/processingCostReconciliation/provider.d.ts.map +1 -1
- package/dist/client/processingCostReconciliation/provider.js +14 -2
- package/dist/client/processingCostReconciliation/provider.js.map +1 -1
- package/dist/client/settlement/authorization.fixture.d.ts +26 -0
- package/dist/client/settlement/authorization.fixture.d.ts.map +1 -1
- package/dist/client/settlement/execution.d.ts +2 -0
- package/dist/client/settlement/execution.d.ts.map +1 -1
- package/dist/client/settlement/execution.js.map +1 -1
- package/dist/client/usage/index.d.ts +1 -0
- package/dist/client/usage/index.d.ts.map +1 -1
- package/dist/client/usage/invoiceSale.d.ts +8 -0
- package/dist/client/usage/invoiceSale.d.ts.map +1 -1
- package/dist/client/usage/invoiceSale.js +3 -0
- package/dist/client/usage/invoiceSale.js.map +1 -1
- package/dist/client/usage/mixedInvoice.fixtures.d.ts +315 -0
- package/dist/client/usage/mixedInvoice.fixtures.d.ts.map +1 -0
- package/dist/client/usage/mixedInvoice.fixtures.js +55 -0
- package/dist/client/usage/mixedInvoice.fixtures.js.map +1 -0
- package/dist/client/usage/mixedInvoiceSale.d.ts +6 -0
- package/dist/client/usage/mixedInvoiceSale.d.ts.map +1 -0
- package/dist/client/usage/mixedInvoiceSale.js +160 -0
- package/dist/client/usage/mixedInvoiceSale.js.map +1 -0
- package/dist/client/usage/observationClient.d.ts +2 -2
- package/dist/client/usage/observationClient.d.ts.map +1 -1
- package/dist/client/usage/retainedInvoiceSource.d.ts +20 -0
- package/dist/client/usage/retainedInvoiceSource.d.ts.map +1 -0
- package/dist/client/usage/retainedInvoiceSource.js +92 -0
- package/dist/client/usage/retainedInvoiceSource.js.map +1 -0
- package/dist/client/usage/settlement.d.ts +5 -0
- package/dist/client/usage/settlement.d.ts.map +1 -1
- package/dist/client/usage/settlement.js +28 -9
- package/dist/client/usage/settlement.js.map +1 -1
- package/dist/component/_generated/component.d.ts +65 -0
- package/dist/component/_generated/component.d.ts.map +1 -1
- package/dist/component/balanceFunding/internal/actions.d.ts +11 -11
- package/dist/component/balanceFunding/mutations.d.ts +16 -16
- package/dist/component/balanceFunding/preparationHandlers.d.ts +8 -8
- package/dist/component/balanceFunding/workflowValidators.d.ts +16 -16
- package/dist/component/earnings/triggers.d.ts +84 -6
- package/dist/component/earnings/triggers.d.ts.map +1 -1
- package/dist/component/processingCostReconciliation/rollback.d.ts +1 -1
- package/dist/component/recoveryWorkflow/helpers.d.ts +13 -0
- package/dist/component/recoveryWorkflow/helpers.d.ts.map +1 -1
- package/dist/component/recoveryWorkflow/mutations.d.ts +13 -0
- package/dist/component/recoveryWorkflow/mutations.d.ts.map +1 -1
- package/dist/component/recoveryWorkflow/queries.d.ts +26 -0
- package/dist/component/recoveryWorkflow/queries.d.ts.map +1 -1
- package/dist/component/recoveryWorkflow/schema.d.ts +464 -16
- package/dist/component/recoveryWorkflow/schema.d.ts.map +1 -1
- package/dist/component/schema.d.ts +246 -9
- package/dist/component/settlement/mutations.d.ts +26 -0
- package/dist/component/settlement/mutations.d.ts.map +1 -1
- package/dist/component/settlement/queries.d.ts +13 -0
- package/dist/component/settlement/queries.d.ts.map +1 -1
- package/dist/component/settlement/schema.d.ts +122 -3
- package/dist/component/settlement/schema.d.ts.map +1 -1
- package/dist/component/settlement/schema.js +2 -0
- package/dist/component/settlement/schema.js.map +1 -1
- package/dist/component/usage/allowance.fixtures.d.ts +262 -25
- package/dist/component/usage/allowance.fixtures.d.ts.map +1 -1
- package/dist/component/usageCredits/accounting.fixtures.d.ts +246 -9
- package/dist/component/usageCredits/accounting.fixtures.d.ts.map +1 -1
- package/dist/shared/usageInvoiceLines.d.ts +32 -0
- package/dist/shared/usageInvoiceLines.d.ts.map +1 -0
- package/dist/shared/usageInvoiceLines.js +13 -0
- package/dist/shared/usageInvoiceLines.js.map +1 -0
- package/docs/checkout-session-pages.md +5 -0
- package/docs/evidence/native-metering/mixed-settlement-2026-10-20.json +284 -0
- package/docs/metering-setup.md +3 -2
- package/docs/usage-example.md +24 -5
- package/docs/usage-settlement.md +74 -8
- package/docs/usage-verification.md +22 -2
- package/package.json +1 -1
- package/src/client/billing/checkoutPages.test.ts +20 -1
- package/src/client/billing/checkoutPages.ts +0 -1
- package/src/client/paymentSource/resolver.ts +80 -59
- package/src/client/processingCostReconciliation/provider.ts +20 -2
- package/src/client/settlement/execution.ts +2 -0
- package/src/client/usage/index.ts +2 -0
- package/src/client/usage/invoiceSale.ts +10 -0
- package/src/client/usage/mixedInvoice.fixtures.ts +54 -0
- package/src/client/usage/mixedInvoiceSale.test.ts +92 -0
- package/src/client/usage/mixedInvoiceSale.ts +196 -0
- package/src/client/usage/mixedSettlement.test.ts +187 -0
- package/src/client/usage/retainedInvoiceSource.ts +118 -0
- package/src/client/usage/settlement.ts +47 -9
- package/src/component/_generated/component.ts +50 -0
- package/src/component/settlement/schema.ts +2 -0
- package/src/shared/usageInvoiceLines.ts +14 -0
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import { componentRef } from "../webhooks/helpers.js";
|
|
2
|
+
import { resolveVerifiedPaymentSource } from "../paymentSource/resolver.js";
|
|
3
|
+
/** Refund/dispute cost observations may reuse only the complete original, sealed line proof. */
|
|
4
|
+
export async function retainedInvoiceSource(stripe, component, ctx, input) {
|
|
5
|
+
const payment = await stripe.paymentIntents.retrieve(input.paymentIntentId);
|
|
6
|
+
const chargeId = typeof payment.latest_charge === "string"
|
|
7
|
+
? payment.latest_charge
|
|
8
|
+
: payment.latest_charge?.id;
|
|
9
|
+
if (!chargeId)
|
|
10
|
+
return null;
|
|
11
|
+
const claim = (await ctx.runQuery(componentRef(component, "settlement/queries/getSettlementAllocation"), { sourceChargeId: chargeId }));
|
|
12
|
+
const usage = claim?.usageSource;
|
|
13
|
+
if (!claim ||
|
|
14
|
+
!usage?.invoiceLines?.length ||
|
|
15
|
+
claim.paymentIntentId !== input.paymentIntentId ||
|
|
16
|
+
claim.gross !== input.gross ||
|
|
17
|
+
claim.currency !== input.currency ||
|
|
18
|
+
usage.customerAccount !== input.customerAccountId ||
|
|
19
|
+
usage.livemode !== payment.livemode ||
|
|
20
|
+
input.stripeAccountId ||
|
|
21
|
+
(input.invoiceId !== undefined &&
|
|
22
|
+
input.invoiceId !== claim.sourceInvoiceId) ||
|
|
23
|
+
(input.subscriptionId !== undefined &&
|
|
24
|
+
input.subscriptionId !== usage.subscriptionId))
|
|
25
|
+
return null;
|
|
26
|
+
const customerId = typeof payment.customer === "string"
|
|
27
|
+
? payment.customer
|
|
28
|
+
: payment.customer?.id;
|
|
29
|
+
if (!customerId)
|
|
30
|
+
return null;
|
|
31
|
+
const realm = await stripe.accounts.retrieve(null);
|
|
32
|
+
if (realm.id !== usage.stripeAccountId)
|
|
33
|
+
return null;
|
|
34
|
+
const result = await resolveVerifiedPaymentSource(stripe, {
|
|
35
|
+
...input,
|
|
36
|
+
invoiceId: claim.sourceInvoiceId,
|
|
37
|
+
subscriptionId: usage.subscriptionId,
|
|
38
|
+
}, {
|
|
39
|
+
requirePayable: false,
|
|
40
|
+
customerId,
|
|
41
|
+
verifyInvoiceLines(invoice, lines) {
|
|
42
|
+
if (invoice.id !== claim.sourceInvoiceId ||
|
|
43
|
+
(invoice.starting_balance ?? 0) !== 0 ||
|
|
44
|
+
(invoice.ending_balance ?? 0) !== 0 ||
|
|
45
|
+
(invoice.pre_payment_credit_notes_amount ?? 0) !== 0 ||
|
|
46
|
+
(invoice.post_payment_credit_notes_amount ?? 0) !== 0 ||
|
|
47
|
+
(invoice.total_discount_amounts ?? []).length ||
|
|
48
|
+
(invoice.total_taxes ?? []).length ||
|
|
49
|
+
lines.length !== usage.invoiceLines.length)
|
|
50
|
+
return null;
|
|
51
|
+
for (const line of lines) {
|
|
52
|
+
const saved = usage.invoiceLines.find((row) => row.lineId === line.id), parent = line.parent?.subscription_item_details, price = line.pricing?.price_details;
|
|
53
|
+
if (!saved ||
|
|
54
|
+
line.object !== "line_item" ||
|
|
55
|
+
line.invoice !== invoice.id ||
|
|
56
|
+
line.currency !== claim.currency ||
|
|
57
|
+
line.livemode !== usage.livemode ||
|
|
58
|
+
!parent ||
|
|
59
|
+
parent.proration ||
|
|
60
|
+
parent.subscription !== usage.subscriptionId ||
|
|
61
|
+
parent.subscription_item !== saved.subscriptionItemId ||
|
|
62
|
+
line.pricing?.type !== "price_details" ||
|
|
63
|
+
price?.price !== saved.stripePriceId ||
|
|
64
|
+
price.product !== saved.stripeProductId ||
|
|
65
|
+
line.amount !== saved.amount ||
|
|
66
|
+
(line.quantity_decimal?.toString() ?? String(line.quantity)) !==
|
|
67
|
+
saved.quantity ||
|
|
68
|
+
line.period.start !== saved.period.start ||
|
|
69
|
+
line.period.end !== saved.period.end ||
|
|
70
|
+
(line.discount_amounts ?? []).length ||
|
|
71
|
+
(line.pretax_credit_amounts ?? []).length ||
|
|
72
|
+
(line.taxes ?? []).length)
|
|
73
|
+
return null;
|
|
74
|
+
}
|
|
75
|
+
return {
|
|
76
|
+
stripePriceId: usage.stripePriceId,
|
|
77
|
+
stripeProductId: usage.stripeProductId,
|
|
78
|
+
};
|
|
79
|
+
},
|
|
80
|
+
});
|
|
81
|
+
if (result.status === "ready" &&
|
|
82
|
+
(result.value.chargeId !== claim.sourceChargeId ||
|
|
83
|
+
result.value.invoicePaymentId !== usage.invoicePaymentId ||
|
|
84
|
+
result.value.processingFee !== claim.processingFee))
|
|
85
|
+
return {
|
|
86
|
+
status: "conflict",
|
|
87
|
+
reason: "identity_changed",
|
|
88
|
+
retryable: false,
|
|
89
|
+
};
|
|
90
|
+
return result;
|
|
91
|
+
}
|
|
92
|
+
//# sourceMappingURL=retainedInvoiceSource.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retainedInvoiceSource.js","sourceRoot":"","sources":["../../../src/client/usage/retainedInvoiceSource.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,14 @@
|
|
|
1
|
+
import { type SettlementAuthorization } from "../settlement/authorization.js";
|
|
2
|
+
import type { SettleSaleOptions } from "../settlement/settleSale.js";
|
|
1
3
|
import type Stripe from "stripe";
|
|
2
4
|
import type { Component, RunCtx } from "../helpers.js";
|
|
3
5
|
import type { SaleAllocationOptions } from "../settlement/allocation.js";
|
|
4
6
|
import type { CommissionTerm } from "../settlement/commissions.js";
|
|
5
7
|
import type { UsageInvoiceSaleOptions } from "./invoiceSale.js";
|
|
6
8
|
export type UsageInvoiceSettlementOptions = UsageInvoiceSaleOptions & {
|
|
9
|
+
authorize?: SettlementAuthorization;
|
|
10
|
+
/** Optional host-resolved, conserved allocation including owned cost recovery. */
|
|
11
|
+
allocation?: SettleSaleOptions["allocation"];
|
|
7
12
|
policy: Omit<SaleAllocationOptions, "gross" | "processingFee"> & {
|
|
8
13
|
commissionTerm?: CommissionTerm;
|
|
9
14
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settlement.d.ts","sourceRoot":"","sources":["../../../src/client/usage/settlement.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"settlement.d.ts","sourceRoot":"","sources":["../../../src/client/usage/settlement.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AASrE,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAChE,MAAM,MAAM,6BAA6B,GAAG,uBAAuB,GAAG;IACpE,SAAS,CAAC,EAAE,uBAAuB,CAAC;IACpC,kFAAkF;IAClF,UAAU,CAAC,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC7C,MAAM,EAAE,IAAI,CAAC,qBAAqB,EAAE,OAAO,GAAG,eAAe,CAAC,GAAG;QAC/D,cAAc,CAAC,EAAE,cAAc,CAAC;KACjC,CAAC;CACH,CAAC;AACF,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,6BAA6B;;;;;;;;;;;;;;;;;;;;4CAuFrC"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { authorizeSettlement, } from "../settlement/authorization.js";
|
|
2
|
+
import { assertPolicyContextMatches } from "../../shared/settlementPolicyContext.js";
|
|
1
3
|
import { getUsageInvoiceSale } from "./invoiceSale.js";
|
|
2
4
|
import { allocateSale } from "../settlement/allocation.js";
|
|
3
5
|
import { selectCommissionInvoice } from "../settlement/commissions.js";
|
|
@@ -14,8 +16,10 @@ export async function settleUsageInvoice(stripe, component, ctx, input) {
|
|
|
14
16
|
prior.processingFee !== source.processingFee ||
|
|
15
17
|
prior.currency !== source.currency))
|
|
16
18
|
throw new Error("Retained allocation conflicts with verified invoice proceeds");
|
|
19
|
+
if (prior)
|
|
20
|
+
assertPolicyContextMatches(prior.policyContext, input.allocation?.policyContext);
|
|
17
21
|
let affiliate = input.policy.affiliate;
|
|
18
|
-
if (affiliate) {
|
|
22
|
+
if (affiliate && !input.allocation) {
|
|
19
23
|
const commission = await selectCommissionInvoice(stripe, component, ctx, {
|
|
20
24
|
subscriptionId: input.subscription.subscriptionId,
|
|
21
25
|
invoiceId: source.invoiceId,
|
|
@@ -27,17 +31,30 @@ export async function settleUsageInvoice(stripe, component, ctx, input) {
|
|
|
27
31
|
if (!commission.eligible)
|
|
28
32
|
affiliate = undefined;
|
|
29
33
|
}
|
|
30
|
-
const allocation =
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
34
|
+
const allocation = input.allocation ??
|
|
35
|
+
allocateSale({
|
|
36
|
+
...input.policy,
|
|
37
|
+
affiliate,
|
|
38
|
+
gross: source.gross,
|
|
39
|
+
processingFee: source.processingFee,
|
|
40
|
+
});
|
|
41
|
+
if (input.allocation &&
|
|
42
|
+
(input.allocation.gross !== source.gross ||
|
|
43
|
+
input.allocation.processingFee !== source.processingFee ||
|
|
44
|
+
input.allocation.currency !== source.currency))
|
|
45
|
+
throw new Error("Allocation conflicts with verified invoice proceeds");
|
|
46
|
+
const request = {
|
|
47
|
+
...(input.allocation
|
|
48
|
+
? {
|
|
49
|
+
policyContext: input.allocation.policyContext,
|
|
50
|
+
adjustmentAmount: input.allocation.adjustmentAmount,
|
|
51
|
+
}
|
|
52
|
+
: {}),
|
|
37
53
|
sourceChargeId: source.chargeId,
|
|
38
54
|
paymentIntentId: source.paymentIntentId,
|
|
39
55
|
sourceInvoiceId: source.invoiceId,
|
|
40
56
|
usageSource: {
|
|
57
|
+
...(source.invoiceLines ? { invoiceLines: source.invoiceLines } : {}),
|
|
41
58
|
stripeAccountId: input.scope.stripeAccountId,
|
|
42
59
|
customerAccount: source.customerAccountId,
|
|
43
60
|
livemode: source.livemode,
|
|
@@ -55,6 +72,8 @@ export async function settleUsageInvoice(stripe, component, ctx, input) {
|
|
|
55
72
|
processingFee: source.processingFee,
|
|
56
73
|
platformNet: allocation.platformNet,
|
|
57
74
|
transfers: allocation.transfers,
|
|
58
|
-
}
|
|
75
|
+
};
|
|
76
|
+
await authorizeSettlement(input.authorize, prior ?? request);
|
|
77
|
+
return executeResolvedTransfers(stripe, component, ctx, request, input.authorize);
|
|
59
78
|
}
|
|
60
79
|
//# sourceMappingURL=settlement.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settlement.js","sourceRoot":"","sources":["../../../src/client/usage/settlement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EACL,wBAAwB,GAEzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"settlement.js","sourceRoot":"","sources":["../../../src/client/usage/settlement.ts"],"names":[],"mappings":"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"}
|
|
@@ -6491,6 +6491,19 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
|
|
|
6491
6491
|
}>;
|
|
6492
6492
|
usageSource?: {
|
|
6493
6493
|
customerAccount: string;
|
|
6494
|
+
invoiceLines?: Array<{
|
|
6495
|
+
amount: number;
|
|
6496
|
+
kind: "fixed" | "metered";
|
|
6497
|
+
lineId: string;
|
|
6498
|
+
period: {
|
|
6499
|
+
end: number;
|
|
6500
|
+
start: number;
|
|
6501
|
+
};
|
|
6502
|
+
quantity: string;
|
|
6503
|
+
stripePriceId: string;
|
|
6504
|
+
stripeProductId: string;
|
|
6505
|
+
subscriptionItemId: string;
|
|
6506
|
+
}>;
|
|
6494
6507
|
invoicePaymentId: string;
|
|
6495
6508
|
livemode: boolean;
|
|
6496
6509
|
meterId: string;
|
|
@@ -6603,6 +6616,19 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
|
|
|
6603
6616
|
}>;
|
|
6604
6617
|
usageSource?: {
|
|
6605
6618
|
customerAccount: string;
|
|
6619
|
+
invoiceLines?: Array<{
|
|
6620
|
+
amount: number;
|
|
6621
|
+
kind: "fixed" | "metered";
|
|
6622
|
+
lineId: string;
|
|
6623
|
+
period: {
|
|
6624
|
+
end: number;
|
|
6625
|
+
start: number;
|
|
6626
|
+
};
|
|
6627
|
+
quantity: string;
|
|
6628
|
+
stripePriceId: string;
|
|
6629
|
+
stripeProductId: string;
|
|
6630
|
+
subscriptionItemId: string;
|
|
6631
|
+
}>;
|
|
6606
6632
|
invoicePaymentId: string;
|
|
6607
6633
|
livemode: boolean;
|
|
6608
6634
|
meterId: string;
|
|
@@ -7107,6 +7133,19 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
|
|
|
7107
7133
|
}>;
|
|
7108
7134
|
usageSource?: {
|
|
7109
7135
|
customerAccount: string;
|
|
7136
|
+
invoiceLines?: Array<{
|
|
7137
|
+
amount: number;
|
|
7138
|
+
kind: "fixed" | "metered";
|
|
7139
|
+
lineId: string;
|
|
7140
|
+
period: {
|
|
7141
|
+
end: number;
|
|
7142
|
+
start: number;
|
|
7143
|
+
};
|
|
7144
|
+
quantity: string;
|
|
7145
|
+
stripePriceId: string;
|
|
7146
|
+
stripeProductId: string;
|
|
7147
|
+
subscriptionItemId: string;
|
|
7148
|
+
}>;
|
|
7110
7149
|
invoicePaymentId: string;
|
|
7111
7150
|
livemode: boolean;
|
|
7112
7151
|
meterId: string;
|
|
@@ -7154,6 +7193,19 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
|
|
|
7154
7193
|
}>;
|
|
7155
7194
|
usageSource?: {
|
|
7156
7195
|
customerAccount: string;
|
|
7196
|
+
invoiceLines?: Array<{
|
|
7197
|
+
amount: number;
|
|
7198
|
+
kind: "fixed" | "metered";
|
|
7199
|
+
lineId: string;
|
|
7200
|
+
period: {
|
|
7201
|
+
end: number;
|
|
7202
|
+
start: number;
|
|
7203
|
+
};
|
|
7204
|
+
quantity: string;
|
|
7205
|
+
stripePriceId: string;
|
|
7206
|
+
stripeProductId: string;
|
|
7207
|
+
subscriptionItemId: string;
|
|
7208
|
+
}>;
|
|
7157
7209
|
invoicePaymentId: string;
|
|
7158
7210
|
livemode: boolean;
|
|
7159
7211
|
meterId: string;
|
|
@@ -7214,6 +7266,19 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
|
|
|
7214
7266
|
}>;
|
|
7215
7267
|
usageSource?: {
|
|
7216
7268
|
customerAccount: string;
|
|
7269
|
+
invoiceLines?: Array<{
|
|
7270
|
+
amount: number;
|
|
7271
|
+
kind: "fixed" | "metered";
|
|
7272
|
+
lineId: string;
|
|
7273
|
+
period: {
|
|
7274
|
+
end: number;
|
|
7275
|
+
start: number;
|
|
7276
|
+
};
|
|
7277
|
+
quantity: string;
|
|
7278
|
+
stripePriceId: string;
|
|
7279
|
+
stripeProductId: string;
|
|
7280
|
+
subscriptionItemId: string;
|
|
7281
|
+
}>;
|
|
7217
7282
|
invoicePaymentId: string;
|
|
7218
7283
|
livemode: boolean;
|
|
7219
7284
|
meterId: string;
|