strapi-plugin-payone-provider 1.6.0 → 1.6.1

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

@@ -13,6 +13,10 @@ import { DEFAULT_PAYMENT_DATA } from "../constants/paymentConstants";
 const usePaymentActions = () => {
   const toggleNotification = useNotification();
 
+<<<<<<< HEAD
+  // Load settings to get enable3DSecure value
+=======
+>>>>>>> feature/apple-pay
   const [settings, setSettings] = useState({ enable3DSecure: false });
 
   useEffect(() => {
@@ -23,14 +27,28 @@ const usePaymentActions = () => {
           setSettings(response.data);
         }
       } catch (error) {
+<<<<<<< HEAD
+        // Silent fail
+=======
+>>>>>>> feature/apple-pay
       }
     };
     loadSettings();
   }, []);
 
+<<<<<<< HEAD
+  // Payment form state
   const [paymentAmount, setPaymentAmount] = useState("1000");
 
+  // Generate order reference using generateLagOrderNumber
+  // Sequence number starts from 1000 and increments based on timestamp
   const generateOrderReference = () => {
+    // Use timestamp to generate unique sequence (1000 to 99999 range)
+=======
+  const [paymentAmount, setPaymentAmount] = useState("1000");
+
+  const generateOrderReference = () => {
+>>>>>>> feature/apple-pay
     const sequence = 1000 + Math.floor((Date.now() % 99000));
     return generateLagOrderNumber(sequence);
   };
@@ -46,11 +64,19 @@ const usePaymentActions = () => {
   const [googlePayToken, setGooglePayToken] = useState(null);
   const [applePayToken, setApplePayToken] = useState(null);
 
+<<<<<<< HEAD
+  // Card details for 3DS testing
+=======
+>>>>>>> feature/apple-pay
   const [cardtype, setCardtype] = useState("");
   const [cardpan, setCardpan] = useState("");
   const [cardexpiredate, setCardexpiredate] = useState("");
   const [cardcvc2, setCardcvc2] = useState("");
 
+<<<<<<< HEAD
+  // Payment processing state
+=======
+>>>>>>> feature/apple-pay
   const [isProcessingPayment, setIsProcessingPayment] = useState(false);
   const [paymentResult, setPaymentResult] = useState(null);
   const [paymentError, setPaymentError] = useState(null);
@@ -80,16 +106,29 @@ const usePaymentActions = () => {
       paymentMethod,
       amount: paymentAmount
     });
+<<<<<<< HEAD
+    
+=======
 
+>>>>>>> feature/apple-pay
     setIsProcessingPayment(true);
     setPaymentError(null);
     setPaymentResult(null);
     try {
+<<<<<<< HEAD
+      // Auto-generate reference if empty
+=======
+>>>>>>> feature/apple-pay
       const finalPreauthReference = preauthReference.trim() || generateOrderReference();
       if (!preauthReference.trim()) {
         setPreauthReference(finalPreauthReference);
       }
 
+<<<<<<< HEAD
+      // Determine currency based on card type
+      // American Express typically requires USD, other cards use EUR
+=======
+>>>>>>> feature/apple-pay
       const currency = (paymentMethod === "cc" && cardtype === "A") ? "USD" : "EUR";
 
       const baseParams = {
@@ -100,6 +139,10 @@ const usePaymentActions = () => {
         ...DEFAULT_PAYMENT_DATA
       };
 
+<<<<<<< HEAD
+      // Add card details if credit card payment and 3DS enabled
+=======
+>>>>>>> feature/apple-pay
       if (paymentMethod === "cc" && settings.enable3DSecure !== false) {
         if (cardtype) baseParams.cardtype = cardtype;
         if (cardpan) baseParams.cardpan = cardpan;
@@ -113,6 +156,10 @@ const usePaymentActions = () => {
 
       if (needsRedirectUrls) {
         const baseUrl = window.location.origin;
+<<<<<<< HEAD
+        // Detect current context (admin or content-ui) from pathname
+=======
+>>>>>>> feature/apple-pay
         const currentPath = window.location.pathname;
         const isContentUI = currentPath.includes('/content-ui') || currentPath.includes('/content-manager');
         const basePath = isContentUI ? '/content-ui' : '/admin';
@@ -136,13 +183,39 @@ const usePaymentActions = () => {
 
       const result = await payoneRequests.preauthorization(params);
       const responseData = result?.data || result;
+<<<<<<< HEAD
+
+      // Log full response
+      console.log("Preauthorization Response:", responseData);
+      console.log("Response Status:", responseData.status || responseData.Status);
+      console.log("Response Error Code:", responseData.errorcode || responseData.errorCode || responseData.ErrorCode);
+      console.log("Response Error Message:", responseData.errormessage || responseData.errorMessage || responseData.ErrorMessage);
+      console.log("All redirect URL fields:", {
+        redirectUrl: responseData.redirectUrl,
+        redirecturl: responseData.redirecturl,
+        RedirectUrl: responseData.RedirectUrl,
+        redirect_url: responseData.redirect_url,
+        url: responseData.url,
+        Url: responseData.Url
+      });
+
+=======
+>>>>>>> feature/apple-pay
       const status = (responseData.status || responseData.Status || "").toUpperCase();
       const errorCode = responseData.errorcode || responseData.errorCode || responseData.ErrorCode;
       const errorMessage = responseData.errormessage || responseData.errorMessage || responseData.ErrorMessage;
 
+<<<<<<< HEAD
+      // Check for 3DS required error (4219)
       const requires3DSErrorCodes = ["4219", 4219];
       const is3DSRequiredError = requires3DSErrorCodes.includes(errorCode);
 
+      // Check all possible redirect URL fields
+=======
+      const requires3DSErrorCodes = ["4219", 4219];
+      const is3DSRequiredError = requires3DSErrorCodes.includes(errorCode);
+
+>>>>>>> feature/apple-pay
       const redirectUrl =
         responseData.redirectUrl ||
         responseData.redirecturl ||
@@ -152,6 +225,10 @@ const usePaymentActions = () => {
         responseData.Url ||
         null;
 
+<<<<<<< HEAD
+      // If 3DS required but no redirect URL, show helpful message
+=======
+>>>>>>> feature/apple-pay
       if (is3DSRequiredError && !redirectUrl) {
         console.warn("3DS authentication required (Error 4219) but no redirect URL found in response");
         console.log("Full response:", JSON.stringify(responseData, null, 2));
@@ -163,6 +240,10 @@ const usePaymentActions = () => {
         return;
       }
 
+<<<<<<< HEAD
+      // Check for other errors (but not 3DS required)
+=======
+>>>>>>> feature/apple-pay
       if ((status === "ERROR" || status === "INVALID" || errorCode) && !is3DSRequiredError) {
         setPaymentError(
           errorMessage ||
@@ -185,8 +266,21 @@ const usePaymentActions = () => {
 
       setPaymentResult(responseData);
 
+<<<<<<< HEAD
+      console.log("[Payment] Preauthorization result:", {
+        status,
+        hasError: !!errorCode,
+        errorCode,
+        errorMessage
+      });
+
       if (status === "APPROVED") {
         handlePaymentSuccess("Preauthorization completed successfully");
+        // Return success result for Apple Pay callback
+=======
+      if (status === "APPROVED") {
+        handlePaymentSuccess("Preauthorization completed successfully");
+>>>>>>> feature/apple-pay
         return { success: true, data: responseData };
       } else {
         const errorMsg = errorMessage || `Unexpected status: ${status}`;
@@ -194,11 +288,19 @@ const usePaymentActions = () => {
           { message: errorMsg },
           `Preauthorization completed with status: ${status}`
         );
+<<<<<<< HEAD
+        // Return error result for Apple Pay callback
+=======
+>>>>>>> feature/apple-pay
         throw new Error(errorMsg);
       }
     } catch (error) {
       console.error("[Payment] Preauthorization error:", error);
       handlePaymentError(error, "Preauthorization failed");
+<<<<<<< HEAD
+      // Re-throw error so Apple Pay callback knows it failed
+=======
+>>>>>>> feature/apple-pay
       throw error;
     } finally {
       setIsProcessingPayment(false);
@@ -211,11 +313,20 @@ const usePaymentActions = () => {
     setPaymentResult(null);
 
     try {
+<<<<<<< HEAD
+      // Auto-generate reference if empty
+=======
+>>>>>>> feature/apple-pay
       const finalAuthReference = authReference.trim() || generateOrderReference();
       if (!authReference.trim()) {
         setAuthReference(finalAuthReference);
       }
 
+<<<<<<< HEAD
+      // Determine currency based on card type
+      // American Express typically requires USD, other cards use EUR
+=======
+>>>>>>> feature/apple-pay
       const currency = (paymentMethod === "cc" && cardtype === "A") ? "USD" : "EUR";
 
       const baseParams = {
@@ -226,6 +337,10 @@ const usePaymentActions = () => {
         ...DEFAULT_PAYMENT_DATA
       };
 
+<<<<<<< HEAD
+      // Add card details if credit card payment and 3DS enabled
+=======
+>>>>>>> feature/apple-pay
       if (paymentMethod === "cc" && settings.enable3DSecure !== false) {
         if (cardtype) baseParams.cardtype = cardtype;
         if (cardpan) baseParams.cardpan = cardpan;
@@ -239,6 +354,10 @@ const usePaymentActions = () => {
 
       if (needsRedirectUrls) {
         const baseUrl = window.location.origin;
+<<<<<<< HEAD
+        // Detect current context (admin or content-ui) from pathname
+=======
+>>>>>>> feature/apple-pay
         const currentPath = window.location.pathname;
         const isContentUI = currentPath.includes('/content-ui') || currentPath.includes('/content-manager');
         const basePath = isContentUI ? '/content-ui' : '/admin';
@@ -262,13 +381,39 @@ const usePaymentActions = () => {
 
       const result = await payoneRequests.authorization(params);
       const responseData = result?.data || result;
+<<<<<<< HEAD
+
+      // Log full response
+      console.log("Authorization Response:", responseData);
+      console.log("Response Status:", responseData.status || responseData.Status);
+      console.log("Response Error Code:", responseData.errorcode || responseData.errorCode || responseData.ErrorCode);
+      console.log("Response Error Message:", responseData.errormessage || responseData.errorMessage || responseData.ErrorMessage);
+      console.log("All redirect URL fields:", {
+        redirectUrl: responseData.redirectUrl,
+        redirecturl: responseData.redirecturl,
+        RedirectUrl: responseData.RedirectUrl,
+        redirect_url: responseData.redirect_url,
+        url: responseData.url,
+        Url: responseData.Url
+      });
+
+=======
+>>>>>>> feature/apple-pay
       const status = (responseData.status || responseData.Status || "").toUpperCase();
       const errorCode = responseData.errorcode || responseData.errorCode || responseData.ErrorCode;
       const errorMessage = responseData.errormessage || responseData.errorMessage || responseData.ErrorMessage;
 
+<<<<<<< HEAD
+      // Check for 3DS required error (4219)
       const requires3DSErrorCodes = ["4219", 4219];
       const is3DSRequiredError = requires3DSErrorCodes.includes(errorCode);
 
+      // Check all possible redirect URL fields
+=======
+      const requires3DSErrorCodes = ["4219", 4219];
+      const is3DSRequiredError = requires3DSErrorCodes.includes(errorCode);
+
+>>>>>>> feature/apple-pay
       const redirectUrl =
         responseData.redirectUrl ||
         responseData.redirecturl ||
@@ -278,6 +423,10 @@ const usePaymentActions = () => {
         responseData.Url ||
         null;
 
+<<<<<<< HEAD
+      // If 3DS required but no redirect URL, show helpful message
+=======
+>>>>>>> feature/apple-pay
       if (is3DSRequiredError && !redirectUrl) {
         console.warn("3DS authentication required (Error 4219) but no redirect URL found in response");
         console.log("Full response:", JSON.stringify(responseData, null, 2));
@@ -289,6 +438,10 @@ const usePaymentActions = () => {
         return;
       }
 
+<<<<<<< HEAD
+      // Check for other errors (but not 3DS required)
+=======
+>>>>>>> feature/apple-pay
       if ((status === "ERROR" || status === "INVALID" || errorCode) && !is3DSRequiredError) {
         setPaymentError(
           errorMessage ||
@@ -311,6 +464,16 @@ const usePaymentActions = () => {
 
       setPaymentResult(responseData);
 
+<<<<<<< HEAD
+      console.log("[Payment] Authorization result:", {
+        status,
+        hasError: !!errorCode,
+        errorCode,
+        errorMessage
+      });
+
+=======
+>>>>>>> feature/apple-pay
       if (status === "APPROVED") {
         handlePaymentSuccess("Authorization completed successfully");
         // Return success result for Apple Pay callback
@@ -321,11 +484,19 @@ const usePaymentActions = () => {
           { message: errorMsg },
           `Authorization completed with status: ${status}`
         );
+<<<<<<< HEAD
+        // Return error result for Apple Pay callback
+=======
+>>>>>>> feature/apple-pay
         throw new Error(errorMsg);
       }
     } catch (error) {
       console.error("[Payment] Authorization error:", error);
       handlePaymentError(error, "Authorization failed");
+<<<<<<< HEAD
+      // Re-throw error so Apple Pay callback knows it failed
+=======
+>>>>>>> feature/apple-pay
       throw error;
     } finally {
       setIsProcessingPayment(false);

package/package.json

@@ -1,49 +1,49 @@
-{
-  "name": "strapi-plugin-payone-provider",
-  "version": "1.6.0",
-  "description": "Strapi plugin for Payone payment gateway integration",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "NewProWeb Community",
-      "email": "abror.abdullaev@newproweb.com"
-    }
-  ],
-  "dependencies": {
-    "axios": "^1.6.3",
-    "prop-types": "^15.7.2"
-  },
-  "devDependencies": {
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-router-dom": "^5.3.4",
-    "styled-components": "^5.3.6"
-  },
-  "peerDependencies": {
-    "@strapi/strapi": "^4.0",
-    "react": "^17.0.0 || ^18.0.0",
-    "react-dom": "^17.0.0 || ^18.0.0",
-    "react-router-dom": "^5.2.0",
-    "styled-components": "^5.2.1"
-  },
-  "engines": {
-    "node": ">=18.0.0",
-    "npm": ">=6.0.0"
-  },
-  "authors": [
-    {
-      "name": "NewProWeb <Aliev Davlatbek>",
-      "email": "mamurjonov.davlatbek@newproweb.com"
-    },
-    {
-      "name": "Akromjon Rahimjonov",
-      "email": "akromjon.rahimjonov@newproweb.com"
-    }
-  ],
-  "strapi": {
-    "name": "strapi-plugin-payone-provider",
-    "description": "Integrates Strapi Payone payment gateway with Strapi",
-    "kind": "plugin",
-    "displayName": "Strapi Payone Provider"
-  }
-}
+{
+  "name": "strapi-plugin-payone-provider",
+  "version": "1.6.1",
+  "description": "Strapi plugin for Payone payment gateway integration",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "NewProWeb Community",
+      "email": "abror.abdullaev@newproweb.com"
+    }
+  ],
+  "dependencies": {
+    "axios": "^1.6.3",
+    "prop-types": "^15.7.2"
+  },
+  "devDependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-router-dom": "^5.3.4",
+    "styled-components": "^5.3.6"
+  },
+  "peerDependencies": {
+    "@strapi/strapi": "^4.0",
+    "react": "^17.0.0 || ^18.0.0",
+    "react-dom": "^17.0.0 || ^18.0.0",
+    "react-router-dom": "^5.2.0",
+    "styled-components": "^5.2.1"
+  },
+  "engines": {
+    "node": ">=18.0.0",
+    "npm": ">=6.0.0"
+  },
+  "authors": [
+    {
+      "name": "NewProWeb <Aliev Davlatbek>",
+      "email": "mamurjonov.davlatbek@newproweb.com"
+    },
+    {
+      "name": "Akromjon Rahimjonov",
+      "email": "akromjon.rahimjonov@newproweb.com"
+    }
+  ],
+  "strapi": {
+    "name": "strapi-plugin-payone-provider",
+    "description": "Integrates Strapi Payone payment gateway with Strapi",
+    "kind": "plugin",
+    "displayName": "Strapi Payone Provider"
+  }
+}

package/server/bootstrap.js

@@ -53,8 +53,11 @@ module.exports = async ({ strapi }) => {
   try {
     const Router = require('@koa/router');
     const router = new Router();
+<<<<<<< HEAD
+=======
     const fs = require('fs');
     const path = require('path');
+>>>>>>> feature/apple-pay
 
     routes.forEach(route => {
       router.get(route, async (ctx) => {
@@ -63,6 +66,9 @@ module.exports = async ({ strapi }) => {
       });
     });
 
+<<<<<<< HEAD
+    // Add router to the server app
+=======
     // Register route for Apple Pay .well-known file
     router.get('/.well-known/apple-developer-merchantid-domain-association', async (ctx) => {
       try {
@@ -120,6 +126,7 @@ module.exports = async ({ strapi }) => {
       }
     });
 
+>>>>>>> feature/apple-pay
     if (strapi.server.app && typeof strapi.server.app.use === 'function') {
       strapi.server.app.use(router.routes());
       strapi.server.app.use(router.allowedMethods());

package/server/controllers/payone.js

@@ -6,13 +6,11 @@ const getPayoneService = (strapi) => {
   return strapi.plugin(PLUGIN_NAME).service("payone");
 };
 
-
 const handleError = (ctx, error) => {
   ctx.strapi.log.error("Payone controller error:", error);
   ctx.throw(500, error);
 };
 
-
 const hideKey = (settings) => {
   if (settings && settings.key) {
     settings.key = "***HIDDEN***";

package/server/services/transactionService.js

@@ -1,7 +1,18 @@
 "use strict";
 
+<<<<<<< HEAD
+const { getPluginStore, PLUGIN_NAME } = require("./settingsService");
+
+/**
+ * Log transaction to history
+ * @param {Object} strapi - Strapi instance
+ * @param {Object} transactionData - Transaction data
+ * @returns {Promise<void>}
+ */
+=======
 const { getPluginStore } = require("./settingsService");
 
+>>>>>>> feature/apple-pay
 const logTransaction = async (strapi, transactionData) => {
   const pluginStore = getPluginStore(strapi);
   let transactionHistory =
@@ -35,6 +46,10 @@ const logTransaction = async (strapi, transactionData) => {
 
   transactionHistory.unshift(logEntry);
 
+<<<<<<< HEAD
+  // Keep only last 1000 transactions
+=======
+>>>>>>> feature/apple-pay
   if (transactionHistory.length > 1000) {
     transactionHistory = transactionHistory.slice(0, 1000);
   }
@@ -47,11 +62,24 @@ const logTransaction = async (strapi, transactionData) => {
   strapi.log.info("Transaction logged:", logEntry);
 };
 
+<<<<<<< HEAD
+/**
+ * Get transaction history with filters
+ * @param {Object} strapi - Strapi instance
+ * @param {Object} filters - Filter options
+ * @returns {Promise<Array>} Filtered transaction history
+ */
+=======
+>>>>>>> feature/apple-pay
 const getTransactionHistory = async (strapi, filters = {}) => {
   const pluginStore = getPluginStore(strapi);
   let transactionHistory =
     (await pluginStore.get({ key: "transactionHistory" })) || [];
 
+<<<<<<< HEAD
+  // Apply filters
+=======
+>>>>>>> feature/apple-pay
   if (filters.status) {
     transactionHistory = transactionHistory.filter(
       (transaction) => transaction.status === filters.status

package/server/utils/paymentMethodParams.js

@@ -1,11 +1,6 @@
 "use strict";
 
-/**
- * Add payment method specific parameters
- * @param {Object} params - Request parameters
- * @param {Object} logger - Logger instance
- * @returns {Object} Updated parameters with payment method defaults
- */
+
 const addPaymentMethodParams = (params, logger) => {
   const updated = { ...params };
   const clearingtype = updated.clearingtype || "cc";
@@ -152,7 +147,6 @@ const addPaymentMethodParams = (params, logger) => {
       updated.wallettype = "PPE";
     }
   }
-
   if (updated.clearingtype === "wlt" && updated.cardtype) {
     delete updated.cardtype;
   }