Merge pull request #915 from evershopcommerce/paypal

Fix: Refactor the paypay payment status

Author: treoden

packages/evershop/src/components/common/ui/Sonner.tsx

@@ -1,3 +1,4 @@
+import { Toaster as Sonner, type ToasterProps } from '@evershop/sonner';
 import {
   CircleCheckIcon,
   InfoIcon,
@@ -6,7 +7,6 @@ import {
   Loader2Icon
 } from 'lucide-react';
 import React from 'react';
-import { Toaster as Sonner, type ToasterProps } from '@evershop/sonner';
 
 export { toast } from '@evershop/sonner';
 

packages/evershop/src/modules/paypal/api/paypalAuthorizePayment/[bodyParser]authorize.ts

@@ -47,7 +47,7 @@ export default async (
       );
 
       if (responseData.data.status === 'COMPLETED') {
-        await updatePaymentStatus(order.order_id, 'authorized');
+        await updatePaymentStatus(order.order_id, 'paypal_authorized');
         // Add transaction data to database
         await insert('payment_transaction')
           .given({

packages/evershop/src/modules/paypal/api/paypalCaptureAuthorizedPayment/[bodyParser]capture.ts

@@ -66,7 +66,11 @@ export default async (
         `/v2/payments/authorizations/${transaction.transaction_id}`
       );
       if (transactionDetails.data.status === 'CAPTURED') {
-        await updatePaymentStatus(order.order_id, 'paid');
+        await updatePaymentStatus(
+          order.order_id,
+          'paypal_captured',
+          connection
+        );
         // Save order activities
         await addOrderActivityLog(
           order.order_id,
@@ -87,7 +91,11 @@ export default async (
         );
         if (responseData.data.status === 'COMPLETED') {
           // Update payment status
-          await updatePaymentStatus(order.order_id, 'paid', connection);
+          await updatePaymentStatus(
+            order.order_id,
+            'paypal_captured',
+            connection
+          );
           // Save order activities
           await addOrderActivityLog(
             order.order_id,

packages/evershop/src/modules/paypal/api/paypalCapturePayment/[bodyParser]capture.ts

@@ -51,7 +51,11 @@ export default async (
 
       if (responseData.data.status === 'COMPLETED') {
         // Update payment status
-        await updatePaymentStatus(order.order_id, 'paid', connection);
+        await updatePaymentStatus(
+          order.order_id,
+          'paypal_captured',
+          connection
+        );
         // Add transaction data to database
         await insert('payment_transaction')
           .given({

…evershop/src/modules/paypal/bootstrap.js …evershop/src/modules/paypal/bootstrap.tspackages/evershop/src/modules/paypal/bootstrap.js renamed to packages/evershop/src/modules/paypal/bootstrap.ts packages/evershop/src/modules/paypal/bootstrap.js renamed to packages/evershop/src/modules/paypal/bootstrap.ts

@@ -1,11 +1,32 @@
+import config from 'config';
 import { getConfig } from '../../lib/util/getConfig.js';
 import { hookAfter } from '../../lib/util/hookable.js';
-import { addProcessor } from '../../lib/util/registry.js';
 import { registerPaymentMethod } from '../checkout/services/getAvailablePaymentMethods.js';
 import { getSetting } from '../setting/services/setting.js';
 import { voidPaymentTransaction } from './services/voidPaymentTransaction.js';
 
 export default async () => {
+  const paypalPaymentStatus = {
+    order: {
+      paymentStatus: {
+        paypal_authorized: {
+          name: 'Authorized',
+          badge: 'warning'
+        },
+        paypal_captured: {
+          name: 'Captured',
+          badge: 'success'
+        }
+      },
+      psoMapping: {
+        'paypal_authorized:*': 'processing',
+        'paypal_captured:*': 'processing',
+        'paypal_captured:delivered': 'completed'
+      }
+    }
+  };
+  config.util.setModuleDefaults('oms', paypalPaymentStatus);
+
   hookAfter('changePaymentStatus', async (order, orderID, status) => {
     if (status !== 'canceled') {
       return;
@@ -24,7 +45,7 @@ export default async () => {
     validator: async () => {
       const paypalConfig = getConfig('system.paypal', {});
       let paypalStatus;
-      if (paypalConfig.status) {
+      if (paypalConfig?.status) {
         paypalStatus = paypalConfig.status;
       } else {
         paypalStatus = await getSetting('paypalPaymentStatus', 0);

packages/evershop/src/modules/paypal/migration/Version-1.0.0.ts

@@ -0,0 +1,24 @@
+import { execute } from '@evershop/postgres-query-builder';
+import type { PoolClient } from '@evershop/postgres-query-builder';
+
+export default async (connection: PoolClient) => {
+  // Migrate legacy Stripe payment statuses to the new prefixed values.
+  // Only orders placed with payment_method = 'paypal' are affected.
+  const statusMap: Record<string, string> = {
+    authorized: 'paypal_authorized',
+    failed: 'paypal_failed',
+    refunded: 'paypal_refunded',
+    partial_refunded: 'paypal_partial_refunded',
+    paid: 'paypal_captured'
+  };
+
+  for (const [oldStatus, newStatus] of Object.entries(statusMap)) {
+    await execute(
+      connection,
+      `UPDATE "order"
+       SET "payment_status" = '${newStatus}'
+       WHERE "payment_method" = 'paypal'
+         AND "payment_status" = '${oldStatus}'`
+    );
+  }
+};

packages/evershop/src/modules/paypal/pages/admin/orderEdit/PaypalCaptureButton.tsx

@@ -43,7 +43,7 @@ export default function PaypalCaptureButton({
   return (
     <RenderIfTrue
       condition={
-        paymentMethod === 'paypal' && paymentStatus.code === 'authorized'
+        paymentMethod === 'paypal' && paymentStatus.code === 'paypal_authorized'
       }
     >
       <CardContent>

packages/evershop/src/modules/stripe/bootstrap.ts

@@ -18,7 +18,7 @@ export default async () => {
         },
         stripe_captured: {
           name: 'Captured',
-          isDefault: true,
+          isDefault: false,
           isCancelable: false,
           badge: 'success'
         },