@reactionary/medusa 0.9.27 → 0.9.28

package/capabilities/cart.capability.js

@@ -207,10 +207,12 @@ class MedusaCartCapability extends CartCapability {
    * @param currency
    * @returns
    */
-  createCartPayload(payload) {
+  async createCartPayload(payload) {
+    const newRegionId = (await this.medusaApi.getActiveRegion()).id;
     return {
       currency_code: (this.context.languageContext.currencyCode || "EUR").toLowerCase(),
       locale: this.context.languageContext.locale,
+      region_id: newRegionId,
       metadata: {
         name: payload.name
       }
@@ -245,7 +247,7 @@ class MedusaCartCapability extends CartCapability {
     try {
       const client = await this.getClient();
       const response = await client.store.cart.create(
-        this.createCartPayload(payload),
+        await this.createCartPayload(payload),
         {
           fields: this.includedFields
         }

package/capabilities/checkout.capability.js

@@ -58,7 +58,7 @@ class MedusaCheckoutCapability extends CheckoutCapability {
    *
    * example: this.includedFields = [includedFields, '+discounts.*'].join(',');
    */
-  includedFields = ["+items.*"].join(",");
+  includedFields = ["+items.*", "+order.id", "+order.display_id", "+order.custom_display_id"].join(",");
   initiateCheckoutForCartPayload(payload) {
     return {
       billing_address: payload.billingAddress ? this.mapAddressToStoreAddress(payload.billingAddress) : void 0,
@@ -242,41 +242,39 @@ class MedusaCheckoutCapability extends CheckoutCapability {
     }
   }
   async finalizeCheckout(payload) {
-    const checkout = await this.getById({ identifier: payload.checkout });
+    let checkout = await this.getById({ identifier: payload.checkout });
     if (!checkout.success || !checkout.value.readyForFinalization) {
       throw new CheckoutNotReadyForFinalizationError(payload.checkout);
     }
-    const client = await this.medusaApi.getClient();
-    const medusaId = payload.checkout;
-    const response = await client.store.cart.complete(medusaId.key);
-    if (response.type === "order") {
-      const updatedCart = await client.store.cart.update(medusaId.key, {
-        metadata: {
-          order_id: response.order.id,
-          order_display_id: response.order?.display_id ? response.order.display_id + "" : ""
-        }
-      });
-      const refreshedCheckout = await this.getById({
-        identifier: payload.checkout
-      });
-      const sessionData = this.medusaApi.getSessionData();
-      const cartCollectionKey = "_me";
-      if (sessionData.allOwnedCarts?.[cartCollectionKey]) {
-        const updatedCollection = sessionData.allOwnedCarts[cartCollectionKey].filter((x) => x.key !== updatedCart.cart.id);
-        this.medusaApi.setSessionData({
-          allOwnedCarts: {
-            ...sessionData.allOwnedCarts,
-            [cartCollectionKey]: updatedCollection
-          },
-          activeCartId: updatedCollection.length > 0 ? updatedCollection[0] : void 0
+    if (!checkout.value.resultingOrder) {
+      const client = await this.medusaApi.getClient();
+      const medusaId = payload.checkout;
+      const response = await client.store.cart.complete(medusaId.key);
+      if (response.type === "order") {
+        checkout = await this.getById({
+          identifier: payload.checkout
         });
+        if (!checkout.success) {
+          throw new Error(`Unable to reload checkout ${payload.checkout.key} after completion`);
+        }
+      } else {
+        throw new Error(`Failed to finalize checkout ${payload.checkout.key}. Expected order, got ${response.type}`);
       }
-      if (!refreshedCheckout.success) {
-        throw new Error(`Unable to reload checkout ${payload.checkout.key} after completion`);
-      }
-      return success(refreshedCheckout.value);
     }
-    throw new Error("Something failed during order creation");
+    const originatingCartRef = checkout.value.originalCartReference;
+    const sessionData = this.medusaApi.getSessionData();
+    const cartCollectionKey = "_me";
+    if (sessionData.allOwnedCarts?.[cartCollectionKey]) {
+      const updatedCollection = sessionData.allOwnedCarts[cartCollectionKey].filter((x) => x.key !== originatingCartRef?.key);
+      this.medusaApi.setSessionData({
+        allOwnedCarts: {
+          ...sessionData.allOwnedCarts,
+          [cartCollectionKey]: updatedCollection
+        },
+        activeCartId: updatedCollection.length > 0 ? updatedCollection[0] : void 0
+      });
+    }
+    return success(checkout.value);
   }
   /**
    * Extension point to map an Address to a Store Address

package/factories/checkout/checkout.factory.js

@@ -1,3 +1,5 @@
+import {
+} from "@medusajs/types";
 import {
   AddressIdentifierSchema,
   MonetaryAmountSchema,
@@ -86,6 +88,9 @@ class MedusaCheckoutFactory {
       return false;
     return true;
   }
+  isCart(data) {
+    return data.payment_collection !== void 0;
+  }
   parseCheckout(context, data) {
     const identifier = {
       key: data.id
@@ -132,33 +137,11 @@ class MedusaCheckoutFactory {
       };
     });
     const paymentInstructions = new Array();
-    for (const remotePayment of data.payment_collection?.payment_sessions || []) {
-      if (remotePayment.status === "canceled" || remotePayment.status === "error") {
-        console.warn(
-          `Skipping payment session ${remotePayment.id} with status ${remotePayment.status}`
-        );
-        continue;
+    if (data.payment_collection) {
+      const paymentInstruction = this.parsePaymentInstruction(context, data.payment_collection, data);
+      if (paymentInstruction) {
+        paymentInstructions.push(paymentInstruction);
       }
-      const paymentMethodIdentifier = {
-        method: remotePayment.provider_id,
-        name: remotePayment.provider_id,
-        paymentProcessor: remotePayment.provider_id
-      };
-      paymentInstructions.push({
-        identifier: {
-          key: remotePayment.id
-        },
-        amount: {
-          value: remotePayment.amount,
-          currency: remotePayment.currency_code?.toUpperCase()
-        },
-        paymentMethod: paymentMethodIdentifier,
-        protocolData: remotePayment.data ? Object.entries(remotePayment.data).map(([key, value]) => ({
-          key,
-          value: String(value)
-        })) : [],
-        status: "pending"
-      });
     }
     const originalCartReference = {
       key: data.id,
@@ -169,10 +152,16 @@ class MedusaCheckoutFactory {
       phone: data.metadata?.["sms_notification"] ?? void 0
     };
     let resultingOrder = void 0;
-    if (data.metadata?.["order_id"]) {
+    let displayId = void 0;
+    if (data["order"]?.custom_display_id) {
+      displayId = Number(data["order"].custom_display_id + "" || "0");
+    } else if (data["order"]?.display_id) {
+      displayId = Number(data["order"].display_id + "" || "0");
+    }
+    if (data["order"]?.id) {
       resultingOrder = {
-        key: data.metadata?.["order_id"] + "" || "",
-        display_id: Number(data.metadata?.["order_display_id"] + "" || "0")
+        key: data["order"].id || "",
+        display_id: displayId
       };
     }
     const readyForFinalization = this.isReadyForFinalization(
@@ -212,6 +201,61 @@ class MedusaCheckoutFactory {
     };
     return this.shippingMethodSchema.parse(sm);
   }
+  parsePaymentInstruction(_context, remotePayment, checkout) {
+    const mainSession = (remotePayment.payment_sessions || []).find(
+      (session) => session.status !== "canceled" && session.status !== "error"
+    );
+    if (!mainSession) {
+      console.log(`Skipping collection ${remotePayment.id} because it has no valid payment sessions`);
+      return void 0;
+    }
+    const paymentMethodIdentifier = {
+      method: mainSession.provider_id,
+      name: mainSession.provider_id,
+      paymentProcessor: mainSession.provider_id
+    };
+    let status = "pending";
+    switch (remotePayment.status) {
+      case "not_paid":
+        status = "pending";
+        break;
+      case "awaiting":
+        status = "pending";
+        break;
+      case "authorized":
+        status = "authorized";
+        break;
+      case "partially_authorized":
+        status = "pending";
+        break;
+      case "canceled":
+        status = "canceled";
+        break;
+      case "failed":
+        status = "canceled";
+        break;
+      case "completed":
+        status = "capture";
+        break;
+    }
+    const paymentData = mainSession.data || {};
+    const pi = {
+      identifier: {
+        key: remotePayment.id
+      },
+      amount: {
+        value: remotePayment.amount,
+        currency: remotePayment.currency_code?.toUpperCase()
+      },
+      paymentMethod: paymentMethodIdentifier,
+      protocolData: paymentData ? Object.entries(paymentData).map(([key, value]) => ({
+        key,
+        value: String(value)
+      })) : [],
+      status
+    };
+    return pi;
+  }
   parsePaymentMethod(_context, data) {
     const pm = {
       identifier: {

package/factories/order/order.factory.js

@@ -35,7 +35,7 @@ class MedusaOrderFactory {
     }
     const paymentInstructions = data.payment_collections?.map((pc) => {
       return this.parsePaymentInstruction(context, pc, data);
-    }) || [];
+    }).filter((x) => !!x) || [];
     const result = {
       identifier,
       userId,
@@ -85,10 +85,17 @@ class MedusaOrderFactory {
     return item;
   }
   parsePaymentInstruction(_context, remotePayment, order) {
+    const mainSession = (remotePayment.payment_sessions || []).find(
+      (session) => session.status !== "canceled" && session.status !== "error"
+    );
+    if (!mainSession) {
+      console.log(`Skipping collection ${remotePayment.id} because it has no valid payment sessions`);
+      return void 0;
+    }
     const paymentMethodIdentifier = {
-      method: remotePayment.payment_providers?.[0]?.id || "unknown",
-      name: remotePayment.payment_providers?.[0]?.id || "unknown",
-      paymentProcessor: remotePayment.payment_providers?.[0]?.id || "unknown"
+      method: mainSession.provider_id,
+      name: mainSession.provider_id,
+      paymentProcessor: mainSession.provider_id
     };
     let status = "pending";
     switch (remotePayment.status) {
@@ -114,7 +121,7 @@ class MedusaOrderFactory {
         status = "capture";
         break;
     }
-    const paymentData = remotePayment.payments?.[0].data || {};
+    const paymentData = mainSession.data || {};
     const pi = {
       identifier: {
         key: remotePayment.id

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@reactionary/medusa",
-  "version": "0.9.27",
+  "version": "0.9.28",
   "type": "module",
   "main": "./index.js",
   "types": "./src/index.d.ts",
   "dependencies": {
     "@medusajs/js-sdk": "^2.13.3",
-    "@reactionary/core": "0.9.27",
+    "@reactionary/core": "0.9.28",
     "debug": "^4.4.3",
     "@medusajs/types": "^2.13.3",
     "zod": "4.1.9"

package/src/capabilities/cart.capability.d.ts

@@ -34,7 +34,7 @@ export declare class MedusaCartCapability<TFactory extends CartFactory = MedusaC
      * @param currency
      * @returns
      */
-    protected createCartPayload(payload: CartMutationCreateCart): StoreCreateCart;
+    protected createCartPayload(payload: CartMutationCreateCart): Promise<StoreCreateCart>;
     protected addCartToOwnedList(cartIdentifier: MedusaCartIdentifier, companyId?: CompanyIdentifier): void;
     protected removeCartFromOwnedList(cartIdentifier: MedusaCartIdentifier, company?: CompanyIdentifier): void;
     createCart(payload: CartMutationCreateCart): Promise<Result<CartFactoryCartOutput<TFactory>>>;

package/src/factories/checkout/checkout.factory.d.ts

@@ -1,5 +1,6 @@
-import type { StoreCart, StoreCartAddress, StoreCartLineItem, StoreCartShippingOptionWithServiceZone, StorePaymentProvider } from '@medusajs/types';
-import { type Address, type AnyCheckoutSchema, type AnyPaymentMethodSchema, type AnyShippingMethodSchema, type CheckoutFactory, type CheckoutItem, type CheckoutSchema, type CostBreakDown, type Currency, type ItemCostBreakdown, type PaymentInstruction, type PaymentMethodSchema, type RequestContext, type ShippingInstruction, type ShippingMethodSchema } from '@reactionary/core';
+import type { StorePaymentCollection } from '@medusajs/types';
+import { type StoreCart, type StoreCartAddress, type StoreCartLineItem, type StoreCartShippingOptionWithServiceZone, type StorePaymentProvider } from '@medusajs/types';
+import { type Address, type AnyCheckoutSchema, type AnyPaymentMethodSchema, type AnyShippingMethodSchema, type CheckoutFactory, type CheckoutItem, type CheckoutSchema, type CostBreakDown, type Currency, type ItemCostBreakdown, type PaymentInstruction, type PaymentMethodIdentifier, type PaymentMethodSchema, type RequestContext, type ShippingInstruction, type ShippingMethodSchema } from '@reactionary/core';
 import type * as z from 'zod';
 export declare class MedusaCheckoutFactory<TCheckoutSchema extends AnyCheckoutSchema = typeof CheckoutSchema, TShippingMethodSchema extends AnyShippingMethodSchema = typeof ShippingMethodSchema, TPaymentMethodSchema extends AnyPaymentMethodSchema = typeof PaymentMethodSchema> implements CheckoutFactory<TCheckoutSchema, TShippingMethodSchema, TPaymentMethodSchema> {
     readonly checkoutSchema: TCheckoutSchema;
@@ -33,7 +34,23 @@ export declare class MedusaCheckoutFactory<TCheckoutSchema extends AnyCheckoutSc
      */
     protected parseAddress(_context: RequestContext, storeAddress: StoreCartAddress): Address;
     protected isReadyForFinalization(price: CostBreakDown, paymentInstructions: PaymentInstruction[], billingAddress?: Address, shippingAddress?: Address, shippingInstruction?: ShippingInstruction): boolean;
+    protected isCart(data: StoreCart): data is StoreCart;
     parseCheckout(context: RequestContext, data: StoreCart): z.output<TCheckoutSchema>;
     parseShippingMethod(_context: RequestContext, data: StoreCartShippingOptionWithServiceZone): z.output<TShippingMethodSchema>;
+    protected parsePaymentInstruction(_context: RequestContext, remotePayment: StorePaymentCollection, checkout: StoreCart): {
+        identifier: {
+            key: string;
+        };
+        amount: {
+            value: number;
+            currency: Currency;
+        };
+        paymentMethod: PaymentMethodIdentifier;
+        protocolData: {
+            key: string;
+            value: string;
+        }[];
+        status: "pending" | "authorized" | "canceled" | "capture";
+    } | undefined;
     parsePaymentMethod(_context: RequestContext, data: StorePaymentProvider): z.output<TPaymentMethodSchema>;
 }

package/src/factories/order/order.factory.d.ts

@@ -39,5 +39,5 @@ export declare class MedusaOrderFactory<TOrderSchema extends AnyOrderSchema = ty
             value: string;
         }[];
         status: "pending" | "authorized" | "canceled" | "capture";
-    };
+    } | undefined;
 }