payment-kit 1.13.149 → 1.13.150

package/api/src/integrations/stripe/resource.ts

@@ -3,6 +3,7 @@ import merge from 'lodash/merge';
 
 import logger from '../../libs/logger';
 import { getPriceUintAmountByCurrency } from '../../libs/session';
+import { getSubscriptionItemPrice } from '../../libs/subscription';
 import {
   Customer,
   PaymentCurrency,
@@ -244,7 +245,7 @@ export async function ensureStripeSubscription(
     await Promise.all(
       stripeSubscription.items.data.map(async (x: any) => {
         const item = prices.find((y) => y.stripePrice.id === x.price.id);
-        const price = item.upsell_price || item.price; // local
+        const price = getSubscriptionItemPrice(item); // local
         let exist = await SubscriptionItem.findOne({
           where: { price_id: price.id, subscription_id: internal.id },
         });

package/api/src/libs/subscription.ts

@@ -97,14 +97,14 @@ export function getSubscriptionCreateSetup(items: TLineItemExpanded[], currencyI
   let setup = new BN(0);
 
   items.forEach((x) => {
-    const price = x.upsell_price || x.price;
+    const price = getSubscriptionItemPrice(x);
     const unit = getPriceUintAmountByCurrency(price, currencyId);
     if (price.type === 'one_time' || (price.type === 'recurring' && price.recurring?.usage_type === 'licensed')) {
       setup = setup.add(new BN(unit).mul(new BN(x.quantity)));
     }
   });
 
-  const item = items.find((x) => x.price.type === 'recurring');
+  const item = items.find((x) => getSubscriptionItemPrice(x).type === 'recurring');
   const recurring = (item?.upsell_price || item?.price)?.recurring as PriceRecurring;
   const cycle = getRecurringPeriod(recurring);
   const trial = trialInDays ? trialInDays * 24 * 60 * 60 * 1000 : 0;
@@ -148,7 +148,9 @@ export function getSubscriptionCycleAmount(items: TLineItemExpanded[], currencyI
   let amount = new BN(0);
 
   items.forEach((x) => {
-    amount = amount.add(new BN(getPriceUintAmountByCurrency(x.price, currencyId)).mul(new BN(x.quantity)));
+    amount = amount.add(
+      new BN(getPriceUintAmountByCurrency(getSubscriptionItemPrice(x), currencyId)).mul(new BN(x.quantity))
+    );
   });
 
   return {
@@ -156,6 +158,10 @@ export function getSubscriptionCycleAmount(items: TLineItemExpanded[], currencyI
   };
 }
 
+export function getSubscriptionItemPrice(item: TLineItemExpanded) {
+  return item.upsell_price || item.price;
+}
+
 export async function createProration(
   subscription: Subscription,
   setup: ReturnType<typeof getSubscriptionCreateSetup>,
@@ -175,9 +181,10 @@ export async function createProration(
   // 1. get last invoice, and invoice items, filter invoice items that are in licensed recurring mode
   const invoiceItems = await InvoiceItem.findAll({ where: { invoice_id: lastInvoice.id, proration: false } });
   const invoiceItemsExpanded = await Price.expand(invoiceItems.map((x) => x.toJSON()));
-  const prorationItems = invoiceItemsExpanded.filter(
-    (x) => x.price.type === 'recurring' && x.price.recurring?.usage_type === 'licensed'
-  );
+  const prorationItems = invoiceItemsExpanded.filter((x) => {
+    const price = getSubscriptionItemPrice(x);
+    return price.type === 'recurring' && price.recurring?.usage_type === 'licensed';
+  });
 
   // 2. calculate proration args based on the filtered invoice items
   const precision = 10000;
@@ -191,7 +198,8 @@ export async function createProration(
   let unused = new BN(0);
   const prorations = await Promise.all(
     prorationItems.map((x: TLineItemExpanded & { [key: string]: any }) => {
-      const unitAmount = getPriceUintAmountByCurrency(x.price, subscription.currency_id);
+      const price = getSubscriptionItemPrice(x);
+      const unitAmount = getPriceUintAmountByCurrency(price, subscription.currency_id);
       const amount = new BN(unitAmount)
         .mul(new BN(x.quantity))
         .mul(new BN(prorationRate))
@@ -206,11 +214,11 @@ export async function createProration(
       unused = unused.add(new BN(amount));
 
       return {
-        price_id: x.price_id,
+        price_id: price.id,
         amount: `-${amount}`,
         quantity: x.quantity,
         // @ts-ignore
-        description: `Unused time on ${x.price.product.name} after ${dayjs().format('lll')}`,
+        description: `Unused time on ${price.product.name} after ${dayjs().format('lll')}`,
         period: {
           start: lastInvoice.period_start,
           end: lastInvoice.period_end,

package/api/src/routes/connect/shared.ts

@@ -25,6 +25,7 @@ import { Product } from '../../store/models/product';
 import { SetupIntent } from '../../store/models/setup-intent';
 import { Subscription } from '../../store/models/subscription';
 import { SubscriptionItem } from '../../store/models/subscription-item';
+import { getSubscriptionItemPrice } from '../../libs/subscription';
 
 type Result = {
   checkoutSession: CheckoutSession;
@@ -446,9 +447,10 @@ export async function ensureInvoiceAndItems({
     : [];
 
   const getLineSetup = (x: TLineItemExpanded) => {
-    const price = x.upsell_price || x.price;
+    const price = getSubscriptionItemPrice(x);
     if (price.type === 'recurring' && trailing) {
       return {
+        price,
         amount: '0',
         // @ts-ignore
         description: trailing ? `${price.product.name} (trailing)` : price.product.name,
@@ -460,6 +462,7 @@ export async function ensureInvoiceAndItems({
     }
 
     return {
+      price,
       amount: new BN(getPriceUintAmountByCurrency(price, props.currency_id)).mul(new BN(x.quantity)).toString(),
       // @ts-ignore
       description: price.product.name,
@@ -470,7 +473,7 @@ export async function ensureInvoiceAndItems({
   const items = await Promise.all(
     lineItems.map((x: TLineItemExpanded) => {
       const setup = getLineSetup(x);
-      const price = x.upsell_price || x.price;
+      const { price } = setup;
       let { quantity } = x;
       if (price.type === 'recurring') {
         if (price.recurring?.usage_type === 'metered' && !metered) {
@@ -489,10 +492,10 @@ export async function ensureInvoiceAndItems({
         period: setup.period,
         currency_id: props.currency_id,
         customer_id: customer.id,
-        price_id: x.price_id,
+        price_id: price.id,
         invoice_id: invoice.id,
         subscription_id: subscription?.id,
-        subscription_item_id: subscriptionItems.find((si) => si.price_id === x.price_id)?.id,
+        subscription_item_id: subscriptionItems.find((si) => si.price_id === price.id)?.id,
         discountable: false,
         discounts: [],
         discount_amounts: [],

package/blocklet.yml

@@ -14,7 +14,7 @@ repository:
   type: git
   url: git+https://github.com/blocklet/payment-kit.git
 specVersion: 1.2.8
-version: 1.13.149
+version: 1.13.150
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.149",
+  "version": "1.13.150",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev --open",
     "eject": "vite eject",
@@ -50,7 +50,7 @@
     "@arcblock/jwt": "^1.18.110",
     "@arcblock/ux": "^2.9.29",
     "@blocklet/logger": "1.16.23",
-    "@blocklet/payment-react": "1.13.149",
+    "@blocklet/payment-react": "1.13.150",
     "@blocklet/sdk": "1.16.23",
     "@blocklet/ui-react": "^2.9.29",
     "@blocklet/uploader": "^0.0.73",
@@ -110,7 +110,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.23",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@blocklet/payment-types": "1.13.149",
+    "@blocklet/payment-types": "1.13.150",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "0edf179eb97dccee7d6ccbee7ffc00d845e4cad4"
+  "gitHead": "b65548baa2ab6bd40aec35b2a6594bfe6dbb7ee9"
 }