@evershop/evershop 2.1.0 → 2.1.2

package/dist/modules/oms/subscribers/order_placed/sendOrderConfirmationEmail.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sendOrderConfirmationEmail.js","sourceRoot":"","sources":["../../../../../src/modules/oms/subscribers/order_placed/sendOrderConfirmationEmail.ts"],"names":[],"mappings":"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"}

package/dist/modules/paypal/api/paypalAuthorizePayment/[bodyParser]authorize.js

@@ -1,7 +1,8 @@
-import { insert, select } from '@evershop/postgres-query-builder';
+import { getConnection, insert, select } from '@evershop/postgres-query-builder';
 import { error } from '../../../../lib/log/logger.js';
 import { pool } from '../../../../lib/postgres/connection.js';
 import { INTERNAL_SERVER_ERROR, INVALID_PAYLOAD, OK } from '../../../../lib/util/httpStatus.js';
+import addOrderActivityLog from '../../../oms/services/addOrderActivityLog.js';
 import { updatePaymentStatus } from '../../../oms/services/updatePaymentStatus.js';
 import { createAxiosInstance } from '../../services/requester.js';
 export default async (request, response, next) => {
@@ -28,7 +29,7 @@ export default async (request, response, next) => {
             const axiosInstance = await createAxiosInstance(request);
             const responseData = await axiosInstance.post(`/v2/checkout/orders/${order.integration_order_id}/authorize`);
             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({
@@ -46,13 +47,7 @@ export default async (request, response, next) => {
                 })
                     .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({
                     data: {}

package/dist/modules/paypal/api/paypalAuthorizePayment/[bodyParser]authorize.js.map

@@ -1 +1 @@
-{"version":3,"file":"[bodyParser]authorize.js","sourceRoot":"","sources":["../../../../../src/modules/paypal/api/paypalAuthorizePayment/[bodyParser]authorize.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,EACN,MAAM,EACP,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,MAAM,wCAAwC,CAAC;AAC9D,OAAO,EACL,qBAAqB,EACrB,eAAe,EACf,EAAE,EACH,MAAM,oCAAoC,CAAC;AAG5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,eAAe,KAAK,EAClB,OAAwB,EACxB,QAA0B,EAC1B,IAAI,EACJ,EAAE;IACF,IAAI,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;QAClC,sBAAsB;QACtB,MAAM,KAAK,GAAG,MAAM,MAAM,EAAE;aACzB,IAAI,CAAC,OAAO,CAAC;aACb,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC;aAC5B,GAAG,CAAC,gBAAgB,EAAE,GAAG,EAAE,QAAQ,CAAC;aACpC,GAAG,CAAC,gBAAgB,EAAE,GAAG,EAAE,SAAS,CAAC;aACrC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACjC,QAAQ,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE;oBACL,MAAM,EAAE,eAAe;oBACvB,OAAO,EAAE,eAAe;iBACzB;aACF,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,qDAAqD;YACrD,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC;YACzD,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,IAAI,CAC3C,uBAAuB,KAAK,CAAC,oBAAoB,YAAY,CAC9D,CAAC;YAEF,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;gBAC7C,MAAM,mBAAmB,CAAC,KAAK,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;gBACxD,mCAAmC;gBACnC,MAAM,MAAM,CAAC,qBAAqB,CAAC;qBAChC,KAAK,CAAC;oBACL,4BAA4B,EAAE,KAAK,CAAC,QAAQ;oBAC5C,cAAc,EACZ,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE;oBACnE,MAAM,EACJ,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;yBAC3D,MAAM,CAAC,KAAK;oBACjB,QAAQ,EACN,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;yBAC3D,MAAM,CAAC,aAAa;oBACzB,MAAM,EACJ,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;yBAC3D,MAAM;oBACX,cAAc,EAAE,WAAW;oBAC3B,gBAAgB,EAAE,QAAQ;oBAC1B,sBAAsB,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC;iBAC1D,CAAC;qBACD,OAAO,CAAC,IAAI,CAAC,CAAC;gBAEjB,wBAAwB;gBACxB,MAAM,MAAM,CAAC,gBAAgB,CAAC;qBAC3B,KAAK,CAAC;oBACL,uBAAuB,EAAE,KAAK,CAAC,QAAQ;oBACvC,OAAO,EAAE,iEAAiE,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC7I,iBAAiB,EAAE,CAAC;iBACrB,CAAC;qBACD,OAAO,CAAC,IAAI,CAAC,CAAC;gBAEjB,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACpB,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI,EAAE,EAAE;iBACT,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;gBACvC,QAAQ,CAAC,IAAI,CAAC;oBACZ,KAAK,EAAE;wBACL,MAAM,EAAE,qBAAqB;wBAC7B,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO;qBACnC;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,QAAQ,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACvC,QAAQ,CAAC,IAAI,CAAC;YACZ,KAAK,EAAE;gBACL,MAAM,EAAE,qBAAqB;gBAC7B,OAAO,EAAE,GAAG,CAAC,OAAO;aACrB;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"[bodyParser]authorize.js","sourceRoot":"","sources":["../../../../../src/modules/paypal/api/paypalAuthorizePayment/[bodyParser]authorize.ts"],"names":[],"mappings":"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"}

package/dist/modules/paypal/api/paypalCaptureAuthorizedPayment/[bodyParser]capture.js

@@ -1,12 +1,15 @@
-import { insert, select } from '@evershop/postgres-query-builder';
+import { 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, OK } from '../../../../lib/util/httpStatus.js';
+import addOrderActivityLog from '../../../oms/services/addOrderActivityLog.js';
 import { updatePaymentStatus } from '../../../oms/services/updatePaymentStatus.js';
 import { createAxiosInstance } from '../../services/requester.js';
 export default async (request, response, next) => {
     var _a, _b, _c, _d;
+    const connection = await getConnection();
+    await startTransaction(connection);
     try {
         const { order_id } = request.body;
         // Validate the order;
@@ -14,8 +17,9 @@ export default async (request, response, next) => {
             .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: {
@@ -29,8 +33,9 @@ export default async (request, response, next) => {
             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: {
@@ -44,15 +49,10 @@ export default async (request, response, next) => {
             // Get the transaction details from Paypal
             const transactionDetails = await axiosInstance.get(`/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: {}
@@ -64,15 +64,10 @@ export default async (request, response, next) => {
                 const responseData = await axiosInstance.post(`/v2/payments/authorizations/${transaction.transaction_id}/capture`);
                 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: {}
@@ -80,6 +75,7 @@ export default async (request, response, next) => {
                     return;
                 }
                 else {
+                    await rollback(connection);
                     response.status(INTERNAL_SERVER_ERROR);
                     response.json({
                         error: {
@@ -93,6 +89,7 @@ export default async (request, response, next) => {
         }
     }
     catch (err) {
+        await rollback(connection);
         error(err);
         if (err instanceof AxiosError) {
             response.status(((_a = err.response) === null || _a === void 0 ? void 0 : _a.status) ? (_b = err.response) === null || _b === void 0 ? void 0 : _b.status : INTERNAL_SERVER_ERROR);

package/dist/modules/paypal/api/paypalCaptureAuthorizedPayment/[bodyParser]capture.js.map

@@ -1 +1 @@
-{"version":3,"file":"[bodyParser]capture.js","sourceRoot":"","sources":["../../../../../src/modules/paypal/api/paypalCaptureAuthorizedPayment/[bodyParser]capture.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"[bodyParser]capture.js","sourceRoot":"","sources":["../../../../../src/modules/paypal/api/paypalCaptureAuthorizedPayment/[bodyParser]capture.ts"],"names":[],"mappings":"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"}

package/dist/modules/paypal/api/paypalCapturePayment/[bodyParser]capture.js

@@ -1,18 +1,22 @@
-import { insert, select } from '@evershop/postgres-query-builder';
+import { commit, insert, 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, OK } from '../../../../lib/util/httpStatus.js';
+import addOrderActivityLog from '../../../oms/services/addOrderActivityLog.js';
 import { updatePaymentStatus } from '../../../oms/services/updatePaymentStatus.js';
 import { createAxiosInstance } from '../../services/requester.js';
 export default async (request, response, 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: {
@@ -27,7 +31,7 @@ export default async (request, response, next) => {
             const responseData = await axiosInstance.post(`/v2/checkout/orders/${order.integration_order_id}/capture`);
             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({
@@ -42,21 +46,17 @@ export default async (request, response, next) => {
                     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: {
@@ -69,6 +69,7 @@ export default async (request, response, next) => {
     }
     catch (err) {
         error(err);
+        await rollback(connection);
         response.status(INTERNAL_SERVER_ERROR);
         response.json({
             error: {

package/dist/modules/paypal/api/paypalCapturePayment/[bodyParser]capture.js.map

@@ -1 +1 @@
-{"version":3,"file":"[bodyParser]capture.js","sourceRoot":"","sources":["../../../../../src/modules/paypal/api/paypalCapturePayment/[bodyParser]capture.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,EACN,MAAM,EACP,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,MAAM,wCAAwC,CAAC;AAC9D,OAAO,EACL,qBAAqB,EACrB,eAAe,EACf,EAAE,EACH,MAAM,oCAAoC,CAAC;AAG5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,eAAe,KAAK,EAClB,OAAwB,EACxB,QAA0B,EAC1B,IAAI,EACJ,EAAE;IACF,IAAI,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;QAClC,sBAAsB;QACtB,MAAM,KAAK,GAAG,MAAM,MAAM,EAAE;aACzB,IAAI,CAAC,OAAO,CAAC;aACb,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC;aAC5B,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACjC,QAAQ,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE;oBACL,MAAM,EAAE,eAAe;oBACvB,OAAO,EAAE,kBAAkB;iBAC5B;aACF,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,qDAAqD;YACrD,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC;YACzD,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,IAAI,CAC3C,uBAAuB,KAAK,CAAC,oBAAoB,UAAU,CAC5D,CAAC;YAEF,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;gBAC7C,wBAAwB;gBACxB,MAAM,mBAAmB,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBAClD,mCAAmC;gBACnC,MAAM,MAAM,CAAC,qBAAqB,CAAC;qBAChC,KAAK,CAAC;oBACL,4BAA4B,EAAE,KAAK,CAAC,QAAQ;oBAC5C,cAAc,EACZ,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE;oBAC7D,MAAM,EACJ,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM;yBAC5D,KAAK;oBACV,QAAQ,EACN,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM;yBAC5D,aAAa;oBAClB,MAAM,EACJ,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM;oBACjE,cAAc,EAAE,SAAS;oBACzB,gBAAgB,EAAE,QAAQ;oBAC1B,sBAAsB,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC;iBAC1D,CAAC;qBACD,OAAO,CAAC,IAAI,CAAC,CAAC;gBAEjB,wBAAwB;gBACxB,MAAM,MAAM,CAAC,gBAAgB,CAAC;qBAC3B,KAAK,CAAC;oBACL,uBAAuB,EAAE,KAAK,CAAC,QAAQ;oBACvC,OAAO,EAAE,+CAA+C,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;oBACrH,iBAAiB,EAAE,CAAC;iBACrB,CAAC;qBACD,OAAO,CAAC,IAAI,CAAC,CAAC;gBAEjB,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACpB,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI,EAAE,EAAE;iBACT,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;gBACvC,QAAQ,CAAC,IAAI,CAAC;oBACZ,KAAK,EAAE;wBACL,MAAM,EAAE,qBAAqB;wBAC7B,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO;qBACnC;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,QAAQ,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACvC,QAAQ,CAAC,IAAI,CAAC;YACZ,KAAK,EAAE;gBACL,MAAM,EAAE,qBAAqB;gBAC7B,OAAO,EAAE,uBAAuB;aACjC;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"[bodyParser]capture.js","sourceRoot":"","sources":["../../../../../src/modules/paypal/api/paypalCapturePayment/[bodyParser]capture.ts"],"names":[],"mappings":"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"}

package/dist/modules/paypal/api/paypalCreateOrder/[bodyParser]createOrder.js

@@ -1,5 +1,5 @@
 import { select, update } from '@evershop/postgres-query-builder';
-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';
@@ -78,7 +78,10 @@ export default async (request, response, next) => {
                                 value: catalogPriceInclTax
                                     ? toPrice(item.final_price_incl_tax)
                                     : toPrice(item.final_price)
-                            }
+                            },
+                            category: item.no_shipping_required
+                                ? 'DIGITAL_GOODS'
+                                : 'PHYSICAL_GOODS'
                         })),
                         amount: finalAmount
                     }
@@ -99,11 +102,15 @@ export default async (request, response, next) => {
             if (shippingAddress) {
                 const address = {
                     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();
                 }
@@ -116,17 +123,8 @@ export default async (request, response, next) => {
                 };
             }
             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('finalPaypalOrderData', orderData, {
                 order,
@@ -153,6 +151,8 @@ export default async (request, response, next) => {
                 });
             }
             else {
+                debug('PayPal create order error');
+                debug(data);
                 // Re-active the cart
                 await update('cart')
                     .given({ status: true })

package/dist/modules/paypal/api/paypalCreateOrder/[bodyParser]createOrder.js.map

@@ -1 +1 @@
-{"version":3,"file":"[bodyParser]createOrder.js","sourceRoot":"","sources":["../../../../../src/modules/paypal/api/paypalCreateOrder/[bodyParser]createOrder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"[bodyParser]createOrder.js","sourceRoot":"","sources":["../../../../../src/modules/paypal/api/paypalCreateOrder/[bodyParser]createOrder.ts"],"names":[],"mappings":"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"}

package/dist/modules/paypal/bootstrap.d.ts

@@ -1,2 +1,2 @@
-declare function _default(): Promise<void>;
+declare const _default: () => Promise<void>;
 export default _default;

package/dist/modules/paypal/bootstrap.js

@@ -1,10 +1,30 @@
+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;
@@ -22,7 +42,7 @@ export default async () => {
         validator: async () => {
             const paypalConfig = getConfig('system.paypal', {});
             let paypalStatus;
-            if (paypalConfig.status) {
+            if (paypalConfig === null || paypalConfig === void 0 ? void 0 : paypalConfig.status) {
                 paypalStatus = paypalConfig.status;
             }
             else {

package/dist/modules/paypal/bootstrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../src/modules/paypal/bootstrap.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAE9E,eAAe,KAAK,IAAI,EAAE;IACxB,SAAS,CAAC,qBAAqB,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAChE,IAAI,MAAM,KAAK,UAAU,EAAE,CAAC;YAC1B,OAAO;QACT,CAAC;QACD,IAAI,KAAK,CAAC,cAAc,KAAK,QAAQ,EAAE,CAAC;YACtC,OAAO;QACT,CAAC;QACD,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,qBAAqB,CAAC;QACpB,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;YACjB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,MAAM,UAAU,CAAC,mBAAmB,EAAE,QAAQ,CAAC;SACtD,CAAC;QACF,SAAS,EAAE,KAAK,IAAI,EAAE;YACpB,MAAM,YAAY,GAAG,SAAS,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;YACpD,IAAI,YAAY,CAAC;YACjB,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;gBACxB,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,YAAY,GAAG,MAAM,UAAU,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;YAC5D,CAAC;YACD,IAAI,QAAQ,CAAC,YAAY,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;gBACrC,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../src/modules/paypal/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AAC3F,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAE9E,eAAe,KAAK,IAAI,EAAE;IACxB,MAAM,mBAAmB,GAAG;QAC1B,KAAK,EAAE;YACL,aAAa,EAAE;gBACb,iBAAiB,EAAE;oBACjB,IAAI,EAAE,YAAY;oBAClB,KAAK,EAAE,SAAS;iBACjB;gBACD,eAAe,EAAE;oBACf,IAAI,EAAE,UAAU;oBAChB,KAAK,EAAE,SAAS;iBACjB;aACF;YACD,UAAU,EAAE;gBACV,qBAAqB,EAAE,YAAY;gBACnC,mBAAmB,EAAE,YAAY;gBACjC,2BAA2B,EAAE,WAAW;aACzC;SACF;KACF,CAAC;IACF,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC;IAE1D,SAAS,CAAC,qBAAqB,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAChE,IAAI,MAAM,KAAK,UAAU,EAAE,CAAC;YAC1B,OAAO;QACT,CAAC;QACD,IAAI,KAAK,CAAC,cAAc,KAAK,QAAQ,EAAE,CAAC;YACtC,OAAO;QACT,CAAC;QACD,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,qBAAqB,CAAC;QACpB,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;YACjB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,MAAM,UAAU,CAAC,mBAAmB,EAAE,QAAQ,CAAC;SACtD,CAAC;QACF,SAAS,EAAE,KAAK,IAAI,EAAE;YACpB,MAAM,YAAY,GAAG,SAAS,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;YACpD,IAAI,YAAY,CAAC;YACjB,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,EAAE,CAAC;gBACzB,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,YAAY,GAAG,MAAM,UAAU,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;YAC5D,CAAC;YACD,IAAI,QAAQ,CAAC,YAAY,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;gBACrC,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/modules/paypal/graphql/types/PaypalSetting/PaypalSetting.admin.resolvers.d.ts

@@ -1,6 +1,6 @@
 declare namespace _default {
     namespace Setting {
-        function paypalPaymentStatus(setting: any): any;
+        function paypalPaymentStatus(setting: any): {};
         function paypalPaymentIntent(setting: any): any;
         function paypalClientId(setting: any): any;
         function paypalClientSecret(setting: any, _: any, { user }: {

package/dist/modules/paypal/migration/Version-1.0.0.d.ts

@@ -0,0 +1,3 @@
+import type { PoolClient } from '@evershop/postgres-query-builder';
+declare const _default: (connection: PoolClient) => Promise<void>;
+export default _default;

package/dist/modules/paypal/migration/Version-1.0.0.js

@@ -0,0 +1,19 @@
+import { execute } from '@evershop/postgres-query-builder';
+export default async (connection) => {
+    // Migrate legacy Stripe payment statuses to the new prefixed values.
+    // Only orders placed with payment_method = 'paypal' are affected.
+    const statusMap = {
+        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}'`);
+    }
+};
+//# sourceMappingURL=Version-1.0.0.js.map

package/dist/modules/paypal/migration/Version-1.0.0.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Version-1.0.0.js","sourceRoot":"","sources":["../../../../src/modules/paypal/migration/Version-1.0.0.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAG3D,eAAe,KAAK,EAAE,UAAsB,EAAE,EAAE;IAC9C,qEAAqE;IACrE,kEAAkE;IAClE,MAAM,SAAS,GAA2B;QACxC,UAAU,EAAE,mBAAmB;QAC/B,MAAM,EAAE,eAAe;QACvB,QAAQ,EAAE,iBAAiB;QAC3B,gBAAgB,EAAE,yBAAyB;QAC3C,IAAI,EAAE,iBAAiB;KACxB,CAAC;IAEF,KAAK,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QAC/D,MAAM,OAAO,CACX,UAAU,EACV;iCAC2B,SAAS;;mCAEP,SAAS,GAAG,CAC1C,CAAC;IACJ,CAAC;AACH,CAAC,CAAC"}

package/dist/modules/paypal/pages/admin/orderEdit/PaypalCaptureButton.js

@@ -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 { CardContent } from '@components/common/ui/Card.js';
 import axios from 'axios';
 import React from 'react';
 import { toast } from 'react-toastify';
@@ -25,10 +25,10 @@ export default function PaypalCaptureButton({ captureAPI, order: { paymentStatus
             toast.error(e.message);
         }
     };
-    return (React.createElement(RenderIfTrue, { condition: paymentMethod === 'paypal' && paymentStatus.code === 'authorized' },
-        React.createElement(Card.Session, null,
+    return (React.createElement(RenderIfTrue, { condition: paymentMethod === 'paypal' && paymentStatus.code === 'paypal_authorized' },
+        React.createElement(CardContent, null,
             React.createElement("div", { className: "flex justify-end" },
-                React.createElement(Button, { title: "Capture", onAction: onAction, isLoading: isLoading })))));
+                React.createElement(Button, { onClick: onAction, isLoading: isLoading }, "Capture Payment")))));
 }
 export const layout = {
     areaId: 'orderPaymentActions',

package/dist/modules/paypal/pages/admin/orderEdit/PaypalCaptureButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"PaypalCaptureButton.js","sourceRoot":"","sources":["../../../../../../src/modules/paypal/pages/admin/orderEdit/PaypalCaptureButton.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAClD,OAAO,YAAY,MAAM,oCAAoC,CAAC;AAC9D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAavC,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,UAAU,EACV,KAAK,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,EACvC;IACN,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExD,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,IAAI,CAAC;YACH,YAAY,CAAC,IAAI,CAAC,CAAC;YACnB,oCAAoC;YACpC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;YAClE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACzB,kBAAkB;gBAClB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC3C,CAAC;YACD,YAAY,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,CACL,oBAAC,YAAY,IACX,SAAS,EACP,aAAa,KAAK,QAAQ,IAAI,aAAa,CAAC,IAAI,KAAK,YAAY;QAGnE,oBAAC,IAAI,CAAC,OAAO;YACX,6BAAK,SAAS,EAAC,kBAAkB;gBAC/B,oBAAC,MAAM,IAAC,KAAK,EAAC,SAAS,EAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,GAAI,CAChE,CACO,CACF,CAChB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,qBAAqB;IAC7B,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;CAWpB,CAAC"}
+{"version":3,"file":"PaypalCaptureButton.js","sourceRoot":"","sources":["../../../../../../src/modules/paypal/pages/admin/orderEdit/PaypalCaptureButton.tsx"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAQ,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAavC,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,UAAU,EACV,KAAK,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,EACvC;IACN,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExD,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,IAAI,CAAC;YACH,YAAY,CAAC,IAAI,CAAC,CAAC;YACnB,oCAAoC;YACpC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;YAClE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACzB,kBAAkB;gBAClB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC3C,CAAC;YACD,YAAY,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,CACL,oBAAC,YAAY,IACX,SAAS,EACP,aAAa,KAAK,QAAQ,IAAI,aAAa,CAAC,IAAI,KAAK,mBAAmB;QAG1E,oBAAC,WAAW;YACV,6BAAK,SAAS,EAAC,kBAAkB;gBAC/B,oBAAC,MAAM,IAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,sBAEtC,CACL,CACM,CACD,CAChB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,qBAAqB;IAC7B,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;CAWpB,CAAC"}

package/dist/modules/paypal/pages/admin/paymentSetting/PaypalSetting.js

@@ -1,40 +1,43 @@
-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';
 export default function PaypalPayment({ setting: { paypalPaymentStatus, paypalDisplayName, paypalClientId, paypalClientSecret, paypalEnvironment, paypalPaymentIntent } }) {
-    return (React.createElement(Card, { title: "Paypal Payment" },
-        React.createElement(Card.Session, null,
+    return (React.createElement(Card, null,
+        React.createElement(CardHeader, null,
+            React.createElement(CardTitle, null, "Paypal Payment"),
+            React.createElement(CardDescription, null, "Configure your Paypal payment gateway settings")),
+        React.createElement(CardContent, null,
             React.createElement("div", { className: "grid grid-cols-3 gap-5" },
                 React.createElement("div", { className: "col-span-1 items-center flex" },
                     React.createElement("h4", null, "Enable?")),
                 React.createElement("div", { className: "col-span-2" },
                     React.createElement(ToggleField, { name: "paypalPaymentStatus", defaultValue: paypalPaymentStatus, trueValue: 1, falseValue: 0 })))),
-        React.createElement(Card.Session, null,
+        React.createElement(CardContent, { className: "pt-4 border-t border-border" },
             React.createElement("div", { className: "grid grid-cols-3 gap-5" },
                 React.createElement("div", { className: "col-span-1 items-center flex" },
                     React.createElement("h4", null, "Dislay Name")),
                 React.createElement("div", { className: "col-span-2" },
-                    React.createElement(InputField, { label: "Display Name", name: "paypalDisplayName", placeholder: "Display Name", defaultValue: paypalDisplayName })))),
-        React.createElement(Card.Session, null,
+                    React.createElement(InputField, { name: "paypalDisplayName", placeholder: "Display Name", defaultValue: paypalDisplayName })))),
+        React.createElement(CardContent, { className: "pt-4 border-t border-border" },
             React.createElement("div", { className: "grid grid-cols-3 gap-5" },
                 React.createElement("div", { className: "col-span-1 items-center flex" },
                     React.createElement("h4", null, "Client ID")),
                 React.createElement("div", { className: "col-span-2" },
-                    React.createElement(InputField, { label: "Client ID", name: "paypalClientId", placeholder: "Client ID", defaultValue: paypalClientId })))),
-        React.createElement(Card.Session, null,
+                    React.createElement(InputField, { name: "paypalClientId", placeholder: "Client ID", defaultValue: paypalClientId })))),
+        React.createElement(CardContent, { className: "pt-4 border-t border-border" },
             React.createElement("div", { className: "grid grid-cols-3 gap-5" },
                 React.createElement("div", { className: "col-span-1 items-center flex" },
                     React.createElement("h4", null, "Client Secret")),
                 React.createElement("div", { className: "col-span-2" },
-                    React.createElement(InputField, { name: "paypalClientSecret", placeholder: "Secret Key", label: "Client Secret", defaultValue: paypalClientSecret })))),
-        React.createElement(Card.Session, null,
+                    React.createElement(InputField, { name: "paypalClientSecret", placeholder: "Secret Key", defaultValue: paypalClientSecret })))),
+        React.createElement(CardContent, { className: "pt-4 border-t border-border" },
             React.createElement("div", { className: "grid grid-cols-3 gap-5" },
                 React.createElement("div", { className: "col-span-1 items-center flex" },
                     React.createElement("h4", null, "Environment")),
                 React.createElement("div", { className: "col-span-2" },
-                    React.createElement(RadioGroupField, { label: "Environment", name: "paypalEnvironment", defaultValue: paypalEnvironment, options: [
+                    React.createElement(RadioGroupField, { name: "paypalEnvironment", defaultValue: paypalEnvironment, options: [
                             {
                                 label: 'Sandbox',
                                 value: 'https://api-m.sandbox.paypal.com'
@@ -44,7 +47,7 @@ export default function PaypalPayment({ setting: { paypalPaymentStatus, paypalDi
                                 value: 'https://api-m.paypal.com'
                             }
                         ] })))),
-        React.createElement(Card.Session, null,
+        React.createElement(CardContent, { className: "pt-4 border-t border-border" },
             React.createElement("div", { className: "grid grid-cols-3 gap-5" },
                 React.createElement("div", { className: "col-span-1 items-center flex" },
                     React.createElement("h4", null, "Payment mode")),

package/dist/modules/paypal/pages/admin/paymentSetting/PaypalSetting.js.map

@@ -1 +1 @@
-{"version":3,"file":"PaypalSetting.js","sourceRoot":"","sources":["../../../../../../src/modules/paypal/pages/admin/paymentSetting/PaypalSetting.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"PaypalSetting.js","sourceRoot":"","sources":["../../../../../../src/modules/paypal/pages/admin/paymentSetting/PaypalSetting.tsx"],"names":[],"mappings":"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"}