strapi-plugin-payone-provider 1.6.7 → 5.6.9

package/server/services/transactionService.js

@@ -49,36 +49,32 @@ const logTransaction = async (strapi, transactionData) => {
   strapi.log.info("Transaction logged:", logEntry);
 };
 
-const getTransactionHistory = async (strapi, filters = {}) => {
-  const pluginStore = getPluginStore(strapi);
-  let transactionHistory =
-    (await pluginStore.get({ key: "transactionHistory" })) || [];
 
-  if (filters.search) {
-    const searchLower = filters.search.toLowerCase().trim();
-    transactionHistory = transactionHistory.filter((transaction) => {
-      const status = (transaction.status || "").toLowerCase();
-      const txid = (transaction.txid || "").toLowerCase();
-      const reference = (transaction.reference || "").toLowerCase();
-
-      return (
-        status.includes(searchLower) ||
-        txid.includes(searchLower) ||
-        reference.includes(searchLower)
-      );
+const applyFilters = (transactions, filters = {}) => {
+  let result = [...transactions];
+  if (filters.search && typeof filters.search === 'string' && filters.search.trim() !== '') {
+    const search = filters.search.toLowerCase().trim();
+    result = result.filter((t) => {
+      const txid = (t.txid || "").toString().toLowerCase();
+      const reference = (t.reference || "").toString().toLowerCase();
+      return txid.includes(search) || reference.includes(search);
     });
   }
 
-  if (filters.request_type) {
-    transactionHistory = transactionHistory.filter(
-      (transaction) => transaction.request_type === filters.request_type
+  if (filters.status) {
+    result = result.filter(
+      (t) => (t.status || "").toUpperCase() === filters.status.toUpperCase()
     );
   }
 
+  if (filters.request_type) {
+    result = result.filter((t) => t.request_type === filters.request_type);
+  }
+
   if (filters.payment_method) {
-    transactionHistory = transactionHistory.filter((transaction) => {
-      const clearingtype = transaction.raw_request?.clearingtype || "";
-      const wallettype = transaction.raw_request?.wallettype || "";
+    result = result.filter((t) => {
+      const clearingtype = t.raw_request?.clearingtype;
+      const wallettype = t.raw_request?.wallettype;
 
       switch (filters.payment_method) {
         case "credit_card":
@@ -86,34 +82,67 @@ const getTransactionHistory = async (strapi, filters = {}) => {
         case "paypal":
           return clearingtype === "wlt" && wallettype === "PPE";
         case "google_pay":
-          return clearingtype === "wlt" && (wallettype === "GPY" || wallettype === "GOOGLEPAY");
+          return clearingtype === "wlt" && ["GPY", "GOOGLEPAY"].includes(wallettype);
         case "apple_pay":
-          return clearingtype === "wlt" && (wallettype === "APL" || wallettype === "APPLEPAY");
+          return clearingtype === "wlt" && ["APL", "APPLEPAY"].includes(wallettype);
         case "sofort":
           return clearingtype === "sb";
         case "sepa":
           return clearingtype === "elv";
         default:
-          return false;
+          return true;
       }
     });
   }
 
   if (filters.date_from) {
-    transactionHistory = transactionHistory.filter(
-      (transaction) =>
-        new Date(transaction.timestamp) >= new Date(filters.date_from)
+    const dateFrom = new Date(filters.date_from);
+    dateFrom.setHours(0, 0, 0, 0);
+    result = result.filter(
+      (t) => new Date(t.timestamp) >= dateFrom
     );
   }
 
   if (filters.date_to) {
-    transactionHistory = transactionHistory.filter(
-      (transaction) =>
-        new Date(transaction.timestamp) <= new Date(filters.date_to)
+    const dateTo = new Date(filters.date_to);
+    dateTo.setHours(23, 59, 59, 999);
+    result = result.filter(
+      (t) => new Date(t.timestamp) <= dateTo
     );
   }
 
-  return transactionHistory;
+  return result;
+};
+
+const getTransactionHistory = async (strapi, { filters = {}, pagination = {} }) => {
+  const pluginStore = getPluginStore(strapi);
+
+  let transactions =
+    (await pluginStore.get({ key: "transactionHistory" })) || [];
+
+  transactions = applyFilters(transactions, filters);
+  const page = Number(pagination.page) || 1;
+  const pageSize = Number(pagination.pageSize) || 10;
+
+  const total = transactions.length;
+  const pageCount = Math.max(1, Math.ceil(total / pageSize));
+
+  const validPage = Math.min(Math.max(1, page), pageCount);
+
+  const start = (validPage - 1) * pageSize;
+  const end = Math.min(start + pageSize, total);
+
+  const paginatedData = start < total ? transactions.slice(start, end) : [];
+
+  return {
+    data: paginatedData,
+    pagination: {
+      page: validPage,
+      pageSize,
+      pageCount,
+      total,
+    },
+  };
 };
 
 module.exports = {

package/server/utils/normalize.js

@@ -1,11 +1,5 @@
 "use strict";
 
-/**
- * Normalize reference string for Payone API
- * @param {string} input - Input reference
- * @param {string} fallbackPrefix - Fallback prefix if input is empty
- * @returns {string} Normalized reference (max 20 chars)
- */
 const normalizeReference = (input, fallbackPrefix = "REF") => {
   try {
     const raw = input == null ? "" : String(input);
@@ -22,12 +16,6 @@ const normalizeReference = (input, fallbackPrefix = "REF") => {
   }
 };
 
-/**
- * Normalize customer ID for Payone API (max 17 characters)
- * @param {string|null} customerid - Customer ID
- * @param {Object|null} logger - Logger instance
- * @returns {string} Normalized customer ID
- */
 const normalizeCustomerId = (customerid, logger = null) => {
   if (!customerid) {
     const timestamp = Date.now().toString().slice(-10);

package/server/utils/paymentMethodParams.js

@@ -56,7 +56,6 @@ const addPaymentMethodParams = (params, logger) => {
     'clearingtype', 'paymentMethod', 'settings', 'enable3DSecure', 'ecommercemode'
   ]);
 
-  // Extract custom params that are not in known params
   Object.keys(updated).forEach(key => {
     if (!knownParams.has(key) && !key.startsWith('add_paydata[')) {
       customParams[key] = updated[key];

package/server/utils/responseParser.js

@@ -20,17 +20,12 @@ const parseResponse = (responseText, logger) => {
     }
   }
 
-  // Parse URL-encoded response
   const params = new URLSearchParams(responseText);
   const response = {};
   for (const [key, value] of params) {
-    // Store both lowercase and original case
     response[key.toLowerCase()] = value;
     response[key] = value;
-    
-    // Also handle add_paydata fields with brackets
-    // Payone returns: add_paydata[applepay_payment_session]=BASE64_STRING
-    // URLSearchParams handles brackets, but we need to ensure we can access it
+
     if (key.includes('add_paydata') || key.includes('addPaydata')) {
       // Store with original key format
       response[key] = value;
@@ -67,11 +62,11 @@ const extractTxId = (data) => {
 const requires3DSRedirect = (data) => {
   const status = (data.status || data.Status || "").toUpperCase();
   const errorCode = data.errorcode || data.ErrorCode || data.Error?.ErrorCode;
-  
+
   // Check for redirect URL in various possible fields
-  const redirecturl = 
-    data.redirecturl || 
-    data.RedirectUrl || 
+  const redirecturl =
+    data.redirecturl ||
+    data.RedirectUrl ||
     data.redirect_url ||
     data.redirectUrl ||
     data.RedirectURL ||
@@ -96,7 +91,7 @@ const requires3DSRedirect = (data) => {
 const isErrorResponse = (data) => {
   const status = (data.status || data.Status || "").toUpperCase();
   const errorCode = data.errorcode || data.ErrorCode || data.Error?.ErrorCode;
-  
+
   return status === "ERROR" || status === "INVALID" || !!errorCode;
 };
 
@@ -107,9 +102,9 @@ const isErrorResponse = (data) => {
  */
 const get3DSRedirectUrl = (data) => {
   // Check all possible redirect URL fields
-  const redirecturl = 
-    data.redirecturl || 
-    data.RedirectUrl || 
+  const redirecturl =
+    data.redirecturl ||
+    data.RedirectUrl ||
     data.redirect_url ||
     data.redirectUrl ||
     data.RedirectURL ||

package/strapi-admin.js

@@ -1,3 +1,5 @@
 "use strict";
 
-module.exports = require("./admin/src");
+import admin from "./admin/src";
+
+export default admin;