strapi-plugin-payone-provider 5.6.10 → 5.6.12

package/admin/src/components/PluginIcon/index.jsx

@@ -1,6 +1,17 @@
-import * as React from '@strapi/strapi/admin';
-import { PuzzlePiece } from "@strapi/icons";
 
-const PluginIcon = () => <PuzzlePiece />;
+const PluginIcon = () => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    xmlSpace="preserve"
+    width={18}
+    height={18}
+    fill="currentColor"
+    version="1.1"
+    viewBox="0 0 438.254 438.254"
+  >
+    <path d="M402.612 177.546H368.25V63.187c0-19.652-15.988-35.64-35.64-35.64H35.641C15.988 27.547 0 43.535 0 63.187v161.88c0 19.652 15.988 35.64 35.641 35.64h34.357v114.358c0 19.653 15.989 35.642 35.642 35.642h296.973c19.652 0 35.642-15.989 35.642-35.642V213.188c-.001-19.653-15.99-35.642-35.643-35.642m-64.362-45.839H30v-20h308.25zM35.641 57.547h296.97c3.109 0 5.64 2.53 5.64 5.64v28.52H30v-28.52c0-3.11 2.53-5.64 5.641-5.64m0 173.16a5.647 5.647 0 0 1-5.641-5.64v-73.36h308.25v25.839H105.64c-19.652 0-35.642 15.989-35.642 35.642v17.519zm372.613 144.358a5.65 5.65 0 0 1-5.642 5.642H105.64a5.65 5.65 0 0 1-5.642-5.642V213.188a5.65 5.65 0 0 1 5.642-5.642h296.973a5.65 5.65 0 0 1 5.642 5.642z"></path>
+    <path d="M358.585 287.966c-6.941 0-13.48 1.74-19.216 4.797-5.885-3.15-12.429-4.797-19.265-4.797-22.607 0-41 18.393-41 41s18.393 41 41 41c6.835 0 13.379-1.647 19.265-4.796a40.74 40.74 0 0 0 19.216 4.796c22.607 0 41-18.393 41-41s-18.393-41-41-41m-59.481 41c0-11.579 9.421-21 21-21 1.065 0 2.113.09 3.145.243-3.593 6.093-5.664 13.186-5.664 20.757s2.071 14.664 5.664 20.757c-1.032.153-2.08.243-3.145.243-11.58 0-21-9.42-21-21m59.481 21c-11.579 0-21-9.421-21-21s9.421-21 21-21 21 9.421 21 21-9.421 21-21 21M177.126 241.707h-28c-5.522 0-10 4.477-10 10s4.478 10 10 10h28c5.522 0 10-4.477 10-10s-4.478-10-10-10M237.793 241.707h-28c-5.522 0-10 4.477-10 10s4.478 10 10 10h28c5.522 0 10-4.477 10-10s-4.478-10-10-10M308.459 251.707c0-5.523-4.478-10-10-10h-28c-5.522 0-10 4.477-10 10s4.478 10 10 10h28c5.522 0 10-4.477 10-10M331.126 261.707h28c5.522 0 10-4.477 10-10s-4.478-10-10-10h-28c-5.522 0-10 4.477-10 10s4.478 10 10 10"></path>
+  </svg>
+);
 
 export default PluginIcon;

package/admin/src/pages/App/components/AppHeader.jsx

@@ -26,7 +26,7 @@ const AppHeader = ({ activeTab, isSaving, onSave, title, onBack }) => {
           >
             Back to Main
           </Button>
-        ) : activeTab === 1 ? (
+        ) : activeTab === 2 ? (
           <Button
             loading={isSaving}
             onClick={onSave}

package/admin/src/pages/App/components/AppTabs.jsx

@@ -22,19 +22,22 @@ const AppTabs = ({
       }
     >
       <Tabs.List style={{ width: "100%" }}>
-        <Tabs.Trigger value="tab-1">Configuration</Tabs.Trigger>
-        <Tabs.Trigger value="tab-2">Transaction History</Tabs.Trigger>
+        <Tabs.Trigger value="tab-1">Transaction History</Tabs.Trigger>
+        <Tabs.Trigger value="tab-2">Configuration</Tabs.Trigger>
         <Tabs.Trigger value="tab-3">Payment Actions</Tabs.Trigger>
         <Tabs.Trigger value="tab-4">Documentation</Tabs.Trigger>
       </Tabs.List>
       <Tabs.Content value="tab-1">
-        <ConfigurationPanel settings={settings} />
+        <HistoryPanel />
       </Tabs.Content>
-
       <Tabs.Content value="tab-2">
-        <HistoryPanel />
+        <ConfigurationPanel
+          settings={settings}
+          onNavigateToConfig={onNavigateToConfig}
+        />
       </Tabs.Content>
 
+
       <Tabs.Content value="tab-3">
         <PaymentActionsPanel
           onNavigateToConfig={onNavigateToConfig}

package/admin/src/pages/App/components/StatusBadge.jsx

@@ -1,13 +1,15 @@
-import * as React from "@strapi/strapi/admin";
+import * as React from "react";
 import {
   Badge,
-  DesignSystemProvider,
-  darkTheme,
-  lightTheme,
+  Box,
+  Flex,
+  Typography,
 } from "@strapi/design-system";
-import { useSystemTheme } from "../../hooks/use-system-theme";
+import { MarkCircle } from "./icons";
+
+const StatusBadge = ({ status, transaction }) => {
+  const [isHovered, setIsHovered] = React.useState(false);
 
-const StatusBadge = ({ status, size = "S" }) => {
   const statusColors = {
     APPROVED: "success200",
     PENDING: "warning200",
@@ -16,19 +18,69 @@ const StatusBadge = ({ status, size = "S" }) => {
     INVALID: "danger200",
     REDIRECT: "success100",
   };
-  const systemTheme = useSystemTheme();
-  const theme = systemTheme === "dark" ? darkTheme : lightTheme;
+
+  const getDisplayText = () => {
+    if (status === "ERROR" && transaction?.raw_response?.Error?.ErrorCode) {
+      return `${status} - ${transaction.raw_response.Error.ErrorCode}`;
+    }
+    return status;
+  };
+
+  const displayText = getDisplayText();
+  const errorMessage = status === "ERROR" && transaction?.raw_response?.Error?.ErrorMessage 
+    ? transaction.raw_response.Error.ErrorMessage 
+    : null;
+  
+  const errorCode = status === "ERROR" && transaction?.raw_response?.Error?.ErrorCode
+    ? transaction.raw_response.Error.ErrorCode
+    : null;
+  
+  const showExclamationIcon = status === "ERROR" && !errorCode && !errorMessage;
+
   return (
-    <DesignSystemProvider theme={theme}>
-      <Badge
-        borderColor={statusColors[status]}
-        background={"transparent"}
-        textColor={statusColors[status]}
-        size={size}
-      >
-        {status || "UNKNOWN"}
+    <Box
+    position="relative"
+    onMouseEnter={() => setIsHovered(true)}
+    onMouseLeave={() => setIsHovered(false)}
+    style={{ display: "inline-block", cursor: status === "ERROR" ? "pointer" : "default" }}
+  >
+    <Flex gap={2} alignItems="center">
+      <Badge backgroundColor={statusColors[status] || "warning100"}>
+        {displayText}
       </Badge>
-    </DesignSystemProvider>
+      {showExclamationIcon && (
+        <MarkCircle color="danger500"
+          style={{
+            width: "16px",
+            height: "16px"
+          }} 
+        />
+      )}
+    </Flex>
+    {isHovered && errorMessage && (
+      <Box
+        position="absolute"
+        zIndex={1000}
+        bottom="100%"
+        left="50%"
+        transform="translateX(-50%)"
+        marginBottom={2}
+        padding={3}
+        background="neutral900"
+        hasRadius
+        style={{
+          whiteSpace: "pre-line",
+          minWidth: "200px",
+          maxWidth: "300px",
+          boxShadow: "0 4px 12px rgba(0, 0, 0, 0.15)",
+        }}
+      >
+        <Typography variant="pi" textColor="neutral0" style={{ fontSize: "12px" }}>
+          Error: {errorMessage}
+        </Typography>
+      </Box>
+    )}
+  </Box>
   );
 };
 

package/admin/src/pages/App/components/configuration/ConfigurationPanel.jsx

@@ -3,7 +3,7 @@ import { Box, Flex, Typography } from "@strapi/design-system";
 import ConfigurationFields from "./ConfigurationFields";
 import TestConnection from "./TestConnection";
 
-const ConfigurationPanel = ({ settings }) => {
+const ConfigurationPanel = ({ settings, onNavigateToConfig }) => {
   return (
     <Flex direction="column" alignItems="stretch" gap={8} paddingTop={8}>
       <Box>
@@ -31,7 +31,7 @@ const ConfigurationPanel = ({ settings }) => {
         settings={settings.settings}
         onInputChange={settings.handleInputChange}
         onPaymentMethodToggle={settings.handlePaymentMethodToggle}
-        onNavigateToConfig={settings.onNavigateToConfig}
+        onNavigateToConfig={onNavigateToConfig}
       />
 
       <TestConnection

package/admin/src/pages/App/components/icons/index.jsx

@@ -9,3 +9,4 @@ export { default as PendingIcon } from './PendingIcon.jsx';
 export { default as InfoIcon } from './InfoIcon.jsx';
 export { default as ChevronDownIcon } from './ChevronDownIcon.jsx';
 export { default as ChevronUpIcon } from './ChevronUpIcon.jsx';
+export { default as MarkCircle } from './MarkCircle.jsx';

package/admin/src/pages/App/components/transaction-history/FiltersPanel.jsx

@@ -95,12 +95,13 @@ const FiltersPanel = ({ filters, handleFiltersChange }) => {
         <RenderInput
           key={filter.name}
           name={filter.name}
-          value={filters[filter.name] || ""}
+          value={filters[filter.name] ?? ""}
           onChange={(e) => {
-            const value =
+            const raw =
               filter.inputType === "textInput"
                 ? e.target.value
-                : e.target?.value || e;
+                : e.target?.value ?? e;
+            const value = raw === "all" || raw === undefined ? "" : String(raw);
             handleFiltersChange({ [filter.name]: value });
           }}
           inputType={filter.inputType}

package/admin/src/pages/App/components/transaction-history/TransactionTable.jsx

@@ -11,6 +11,7 @@ import TransactionDetails from "./details/TransactionDetails";
 import FiltersPanel from "./FiltersPanel";
 import useTransactionHistory from "../../../hooks/useTransactionHistory";
 import StatusBadge from "../StatusBadge";
+
 const TransactionTable = () => {
   const {
     transactions,
@@ -87,8 +88,8 @@ const TransactionTable = () => {
                         <Table.Cell>
                           <Typography variant="pi">
                             {getPaymentMethodName(
-                              transaction.raw_request?.clearingtype,
-                              transaction.raw_request?.wallettype
+                              (transaction.raw_request?.clearingtype || transaction.body?.raw_request?.clearingtype),
+                              (transaction.raw_request?.wallettype || transaction.body?.raw_request?.wallettype)
                             )}
                           </Typography>
                         </Table.Cell>
@@ -98,16 +99,16 @@ const TransactionTable = () => {
                           </Typography>
                         </Table.Cell>
                         <Table.Cell>
-                          <StatusBadge status={transaction?.status} size="M" />
+                          <StatusBadge status={transaction?.status} transaction={transaction} />
                         </Table.Cell>
                         <Table.Cell>
                           <Typography variant="pi" textColor="neutral600">
-                            {formatDate(transaction.created_at)}
+                            {formatDate(transaction.created_at ?? transaction.createdAt)}
                           </Typography>
                         </Table.Cell>
                         <Table.Cell>
                           <Typography variant="pi" textColor="neutral600">
-                            {formatDate(transaction.updated_at)}
+                            {formatDate(transaction.updated_at ?? transaction.updatedAt)}
                           </Typography>
                         </Table.Cell>
                         <Table.Cell>

package/admin/src/pages/App/components/transaction-history/details/TransactionDetails.jsx

@@ -47,8 +47,8 @@ const TransactionDetails = ({ transaction }) => {
               Name:
             </Typography>
             <Typography variant="pi" textColor="neutral800">
-              {transaction.raw_request?.firstname}{" "}
-              {transaction.raw_request?.lastname}
+              {transaction.raw_request?.firstname || transaction.body?.raw_request?.firstname }{" "}
+              {transaction.raw_request?.lastname || transaction.body?.raw_request?.lastname}
             </Typography>
           </Flex>
           <Flex gap={3}>
@@ -56,7 +56,7 @@ const TransactionDetails = ({ transaction }) => {
               Email:
             </Typography>
             <Typography variant="pi" textColor="neutral800">
-              {transaction.raw_request?.email || "N/A"}
+              {transaction.raw_request?.email || transaction.body?.raw_request?.email || "N/A"}
             </Typography>
           </Flex>
           <Flex gap={3}>
@@ -64,7 +64,7 @@ const TransactionDetails = ({ transaction }) => {
               Phone:
             </Typography>
             <Typography variant="pi" textColor="neutral800">
-              {transaction.raw_request?.telephonenumber || "N/A"}
+              {transaction.raw_request?.telephonenumber || transaction.body?.raw_request?.telephonenumber || "N/A"}
             </Typography>
           </Flex>
           <Flex gap={3}>
@@ -72,8 +72,8 @@ const TransactionDetails = ({ transaction }) => {
               Address:
             </Typography>
             <Typography variant="pi" textColor="neutral800">
-              {transaction.raw_request?.street}, {transaction.raw_request?.zip}{" "}
-              {transaction.raw_request?.city}
+              {transaction.raw_request?.street || transaction.body?.raw_request?.street}, {transaction.raw_request?.zip || transaction.body?.raw_request?.zip}{" "}
+              {transaction.raw_request?.city || transaction.body?.raw_request?.city}
             </Typography>
           </Flex>
         </Flex>
@@ -94,7 +94,7 @@ const TransactionDetails = ({ transaction }) => {
               {transaction.txid || "N/A"}
             </Typography>
           </Flex>
-          {transaction.raw_request?.clearingtype === "cc" && (
+          {transaction.raw_request?.clearingtype === "cc"  || transaction.body?.raw_request?.clearingtype === "cc" && (
             <>
               <Flex gap={3}>
                 <Typography
@@ -105,7 +105,7 @@ const TransactionDetails = ({ transaction }) => {
                   Card Type:
                 </Typography>
                 <Typography variant="pi" textColor="neutral800">
-                  {getCardTypeName(transaction.raw_request?.cardtype)}
+                  {getCardTypeName(transaction.raw_request?.cardtype || transaction.body?.raw_request?.cardtype)}
                 </Typography>
               </Flex>
               <Flex gap={3}>
@@ -118,7 +118,7 @@ const TransactionDetails = ({ transaction }) => {
                 </Typography>
                 <Typography variant="pi" textColor="neutral800">
                   **** **** ****{" "}
-                  {transaction.raw_request?.cardpan?.slice(-4) || "****"}
+                  {transaction.raw_request?.cardpan?.slice(-4) || transaction.body?.raw_request?.cardpan?.slice(-4) || "****"}
                 </Typography>
               </Flex>
             </>
@@ -128,7 +128,7 @@ const TransactionDetails = ({ transaction }) => {
               Mode:
             </Typography>
             <Typography variant="pi" textColor="neutral800">
-              {transaction.raw_request?.mode || "N/A"}
+              {transaction.raw_request?.mode || transaction.body?.raw_request?.mode || "N/A"}
             </Typography>
           </Flex>
         </Flex>

package/admin/src/pages/hooks/useSettings.js

@@ -137,7 +137,6 @@ const useSettings = () => {
     setTestResult(null);
     try {
       const response = await testConnection();
-      console.log("response in handleTestConnection:", response.data);
       if (response.data && response.data.success) {
         setTestResult(response.data);
         toggleNotification({

package/admin/src/pages/utils/api.js

@@ -12,10 +12,11 @@ const usePayoneRequests = () => {
   const getTransactionHistory = (params = {}) => {
     const queryParams = new URLSearchParams();
 
-    if (params.filters) {
+    if (params.filters && typeof params.filters === "object") {
       Object.keys(params.filters).forEach((key) => {
         const value = params.filters[key];
-        if (value !== undefined && value !== null && value !== '') {
+        const v = value == null ? "" : String(value).trim();
+        if (v !== "" && v.toLowerCase() !== "all") {
           queryParams.append(`filters[${key}]`, String(value));
         }
       });

package/admin/src/pages/utils/transactionTableUtils.js

@@ -31,8 +31,9 @@ export const formatDate = (dateString) => {
 };
 
 export const getPaymentMethodName = (clearingtype, wallettype) => {
+
   switch (clearingtype) {
-    case "cc":
+    case "cc" || "card" | "c":
       return "Credit Card";
     case "sb":
       return "Online Banking";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-payone-provider",
-  "version": "5.6.10",
+  "version": "5.6.12",
   "description": "Strapi plugin for Payone payment gateway integration",
   "license": "MIT",
   "maintainers": [
@@ -42,4 +42,4 @@
     "kind": "plugin",
     "displayName": "Strapi Payone Provider"
   }
-}
+}

package/server/bootstrap.js

@@ -22,12 +22,11 @@ module.exports = async ({ strapi }) => {
         displayName: "",
         domainName: "",
         merchantIdentifier: "",
-        enableCreditCard: true,
-        enablePayPal: true,
-        enableGooglePay: true,
-        enableApplePay: true,
-        enableSofort: true,
-        enableSepaDirectDebit: true
+        enableCreditCard: false,
+        enablePayPal: false,
+        enableGooglePay: false,
+        enableApplePay: false,
+        enableSepaDirectDebit: false
       }
     });
   }

package/server/content-types/index.js

@@ -0,0 +1,5 @@
+const transactionsContentType = require('./transactions/index.js')
+
+module.exports = {
+  'transaction': transactionsContentType
+}

package/server/content-types/transactions/index.js

@@ -0,0 +1,5 @@
+const schema = require('./schema.json');
+
+module.exports = {
+  schema
+}

package/server/content-types/transactions/schema.json

@@ -0,0 +1,87 @@
+{
+  "kind": "collectionType",
+  "collectionName": "transactions",
+  "info": {
+    "singularName": "transaction",
+    "pluralName": "transactions",
+    "displayName": "Transaction"
+  },
+  "options": {
+    "draftAndPublish": false
+  },
+  "pluginOptions": {
+    "content-manager": {
+      "visible": false
+    },
+    "content-type-builder": {
+      "visible": false
+    }
+  },
+  "attributes": {
+    "txid": {
+      "type": "string",
+      "required": false,
+      "default": "NO TXID"
+    },
+    "reference": {
+      "type": "string",
+      "required": false,
+      "default": "NO REFERENCE"
+    },
+    "invoiceid": {
+      "type": "string",
+      "required": false,
+      "default": "NO INVOICE ID"
+    },
+    "amount": {
+      "type": "string",
+      "required": false,
+      "default": "0"
+    },
+    "currency": {
+      "type": "string",
+      "required": false,
+      "default": "EUR"
+    },
+    "status": {
+      "type": "string",
+      "required": false,
+      "default": "unknown"
+    },
+    "error_code": {
+      "type": "string",
+      "required": false,
+      "default": "NO ERROR CODE"
+    },
+    "request_type": {
+      "type": "string",
+      "required": false,
+      "default": "unknown"
+    },
+    "error_message": {
+      "type": "string",
+      "required": false,
+      "default": "NO ERROR MESSAGE"
+    },
+    "customer_message": {
+      "type": "string",
+      "required": false,
+      "default": "NO CUSTOMER MESSAGE"
+    },
+    "body": {
+      "type": "json",
+      "required": false,
+      "default": {}
+    },
+    "raw_request": {
+      "type": "json",
+      "required": false,
+      "default": {}
+    },
+    "raw_response": {
+      "type": "json",
+      "required": false,
+      "default": {}
+    }
+  }
+}

package/server/controllers/payone.js

@@ -156,12 +156,22 @@ module.exports = ({ strapi }) => ({
 
   async getTransactionHistory(ctx) {
     try {
-      const { filters = {}, pagination = {} } = ctx.query || {};
+      const { filters: rawFilters = {}, pagination = {} } = ctx.query || {};
       const page = parseInt(pagination.page || "1", 10);
       const pageSize = parseInt(pagination.pageSize || "10", 10);
 
+      const filters = {};
+      if (rawFilters && typeof rawFilters === "object") {
+        for (const [key, value] of Object.entries(rawFilters)) {
+          const v = value == null ? "" : String(value).trim();
+          if (v !== "" && v.toLowerCase() !== "all") {
+            filters[key] = value;
+          }
+        }
+      }
+
       const result = await getPayoneService(strapi).getTransactionHistory({
-        filters: filters || {},
+        filters,
         pagination: { page, pageSize }
       });
 
@@ -299,19 +309,20 @@ module.exports = ({ strapi }) => ({
 
   async handleTransactionStatus(ctx) {
     try {
-      const notificationData = ctx.request.body || {};
-      await getPayoneService(strapi).processTransactionStatus(notificationData);
-
-      ctx.status = 200;
-      ctx.body = "TSOK";
-      ctx.type = "text/plain";
-      console.log(`[Payone TransactionStatus] Responded TSOK`);
+      if (!ctx.state.payoneAllowed) {
+        console.log("[Payone] Notification ignored (policy failed)");
+      } else {
+        const notificationData = ctx.request.body || {};
+        console.log(notificationData);
+        await getPayoneService(strapi).processTransactionStatus(notificationData);
+      }
     } catch (error) {
-      console.log("[Payone TransactionStatus] Error handling notification:", error);
-      ctx.status = 200;
-      ctx.body = "TSOK";
-      ctx.type = "text/plain";
+      console.log("[Payone TransactionStatus] Error:", error);
     }
+
+    ctx.status = 200;
+    ctx.body = "TSOK";
+    ctx.type = "text/plain";
   }
 
 });

package/server/index.js

@@ -8,6 +8,7 @@ const controllers = require("./controllers");
 const routes = require("./routes");
 const services = require("./services");
 const policies = require("./policies");
+const contentTypes = require("./content-types");
 
 module.exports = {
   register,
@@ -15,6 +16,7 @@ module.exports = {
   destroy,
   config,
   controllers,
+  contentTypes,
   routes,
   services,
   policies

package/server/policies/is-payone-notification.js

@@ -1,30 +1,19 @@
-"use strict";
+module.exports = async (ctx) => {
+  const { request } = ctx;
 
-module.exports = async (policyContext, config, { strapi }) => {
-  const { request } = policyContext;
-  const userAgent = request.header["user-agent"] || request.header["User-Agent"] || "";
-  const clientIp = request.ip || request.connection?.remoteAddress || "";
+  const userAgent = request.headers["user-agent"] || "";
+  const clientIp =
+    request.headers["x-payone-client-ip"]?.trim() ||
+    request.headers["x-forwarded-for"]?.split(",")[0]?.trim() ||
+    request.ip ||
+    "";
 
-  if (userAgent !== "PAYONE FinanceGate") {
-    console.log(`[Payone TransactionStatus] Invalid User-Agent: ${userAgent}, IP: ${clientIp}`);
-    return false;
-  }
-
-
-  const isValidIp = (ip) => {
-    if (ip.startsWith("185.60.20.")) {
-      return true;
-    }
+  const isValid = userAgent === "PAYONE FinanceGate" && (clientIp.startsWith("185.60.20.") || clientIp === "54.246.203.105");
 
-    if (ip === "54.246.203.105") {
-      return true;
-    }
-    return false;
-  };
+  ctx.state.payoneAllowed = isValid;
 
-  if (!isValidIp(clientIp)) {
-    console.log(`[Payone TransactionStatus] Invalid IP address: ${clientIp}, User-Agent: ${userAgent}`);
-    return false;
+  if (!isValid) {
+    console.log("[Payone] Policy failed", { userAgent, clientIp });
   }
 
   return true;