@evershop/evershop 2.1.0 → 2.1.2

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

@@ -12,6 +12,7 @@ import {
 } from '../../../../lib/util/httpStatus.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 { createAxiosInstance } from '../../services/requester.js';
 
@@ -46,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({
@@ -69,13 +70,12 @@ export default async (
           .execute(pool);
 
         // Save order activities
-        await insert('order_activity')
-          .given({
-            order_activity_order_id: order.order_id,
-            comment: `Customer authorized the payment using PayPal. Transaction ID: ${responseData.data.purchase_units[0].payments.authorizations[0].id}`,
-            customer_notified: 0
-          })
-          .execute(pool);
+        await addOrderActivityLog(
+          order.order_id,
+          `Customer authorized the payment using PayPal. Transaction ID: ${responseData.data.purchase_units[0].payments.authorizations[0].id}`,
+          false,
+          await getConnection(pool)
+        );
 
         response.status(OK);
         response.json({

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

@@ -1,11 +1,12 @@
 import {
-  getConnection,
-  insert,
-  select
+  commit,
+  rollback,
+  select,
+  startTransaction
 } from '@evershop/postgres-query-builder';
 import { AxiosError } from 'axios';
 import { error } from '../../../../lib/log/logger.js';
-import { pool } from '../../../../lib/postgres/connection.js';
+import { getConnection } from '../../../../lib/postgres/connection.js';
 import {
   INTERNAL_SERVER_ERROR,
   INVALID_PAYLOAD,
@@ -13,6 +14,7 @@ import {
 } from '../../../../lib/util/httpStatus.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 { createAxiosInstance } from '../../services/requester.js';
 
@@ -21,6 +23,8 @@ export default async (
   response: EvershopResponse,
   next
 ) => {
+  const connection = await getConnection();
+  await startTransaction(connection);
   try {
     const { order_id } = request.body;
     // Validate the order;
@@ -28,9 +32,10 @@ export default async (
       .from('order')
       .where('uuid', '=', order_id)
       .and('payment_method', '=', 'paypal')
-      .load(pool);
+      .load(connection);
 
     if (!order) {
+      await rollback(connection);
       response.status(INVALID_PAYLOAD);
       response.json({
         error: {
@@ -43,8 +48,9 @@ export default async (
       const transaction = await select()
         .from('payment_transaction')
         .where('payment_transaction_order_id', '=', order.order_id)
-        .load(pool);
+        .load(connection);
       if (!transaction) {
+        await rollback(connection);
         response.status(INVALID_PAYLOAD);
         response.json({
           error: {
@@ -60,15 +66,19 @@ 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 insert('order_activity')
-          .given({
-            order_activity_order_id: order.order_id,
-            comment: `Captured the payment. Transaction ID: ${transaction.transaction_id}`,
-            customer_notified: 0
-          })
-          .execute(pool);
+        await addOrderActivityLog(
+          order.order_id,
+          `Captured the payment. Transaction ID: ${transaction.transaction_id}`,
+          false,
+          connection
+        );
+        await commit(connection);
         response.status(OK);
         response.json({
           data: {}
@@ -81,21 +91,26 @@ export default async (
         );
         if (responseData.data.status === 'COMPLETED') {
           // Update payment status
-          await updatePaymentStatus(order.order_id, 'paid');
+          await updatePaymentStatus(
+            order.order_id,
+            'paypal_captured',
+            connection
+          );
           // Save order activities
-          await insert('order_activity')
-            .given({
-              order_activity_order_id: order.order_id,
-              comment: `Captured the payment. Transaction ID: ${transaction.transaction_id}`,
-              customer_notified: 0
-            })
-            .execute(pool);
+          await addOrderActivityLog(
+            order.order_id,
+            `Captured the payment. Transaction ID: ${transaction.transaction_id}`,
+            false,
+            connection
+          );
+          await commit(connection);
           response.status(OK);
           response.json({
             data: {}
           });
           return;
         } else {
+          await rollback(connection);
           response.status(INTERNAL_SERVER_ERROR);
           response.json({
             error: {
@@ -108,6 +123,7 @@ export default async (
       }
     }
   } catch (err) {
+    await rollback(connection);
     error(err);
     if (err instanceof AxiosError) {
       response.status(

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

@@ -1,10 +1,12 @@
 import {
-  getConnection,
+  commit,
   insert,
-  select
+  rollback,
+  select,
+  startTransaction
 } from '@evershop/postgres-query-builder';
 import { error } from '../../../../lib/log/logger.js';
-import { pool } from '../../../../lib/postgres/connection.js';
+import { getConnection } from '../../../../lib/postgres/connection.js';
 import {
   INTERNAL_SERVER_ERROR,
   INVALID_PAYLOAD,
@@ -12,6 +14,7 @@ import {
 } from '../../../../lib/util/httpStatus.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 { createAxiosInstance } from '../../services/requester.js';
 
@@ -20,15 +23,18 @@ export default async (
   response: EvershopResponse,
   next
 ) => {
+  const connection = await getConnection();
+  await startTransaction(connection);
   try {
     const { order_id } = request.body;
     // Validate the order;
     const order = await select()
       .from('order')
       .where('uuid', '=', order_id)
-      .load(pool);
+      .load(connection);
 
     if (!order) {
+      await rollback(connection);
       response.status(INVALID_PAYLOAD);
       response.json({
         error: {
@@ -45,7 +51,11 @@ export default async (
 
       if (responseData.data.status === 'COMPLETED') {
         // Update payment status
-        await updatePaymentStatus(order.order_id, 'paid');
+        await updatePaymentStatus(
+          order.order_id,
+          'paypal_captured',
+          connection
+        );
         // Add transaction data to database
         await insert('payment_transaction')
           .given({
@@ -64,22 +74,22 @@ export default async (
             transaction_type: 'online',
             additional_information: JSON.stringify(responseData.data)
           })
-          .execute(pool);
+          .execute(connection);
 
         // Save order activities
-        await insert('order_activity')
-          .given({
-            order_activity_order_id: order.order_id,
-            comment: `Customer paid using PayPal. Transaction ID: ${responseData.data.purchase_units[0].payments.captures[0].id}`,
-            customer_notified: 0
-          })
-          .execute(pool);
-
+        await addOrderActivityLog(
+          order.order_id,
+          `Captured the payment. Transaction ID: ${responseData.data.purchase_units[0].payments.captures[0].id}`,
+          false,
+          connection
+        );
+        await commit(connection);
         response.status(OK);
         response.json({
           data: {}
         });
       } else {
+        await rollback(connection);
         response.status(INTERNAL_SERVER_ERROR);
         response.json({
           error: {
@@ -91,6 +101,7 @@ export default async (
     }
   } catch (err) {
     error(err);
+    await rollback(connection);
     response.status(INTERNAL_SERVER_ERROR);
     response.json({
       error: {

package/src/modules/paypal/api/paypalCreateOrder/[bodyParser]createOrder.ts

@@ -1,6 +1,6 @@
 import { select, update } from '@evershop/postgres-query-builder';
 import type { PurchaseUnit, CreateOrderRequestBody } from '@paypal/paypal-js';
-import { error } from '../../../../lib/log/logger.js';
+import { debug, error } from '../../../../lib/log/logger.js';
 import { pool } from '../../../../lib/postgres/connection.js';
 import { buildUrl } from '../../../../lib/router/buildUrl.js';
 import { getConfig } from '../../../../lib/util/getConfig.js';
@@ -95,7 +95,10 @@ export default async (
                 value: catalogPriceInclTax
                   ? toPrice(item.final_price_incl_tax)
                   : toPrice(item.final_price)
-              }
+              },
+              category: item.no_shipping_required
+                ? 'DIGITAL_GOODS'
+                : 'PHYSICAL_GOODS'
             })),
             amount: finalAmount
           }
@@ -125,11 +128,15 @@ export default async (
       if (shippingAddress) {
         const address: any = {
           address_line_1: shippingAddress.address_1,
-          address_line_2: shippingAddress.address_2,
-          admin_area_2: shippingAddress.city,
           postal_code: shippingAddress.postcode,
           country_code: shippingAddress.country
         };
+        if (shippingAddress.address_2) {
+          address.address_line_2 = shippingAddress.address_2;
+        }
+        if (shippingAddress.city) {
+          address.admin_area_2 = shippingAddress.city;
+        }
         if (shippingAddress.province) {
           address.admin_area_1 = shippingAddress.province.split('-').pop();
         }
@@ -141,19 +148,9 @@ export default async (
           address
         };
       } else {
-        // This is digital order, no shipping address
-        orderData.purchase_units[0].shipping = {
-          address: {
-            address_line_1: 'No shipping address',
-            address_line_2: 'No shipping address',
-            admin_area_1: 'No shipping address',
-            admin_area_2: 'No shipping address',
-            postal_code: 'No shipping address',
-            country_code: 'No shipping address'
-          }
-        };
+        orderData.application_context = orderData.application_context || {};
+        orderData.application_context.shipping_preference = 'NO_SHIPPING';
       }
-
       const finalPaypalOrderData = getValueSync<CreateOrderRequestBody>(
         'finalPaypalOrderData',
         orderData,
@@ -188,6 +185,8 @@ export default async (
           }
         });
       } else {
+        debug('PayPal create order error');
+        debug(data);
         // Re-active the cart
         await update('cart')
           .given({ status: true })

package/src/modules/paypal/{bootstrap.js → 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/getAvailablePaymentMethos.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);

package/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}'`
+    );
+  }
+};

package/src/modules/paypal/pages/admin/orderEdit/PaypalCaptureButton.tsx

@@ -1,6 +1,6 @@
-import { Card } from '@components/admin/Card.js';
-import Button from '@components/common/Button.js';
 import RenderIfTrue from '@components/common/RenderIfTrue.js';
+import { Button } from '@components/common/ui/Button.js';
+import { Card, CardContent } from '@components/common/ui/Card.js';
 import axios from 'axios';
 import React from 'react';
 import { toast } from 'react-toastify';
@@ -43,14 +43,16 @@ export default function PaypalCaptureButton({
   return (
     <RenderIfTrue
       condition={
-        paymentMethod === 'paypal' && paymentStatus.code === 'authorized'
+        paymentMethod === 'paypal' && paymentStatus.code === 'paypal_authorized'
       }
     >
-      <Card.Session>
+      <CardContent>
         <div className="flex justify-end">
-          <Button title="Capture" onAction={onAction} isLoading={isLoading} />
+          <Button onClick={onAction} isLoading={isLoading}>
+            Capture Payment
+          </Button>
         </div>
-      </Card.Session>
+      </CardContent>
     </RenderIfTrue>
   );
 }

package/src/modules/paypal/pages/admin/paymentSetting/PaypalSetting.tsx

@@ -1,7 +1,13 @@
-import { Card } from '@components/admin/Card.js';
 import { InputField } from '@components/common/form/InputField.js';
 import { RadioGroupField } from '@components/common/form/RadioGroupField.js';
 import { ToggleField } from '@components/common/form/ToggleField.js';
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle
+} from '@components/common/ui/Card.js';
 import React from 'react';
 
 interface PaypalPaymentProps {
@@ -25,8 +31,14 @@ export default function PaypalPayment({
   }
 }: PaypalPaymentProps) {
   return (
-    <Card title="Paypal Payment">
-      <Card.Session>
+    <Card>
+      <CardHeader>
+        <CardTitle>Paypal Payment</CardTitle>
+        <CardDescription>
+          Configure your Paypal payment gateway settings
+        </CardDescription>
+      </CardHeader>
+      <CardContent>
         <div className="grid grid-cols-3 gap-5">
           <div className="col-span-1 items-center flex">
             <h4>Enable?</h4>
@@ -40,38 +52,36 @@ export default function PaypalPayment({
             />
           </div>
         </div>
-      </Card.Session>
-      <Card.Session>
+      </CardContent>
+      <CardContent className="pt-4 border-t border-border">
         <div className="grid grid-cols-3 gap-5">
           <div className="col-span-1 items-center flex">
             <h4>Dislay Name</h4>
           </div>
           <div className="col-span-2">
             <InputField
-              label="Display Name"
               name="paypalDisplayName"
               placeholder="Display Name"
               defaultValue={paypalDisplayName}
             />
           </div>
         </div>
-      </Card.Session>
-      <Card.Session>
+      </CardContent>
+      <CardContent className="pt-4 border-t border-border">
         <div className="grid grid-cols-3 gap-5">
           <div className="col-span-1 items-center flex">
             <h4>Client ID</h4>
           </div>
           <div className="col-span-2">
             <InputField
-              label="Client ID"
               name="paypalClientId"
               placeholder="Client ID"
               defaultValue={paypalClientId}
             />
           </div>
         </div>
-      </Card.Session>
-      <Card.Session>
+      </CardContent>
+      <CardContent className="pt-4 border-t border-border">
         <div className="grid grid-cols-3 gap-5">
           <div className="col-span-1 items-center flex">
             <h4>Client Secret</h4>
@@ -80,20 +90,18 @@ export default function PaypalPayment({
             <InputField
               name="paypalClientSecret"
               placeholder="Secret Key"
-              label="Client Secret"
               defaultValue={paypalClientSecret}
             />
           </div>
         </div>
-      </Card.Session>
-      <Card.Session>
+      </CardContent>
+      <CardContent className="pt-4 border-t border-border">
         <div className="grid grid-cols-3 gap-5">
           <div className="col-span-1 items-center flex">
             <h4>Environment</h4>
           </div>
           <div className="col-span-2">
             <RadioGroupField
-              label="Environment"
               name="paypalEnvironment"
               defaultValue={paypalEnvironment}
               options={[
@@ -109,8 +117,8 @@ export default function PaypalPayment({
             />
           </div>
         </div>
-      </Card.Session>
-      <Card.Session>
+      </CardContent>
+      <CardContent className="pt-4 border-t border-border">
         <div className="grid grid-cols-3 gap-5">
           <div className="col-span-1 items-center flex">
             <h4>Payment mode</h4>
@@ -126,7 +134,7 @@ export default function PaypalPayment({
             />
           </div>
         </div>
-      </Card.Session>
+      </CardContent>
     </Card>
   );
 }

package/src/modules/paypal/pages/frontStore/checkout/Paypal.tsx

@@ -1,3 +1,4 @@
+import { Button } from '@components/common/ui/Button.js';
 import {
   useCheckout,
   useCheckoutDispatch
@@ -79,14 +80,14 @@ export default function PaypalMethod({
   useEffect(() => {
     registerPaymentComponent('paypal', {
       nameRenderer: () => (
-        <div className="flex items-center justify-between">
+        <div className="flex items-center justify-between w-full">
           <span>{paypalDisplayName}</span>
           <PaypalLogo />
         </div>
       ),
       formRenderer: () => (
-        <div className="flex justify-center text-gray-500">
-          <div className="w-2/3 text-center p-5">
+        <div className="flex justify-center text-muted-foreground">
+          <div className="w-2/3 text-center py-3">
             {_('You will be redirected to PayPal for payment processing.')}
           </div>
         </div>
@@ -95,14 +96,22 @@ export default function PaypalMethod({
         const { checkout } = useCheckoutDispatch();
         const { loadingStates, orderPlaced } = useCheckout();
         const handleClick = async (e: React.MouseEvent) => {
-          e.preventDefault();
-          await checkout();
+          try {
+            e.preventDefault();
+            await checkout();
+          } catch (error) {
+            toast.error(
+              error.message || _('Failed to place order. Please try again.')
+            );
+          }
         };
 
         const isDisabled = loadingStates.placingOrder || orderPlaced;
 
         return (
-          <button
+          <Button
+            variant={'default'}
+            size={'xl'}
             type="button"
             onClick={handleClick}
             disabled={isDisabled}
@@ -185,7 +194,7 @@ export default function PaypalMethod({
                 </>
               )}
             </span>
-          </button>
+          </Button>
         );
       }
     });
@@ -195,7 +204,7 @@ export default function PaypalMethod({
 }
 
 export const layout = {
-  areaId: 'checkoutForm',
+  areaId: 'checkoutFormAfter',
   sortOrder: 10
 };
 

package/src/modules/promotion/api/couponRemove/{removeCoupon.js → removeCoupon.ts}

@@ -1,15 +1,26 @@
-import { translate } from '../../../../lib/locale/index.js';
+import { translate } from '../../../../lib/locale/translate/translate.js';
 import {
   INTERNAL_SERVER_ERROR,
   INVALID_PAYLOAD,
   OK
 } from '../../../../lib/util/httpStatus.js';
+import { EvershopRequest } from '../../../../types/request.js';
+import { EvershopResponse } from '../../../../types/response.js';
 import { getCartByUUID } from '../../../checkout/services/getCartByUUID.js';
 import { saveCart } from '../../../checkout/services/saveCart.js';
 
-export default async (request, response, next) => {
+export default async (
+  request: EvershopRequest,
+  response: EvershopResponse,
+  next
+) => {
   try {
-    const { cart_id, coupon } = request.params;
+    const coupon = Array.isArray(request.params.coupon)
+      ? request.params.coupon[0]
+      : request.params.coupon;
+    const cart_id = Array.isArray(request.params.cart_id)
+      ? request.params.cart_id[0]
+      : request.params.cart_id;
     const cart = await getCartByUUID(cart_id);
     if (!cart) {
       response.status(INVALID_PAYLOAD);

package/src/modules/promotion/pages/admin/all/CouponMenuGroup.tsx

@@ -1,5 +1,5 @@
 import { NavigationItemGroup } from '@components/admin/NavigationItemGroup.js';
-import { GiftIcon } from '@heroicons/react/24/solid';
+import { GiftIcon } from 'lucide-react';
 import React from 'react';
 
 interface CouponMenuGroupProps {

package/src/modules/promotion/pages/admin/all/NewCouponQuickLink.tsx

@@ -1,5 +1,5 @@
 import { NavigationItem } from '@components/admin/NavigationItem.js';
-import { GiftIcon } from '@heroicons/react/24/solid';
+import { GiftIcon } from 'lucide-react';
 import React from 'react';
 
 interface NewCouponQuickLinkProps {