@easypayment/medusa-paypal 0.6.7 → 0.6.8

package/src/subscribers/paypal-order-invoice.ts

@@ -1,15 +1,12 @@
-import type { MedusaContainer } from "@medusajs/framework/types"
+import type { SubscriberArgs, SubscriberConfig } from "@medusajs/framework"
 import type PayPalModuleService from "../modules/paypal/service"
 import { getPayPalAccessToken } from "../modules/paypal/utils/paypal-auth"
 import { isPayPalProviderId } from "../modules/paypal/utils/provider-ids"
 
-export default async function paypalOrderInvoiceSubscriber({
+export default async function paypalOrderInvoiceHandler({
   event,
   container,
-}: {
-  event: { data: { id: string } }
-  container: MedusaContainer
-}) {
+}: SubscriberArgs<{ id: string }>) {
   const orderId = event?.data?.id
   if (!orderId) return
 
@@ -27,6 +24,7 @@ export default async function paypalOrderInvoiceSubscriber({
         "payment_collections.payment_sessions.data",
         "payment_collections.payment_sessions.provider_id",
         "payment_collections.payment_sessions.status",
+        "payment_collections.payment_sessions.created_at",
       ],
       filters: { id: orderId },
     })
@@ -35,21 +33,29 @@ export default async function paypalOrderInvoiceSubscriber({
     if (!order) return
 
     // Find the PayPal session
-    const sessions = order.payment_collections?.flatMap(
+    const sessions = (order.payment_collections || []).flatMap(
       (pc: any) => pc.payment_sessions || []
-    ) || []
+    )
 
     const paypalSession = sessions
       .filter((s: any) => isPayPalProviderId(s.provider_id))
-      .sort((a: any, b: any) =>
-        new Date(b.created_at || 0).getTime() - new Date(a.created_at || 0).getTime()
+      .sort(
+        (a: any, b: any) =>
+          new Date(b.created_at || 0).getTime() -
+          new Date(a.created_at || 0).getTime()
       )[0]
 
-    if (!paypalSession) return
+    if (!paypalSession) {
+      console.info("[PayPal] invoice subscriber: no PayPal session found for order", orderId)
+      return
+    }
 
-    const paypalData = (paypalSession.data?.paypal || {}) as Record<string, any>
+    const paypalData = ((paypalSession.data || {}).paypal || {}) as Record<string, any>
     const paypalOrderId = String(paypalData.order_id || "")
-    if (!paypalOrderId) return
+    if (!paypalOrderId) {
+      console.info("[PayPal] invoice subscriber: no PayPal order_id in session for order", orderId)
+      return
+    }
 
     // Get invoice prefix from settings
     const settings = await paypal.getSettings().catch(() => ({}))
@@ -64,7 +70,7 @@ export default async function paypalOrderInvoiceSubscriber({
         : ""
 
     // Build industry-standard invoice ID: prefix + order display_id
-    // e.g. "WC-139" or "ORD-139"
+    // e.g. "WC-140" or "ORD-140"
     const displayId = String(order.display_id || "")
     const invoiceId = `${invoicePrefix}${displayId}`.trim()
     if (!invoiceId) return
@@ -90,20 +96,20 @@ export default async function paypalOrderInvoiceSubscriber({
 
     if (patchResp.ok || patchResp.status === 204) {
       console.info(
-        `[PayPal] invoice_id updated to "${invoiceId}" for PayPal order ${paypalOrderId} (Medusa order ${orderId})`
+        `[PayPal] invoice_id updated to "${invoiceId}" for PayPal order ${paypalOrderId} (Medusa order #${displayId})`
       )
     } else {
       const text = await patchResp.text().catch(() => "")
       console.warn(
-        `[PayPal] invoice_id patch failed (${patchResp.status}) for order ${paypalOrderId}: ${text}`
+        `[PayPal] invoice_id patch failed (${patchResp.status}) for PayPal order ${paypalOrderId}: ${text}`
       )
     }
   } catch (e: any) {
     // Non-fatal — never block order placement
-    console.warn("[PayPal] paypalOrderInvoiceSubscriber error:", e?.message || e)
+    console.warn("[PayPal] paypalOrderInvoiceHandler error:", e?.message || e)
   }
 }
 
-export const config = {
+export const config: SubscriberConfig = {
   event: "order.placed",
 }