@evershop/evershop 2.1.1 → 2.1.2

package/src/modules/stripe/api/capturePaymentIntent/{capturePaymentIntent.js → capturePaymentIntent.ts}

@@ -1,5 +1,6 @@
 import { select } from '@evershop/postgres-query-builder';
-import stripePayment from 'stripe';
+import { NextFunction } from 'express';
+import Stripe from 'stripe';
 import { error } from '../../../../lib/log/logger.js';
 import { pool } from '../../../../lib/postgres/connection.js';
 import { getConfig } from '../../../../lib/util/getConfig.js';
@@ -8,10 +9,16 @@ import {
   INVALID_PAYLOAD,
   INTERNAL_SERVER_ERROR
 } from '../../../../lib/util/httpStatus.js';
+import { EvershopRequest } from '../../../../types/request.js';
+import { EvershopResponse } from '../../../../types/response.js';
 import { updatePaymentStatus } from '../../../oms/services/updatePaymentStatus.js';
 import { getSetting } from '../../../setting/services/setting.js';
 
-export default async (request, response, next) => {
+export default async (
+  request: EvershopRequest,
+  response: EvershopResponse,
+  next: NextFunction
+) => {
   try {
     const { order_id } = request.body;
     // Load the order
@@ -49,12 +56,12 @@ export default async (request, response, next) => {
     const stripeConfig = getConfig('system.stripe', {});
     let stripeSecretKey;
 
-    if (stripeConfig.secretKey) {
+    if (stripeConfig?.secretKey) {
       stripeSecretKey = stripeConfig.secretKey;
     } else {
       stripeSecretKey = await getSetting('stripeSecretKey', '');
     }
-    const stripe = stripePayment(stripeSecretKey);
+    const stripe = new Stripe(stripeSecretKey);
     // Retrieve the PaymentIntent
     const paymentIntent = await stripe.paymentIntents.retrieve(
       paymentTransaction.transaction_id
@@ -67,6 +74,7 @@ export default async (request, response, next) => {
           message: 'Invalid payment intent'
         }
       });
+      return;
     }
     if (paymentIntent.status !== 'requires_capture') {
       response.status(INVALID_PAYLOAD);
@@ -77,11 +85,12 @@ export default async (request, response, next) => {
             'Payment intent is not in the correct state (requires_capture)'
         }
       });
+      return;
     }
     // Capture the PaymentIntent
     await stripe.paymentIntents.capture(paymentTransaction.transaction_id);
     // Update the order status to paid
-    await updatePaymentStatus(order.order_id, 'paid');
+    await updatePaymentStatus(order.order_id, 'stripe_captured');
     response.status(OK);
     response.json({
       data: {

package/src/modules/stripe/api/createPaymentIntent/{createPaymentIntent.js → createPaymentIntent.ts}

@@ -1,12 +1,18 @@
 import { select } from '@evershop/postgres-query-builder';
-import stripePayment from 'stripe';
+import Stripe from 'stripe';
 import smallestUnit from 'zero-decimal-currencies';
 import { pool } from '../../../../lib/postgres/connection.js';
 import { getConfig } from '../../../../lib/util/getConfig.js';
 import { OK, INVALID_PAYLOAD } from '../../../../lib/util/httpStatus.js';
+import { EvershopRequest } from '../../../../types/request.js';
+import { EvershopResponse } from '../../../../types/response.js';
 import { getSetting } from '../../../setting/services/setting.js';
 
-export default async (request, response, next) => {
+export default async (
+  request: EvershopRequest,
+  response: EvershopResponse,
+  next
+) => {
   const { cart_id, order_id } = request.body;
   // Check the cart
   const cart = await select()
@@ -26,18 +32,18 @@ export default async (request, response, next) => {
     const stripeConfig = getConfig('system.stripe', {});
     let stripeSecretKey;
 
-    if (stripeConfig.secretKey) {
+    if (stripeConfig?.secretKey) {
       stripeSecretKey = stripeConfig.secretKey;
     } else {
       stripeSecretKey = await getSetting('stripeSecretKey', '');
     }
     const stripePaymentMode = await getSetting('stripePaymentMode', 'capture');
 
-    const stripe = stripePayment(stripeSecretKey);
+    const stripe = new Stripe(stripeSecretKey);
 
     // Create a PaymentIntent with the order amount and currency
     const paymentIntent = await stripe.paymentIntents.create({
-      amount: smallestUnit.default(cart.grand_total, cart.currency),
+      amount: parseInt(smallestUnit(cart.grand_total, cart.currency), 10),
       currency: cart.currency,
       metadata: {
         cart_id,

package/src/modules/stripe/api/refundPaymentIntent/{refundPaymentIntent.js → refundPaymentIntent.ts}

@@ -2,11 +2,10 @@ import {
   select,
   getConnection,
   startTransaction,
-  insert,
   commit,
   rollback
 } from '@evershop/postgres-query-builder';
-import stripePayment from 'stripe';
+import Stripe from 'stripe';
 import smallestUnit from 'zero-decimal-currencies';
 import { error } from '../../../../lib/log/logger.js';
 import { pool } from '../../../../lib/postgres/connection.js';
@@ -61,20 +60,25 @@ export default async (request, response, next) => {
     const stripeConfig = getConfig('system.stripe', {});
     let stripeSecretKey;
 
-    if (stripeConfig.secretKey) {
+    if (stripeConfig?.secretKey) {
       stripeSecretKey = stripeConfig.secretKey;
     } else {
       stripeSecretKey = await getSetting('stripeSecretKey', '');
     }
-    const stripe = stripePayment(stripeSecretKey);
+    const stripe = new Stripe(stripeSecretKey);
     // Refund
     const refund = await stripe.refunds.create({
       payment_intent: paymentTransaction.transaction_id,
-      amount: smallestUnit.default(amount, order.currency)
+      amount: parseInt(smallestUnit(amount, order.currency), 10)
     });
-    const charge = await stripe.charges.retrieve(refund.charge);
+    const chargeId =
+      typeof refund.charge === 'string'
+        ? refund.charge
+        : refund.charge?.id ?? '';
+    const charge = await stripe.charges.retrieve(chargeId);
     // Update the order status
-    const status = charge.refunded === true ? 'refunded' : 'partial_refunded';
+    const status =
+      charge.refunded === true ? 'stripe_refunded' : 'stripe_partial_refunded';
     await updatePaymentStatus(order.order_id, status, connection);
 
     // Add order activity log

package/src/modules/stripe/api/stripeWebHook/{[bodyJson]webhook.js → [bodyJson]webhook.ts}

@@ -1,5 +1,4 @@
 import {
-  insert,
   startTransaction,
   commit,
   rollback,
@@ -12,24 +11,33 @@ import { emit } from '../../../../lib/event/emitter.js';
 import { debug, error } from '../../../../lib/log/logger.js';
 import { getConnection } from '../../../../lib/postgres/connection.js';
 import { getConfig } from '../../../../lib/util/getConfig.js';
+import { EvershopRequest } from '../../../../types/request.js';
+import { EvershopResponse } from '../../../../types/response.js';
 import addOrderActivityLog from '../../../oms/services/addOrderActivityLog.js';
 import { updatePaymentStatus } from '../../../oms/services/updatePaymentStatus.js';
 import { getSetting } from '../../../setting/services/setting.js';
 
-export default async (request, response, next) => {
+export default async (
+  request: EvershopRequest,
+  response: EvershopResponse,
+  next
+) => {
   const sig = request.headers['stripe-signature'];
 
   let event;
   const connection = await getConnection();
   try {
-    const stripeConfig = getConfig('system.stripe', {});
+    const stripeConfig = getConfig('system.stripe', {}) as {
+      secretKey?: string;
+      endpointSecret?: string;
+    };
     let stripeSecretKey;
     if (stripeConfig.secretKey) {
       stripeSecretKey = stripeConfig.secretKey;
     } else {
       stripeSecretKey = await getSetting('stripeSecretKey', '');
     }
-    const stripe = stripePgk(stripeSecretKey);
+    const stripe = new stripePgk(stripeSecretKey);
 
     // Webhook enpoint secret
     let endpointSecret;
@@ -39,9 +47,13 @@ export default async (request, response, next) => {
       endpointSecret = await getSetting('stripeEndpointSecret', '');
     }
 
-    event = stripe.webhooks.constructEvent(request.body, sig, endpointSecret);
+    event = stripe.webhooks.constructEvent(
+      request.body,
+      sig as string,
+      endpointSecret
+    );
     await startTransaction(connection);
-    const paymentIntent = event.data.object;
+    const paymentIntent = event.data.object as stripePgk.PaymentIntent;
     const { order_id } = paymentIntent.metadata;
     const transaction = await select()
       .from('payment_transaction')
@@ -78,12 +90,16 @@ export default async (request, response, next) => {
           .execute(connection);
 
         if (!transaction) {
-          await updatePaymentStatus(order.order_id, 'paid', connection);
+          await updatePaymentStatus(
+            order.order_id,
+            'stripe_captured',
+            connection
+          );
 
           // Add an activity log
           await addOrderActivityLog(
             order.order_id,
-            `Customer paid by using Stripe. Transaction ID: ${paymentIntent.id}`,
+            `Payment captured by using Stripe. Transaction ID: ${paymentIntent.id}`,
             false,
             connection
           );
@@ -115,11 +131,15 @@ export default async (request, response, next) => {
           .execute(connection);
 
         if (!transaction) {
-          await updatePaymentStatus(order.order_id, 'authorized', connection);
+          await updatePaymentStatus(
+            order.order_id,
+            'stripe_authorized',
+            connection
+          );
           // Add an activity log
           await addOrderActivityLog(
             order.order_id,
-            `Customer authorized by using Stripe. Transaction ID: ${paymentIntent.id}`,
+            `Payment authorized by using Stripe. Transaction ID: ${paymentIntent.id}`,
             false,
             connection
           );

package/src/modules/stripe/{bootstrap.js → bootstrap.ts}

@@ -1,42 +1,67 @@
 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 { PaymentStatus } from '../../types/order.js';
 import { registerPaymentMethod } from '../checkout/services/getAvailablePaymentMethods.js';
 import { getSetting } from '../setting/services/setting.js';
 import { cancelPaymentIntent } from './services/cancelPayment.js';
 
 export default async () => {
-  const authorizedPaymentStatus = {
+  const stripePaymentStatus = {
     order: {
       paymentStatus: {
-        authorized: {
+        stripe_authorized: {
           name: 'Authorized',
+          isDefault: false,
+          isCancelable: true,
           badge: 'warning'
         },
-        failed: {
+        stripe_captured: {
+          name: 'Captured',
+          isDefault: false,
+          isCancelable: false,
+          badge: 'success'
+        },
+        stripe_failed: {
           name: 'Failed',
+          isDefault: false,
+          isCancelable: true,
           badge: 'critical'
         },
-        refunded: {
+        stripe_refunded: {
           name: 'Refunded',
-          badge: 'critical'
+          badge: 'destructive',
+          isCancelable: false,
+          isDefault: false
         },
-        partial_refunded: {
+        stripe_partial_refunded: {
           name: 'Partial Refunded',
-          badge: 'critical'
+          badge: 'destructive',
+          isCancelable: false,
+          isDefault: false
         }
       },
       psoMapping: {
-        'authorized:*': 'processing',
-        'failed:*': 'new',
-        'refunded:*': 'closed',
-        'partial_refunded:*': 'processing',
-        'partial_refunded:delivered': 'completed'
+        'stripe_authorized:*': 'processing',
+        'stripe_captured:*': 'processing',
+        'stripe_captured:delivered': 'completed',
+        'stripe_failed:*': 'new',
+        'stripe_refunded:*': 'closed',
+        'stripe_partial_refunded:*': 'processing',
+        'stripe_partial_refunded:delivered': 'completed'
       }
     }
+  } as {
+    order: {
+      paymentStatus: {
+        [key: string]: PaymentStatus;
+      };
+      psoMapping: {
+        [key: string]: string;
+      };
+    };
   };
-  config.util.setModuleDefaults('oms', authorizedPaymentStatus);
+  config.util.setModuleDefaults('oms', stripePaymentStatus);
 
   hookAfter('changePaymentStatus', async (order, orderID, status) => {
     if (status !== 'canceled') {
@@ -54,7 +79,7 @@ export default async () => {
       name: await getSetting('stripeDisplayName', 'Stripe')
     }),
     validator: async () => {
-      const stripeConfig = getConfig('system.stripe', {});
+      const stripeConfig = getConfig('system.stripe', {}) ?? {};
       let stripeStatus;
       if (stripeConfig.status) {
         stripeStatus = stripeConfig.status;

package/src/modules/stripe/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 = 'stripe' are affected.
+  const statusMap: Record<string, string> = {
+    authorized: 'stripe_authorized',
+    failed: 'stripe_failed',
+    refunded: 'stripe_refunded',
+    paid: 'stripe_captured',
+    partial_refunded: 'stripe_partial_refunded'
+  };
+
+  for (const [oldStatus, newStatus] of Object.entries(statusMap)) {
+    await execute(
+      connection,
+      `UPDATE "order"
+       SET "payment_status" = '${newStatus}'
+       WHERE "payment_method" = 'stripe'
+         AND "payment_status" = '${oldStatus}'`
+    );
+  }
+};

package/src/modules/stripe/pages/admin/orderEdit/StripeCaptureButton.jsx

@@ -33,7 +33,7 @@ export default function StripeCaptureButton({
   return (
     <RenderIfTrue
       condition={
-        paymentStatus.code === 'authorized' && paymentMethod === 'stripe'
+        paymentStatus.code === 'stripe_authorized' && paymentMethod === 'stripe'
       }
     >
       <CardContent>

package/src/modules/stripe/pages/admin/orderEdit/StripeRefundButton.tsx

@@ -27,11 +27,14 @@ export default function StripeRefundButton({
   order: { paymentStatus, orderId, paymentMethod, grandTotal }
 }: StripeRefundButtonProps) {
   const { openAlert, closeAlert, dispatchAlert } = useAlertContext();
+  const [loading, setLoading] = React.useState(false);
   return (
     <RenderIfTrue
       condition={
         paymentMethod === 'stripe' &&
-        ['paid', 'partial_refunded'].includes(paymentStatus.code)
+        ['stripe_captured', 'stripe_partial_refunded'].includes(
+          paymentStatus.code
+        )
       }
     >
       <CardContent>
@@ -49,6 +52,7 @@ export default function StripeRefundButton({
                       action={refundAPI}
                       submitBtn={false}
                       onSuccess={(response) => {
+                        setLoading(false);
                         if (response.error) {
                           toast.error(response.error.message);
                           dispatchAlert({
@@ -61,6 +65,7 @@ export default function StripeRefundButton({
                         }
                       }}
                       onInvalid={() => {
+                        setLoading(false);
                         dispatchAlert({
                           type: 'update',
                           payload: { secondaryAction: { isLoading: false } }
@@ -93,7 +98,7 @@ export default function StripeRefundButton({
                       <InputField
                         type="hidden"
                         name="order_id"
-                        value={orderId}
+                        defaultValue={orderId}
                       />
                     </Form>
                   </div>
@@ -106,6 +111,7 @@ export default function StripeRefundButton({
                 secondaryAction: {
                   title: 'Refund',
                   onAction: () => {
+                    setLoading(true);
                     dispatchAlert({
                       type: 'update',
                       payload: { secondaryAction: { isLoading: true } }
@@ -117,7 +123,7 @@ export default function StripeRefundButton({
                     );
                   },
                   variant: 'secondary',
-                  isLoading: false
+                  isLoading: loading
                 }
               });
             }}

package/src/modules/stripe/pages/frontStore/checkout/Stripe.tsx

@@ -384,13 +384,22 @@ export default function StripeMethod({
         const { checkout } = useCheckoutDispatch();
         const { loadingStates, orderPlaced } = useCheckout();
         const handleClick = async (e: React.MouseEvent) => {
-          e.preventDefault();
-          const validateStripe = (window as any)?.validateStripePayment;
-          if (validateStripe) {
-            await validateStripe();
+          try {
+            e.preventDefault();
+            const validateStripe = (window as any)?.validateStripePayment;
+            if (validateStripe) {
+              const isValid = await validateStripe();
+              if (!isValid) return;
+            }
+            // If validation passed, proceed with order placement
+            await checkout();
+          } catch (error) {
+            toast.error(
+              error instanceof Error
+                ? error.message
+                : _('An unexpected error occurred. Please try again.')
+            );
           }
-          // If validation passed, proceed with order placement
-          await checkout();
         };
 
         const isDisabled = loadingStates.placingOrder || orderPlaced;
@@ -463,7 +472,7 @@ export default function StripeMethod({
 }
 
 export const layout = {
-  areaId: 'checkoutForm',
+  areaId: 'checkoutFormAfter',
   sortOrder: 10
 };
 

package/src/modules/stripe/pages/frontStore/stripeReturn/{index.js → index.ts}

@@ -1,5 +1,5 @@
 import { select, update } from '@evershop/postgres-query-builder';
-import stripePayment from 'stripe';
+import Stripe from 'stripe';
 import { error } from '../../../../../lib/log/logger.js';
 import { pool } from '../../../../../lib/postgres/connection.js';
 import { buildUrl } from '../../../../../lib/router/buildUrl.js';
@@ -7,10 +7,20 @@ import { getConfig } from '../../../../../lib/util/getConfig.js';
 import { addNotification } from '../../../../../modules/base/services/notifications.js';
 import { updatePaymentStatus } from '../../../../../modules/oms/services/updatePaymentStatus.js';
 import { getSetting } from '../../../../../modules/setting/services/setting.js';
+import { EvershopRequest } from '../../../../../types/request.js';
+import { EvershopResponse } from '../../../../../types/response.js';
 
-export default async (request, response, next) => {
+export default async (
+  request: EvershopRequest,
+  response: EvershopResponse,
+  next
+) => {
   try {
     const { order_id, payment_intent } = request.query;
+    if (typeof order_id !== 'string' || typeof payment_intent !== 'string') {
+      response.redirect(buildUrl('homepage'));
+      return;
+    }
     // Check if order exist
     const order = await select()
       .from('order')
@@ -25,13 +35,13 @@ export default async (request, response, next) => {
 
     const stripeConfig = getConfig('system.stripe', {});
     let stripeSecretKey;
-    if (stripeConfig.secretKey) {
+    if (stripeConfig?.secretKey) {
       stripeSecretKey = stripeConfig.secretKey;
     } else {
       stripeSecretKey = await getSetting('stripeSecretKey', '');
     }
     const stripePaymentMode = await getSetting('stripePaymentMode', 'capture');
-    const stripe = stripePayment(stripeSecretKey);
+    const stripe = new Stripe(stripeSecretKey, {} as Stripe.StripeConfig);
     const paymentIntent = await stripe.paymentIntents.retrieve(payment_intent);
     // Check if the payment intent is succeeded
     if (
@@ -50,7 +60,7 @@ export default async (request, response, next) => {
         .given({ status: true })
         .where('cart_id', '=', order.cart_id)
         .execute(pool);
-      await updatePaymentStatus(order.order_id, 'failed');
+      await updatePaymentStatus(order.order_id, 'stripe_failed');
       // Add a error notification
       addNotification(request, 'Payment failed', 'error');
       request.session.save(() => {

package/src/modules/stripe/services/{cancelPayment.js → cancelPayment.ts}

@@ -1,11 +1,11 @@
 import { select } from '@evershop/postgres-query-builder';
-import stripePayment from 'stripe';
+import Stripe from 'stripe';
 import { error } from '../../../lib/log/logger.js';
 import { pool } from '../../../lib/postgres/connection.js';
 import { getConfig } from '../../../lib/util/getConfig.js';
 import { getSetting } from '../../setting/services/setting.js';
 
-export async function cancelPaymentIntent(orderID) {
+export async function cancelPaymentIntent(orderID: number) {
   try {
     const transaction = await select()
       .from('payment_transaction')
@@ -17,12 +17,12 @@ export async function cancelPaymentIntent(orderID) {
     const stripeConfig = getConfig('system.stripe', {});
     let stripeSecretKey;
 
-    if (stripeConfig.secretKey) {
+    if (stripeConfig?.secretKey) {
       stripeSecretKey = stripeConfig.secretKey;
     } else {
       stripeSecretKey = await getSetting('stripeSecretKey', '');
     }
-    const stripe = stripePayment(stripeSecretKey);
+    const stripe = new Stripe(stripeSecretKey);
 
     // Get the payment intent
     const paymentIntent = await stripe.paymentIntents.retrieve(

package/src/types/apiResponse.ts

@@ -1,6 +1,6 @@
 export interface ErrorResponse {
   error: {
-    code: string;
+    status: number;
     message: string;
   };
 }

package/src/types/appContext.tsx

@@ -1,5 +1,12 @@
+import { WidgetInstance } from '@evershop/evershop/types/widget';
 import { PageMetaInfo } from './pageMeta.js';
 
+type GraphqlScalar = string | number | boolean | null;
+type GraphqlResponseValue =
+  | GraphqlScalar
+  | GraphqlResponseValue[]
+  | { [key: string]: GraphqlResponseValue };
+
 interface Config {
   pageMeta: PageMetaInfo;
   tax: {
@@ -11,12 +18,10 @@ interface Config {
 }
 
 interface AppStateContextValue {
-  graphqlResponse: {
-    [key: string]: any;
-  };
+  graphqlResponse: Record<string, GraphqlResponseValue>;
   config: Config;
   propsMap: Record<string, any[]>;
-  widgets?: any[];
+  widgets?: WidgetInstance[];
   fetching: boolean;
 }
 

package/src/types/customerAddress.ts

@@ -26,5 +26,5 @@ export interface Address {
   country?: string | null;
   postcode?: string | null;
   telephone?: string | number | null;
-  [key: string]: any;
+  [key: string]: unknown;
 }