strapi-plugin-payone-provider 4.6.9 → 4.6.11

package/admin/src/pages/App/components/{ApplePayConfig.jsx → configuration/ApplePayConfig.jsx}

@@ -1,5 +1,14 @@
 import React from "react";
-import { Box, Flex, Typography, Select, Option, Checkbox, Stack } from "@strapi/design-system";
+import {
+  Box,
+  Flex,
+  Typography,
+  Select,
+  Option,
+  Checkbox,
+  Stack,
+} from "@strapi/design-system";
+import InfoTooltip from "../common/InfoTooltip";
 import {
   APPLE_PAY_SUPPORTED_COUNTRIES,
   APPLE_PAY_SUPPORTED_NETWORKS,
@@ -8,14 +17,10 @@ import {
   getSupportedNetworksForCountry,
   APPLE_PAY_BUTTON_STYLES,
   APPLE_PAY_BUTTON_TYPES,
-  DEFAULT_APPLE_PAY_CONFIG
-} from "../../utils/applePayConstants";
+  DEFAULT_APPLE_PAY_CONFIG,
+} from "../../../utils/applePayConstants";
 
-const ApplePayConfig = ({
-  config,
-  onConfigChange,
-  settings
-}) => {
+const ApplePayConfig = ({ config, onConfigChange, settings }) => {
   const {
     countryCode = DEFAULT_APPLE_PAY_CONFIG.countryCode,
     currencyCode = DEFAULT_APPLE_PAY_CONFIG.currencyCode,
@@ -26,16 +31,17 @@ const ApplePayConfig = ({
   } = config || {};
 
   const supportedCurrencies = getSupportedCurrenciesForCountry(countryCode);
-  const supportedNetworksForCountry = getSupportedNetworksForCountry(countryCode);
+  const supportedNetworksForCountry =
+    getSupportedNetworksForCountry(countryCode);
 
   const handleCountryChange = (value) => {
     const newConfig = {
       ...config,
-      countryCode: value
+      countryCode: value,
     };
 
     const newSupportedCurrencies = getSupportedCurrenciesForCountry(value);
-    if (!newSupportedCurrencies.find(c => c.code === currencyCode)) {
+    if (!newSupportedCurrencies.find((c) => c.code === currencyCode)) {
       newConfig.currencyCode = newSupportedCurrencies[0]?.code || "USD";
     }
 
@@ -47,31 +53,31 @@ const ApplePayConfig = ({
   const handleCurrencyChange = (value) => {
     onConfigChange({
       ...config,
-      currencyCode: value
+      currencyCode: value,
     });
   };
 
   const handleNetworkToggle = (networkCode) => {
     const currentNetworks = supportedNetworks || [];
     const newNetworks = currentNetworks.includes(networkCode)
-      ? currentNetworks.filter(n => n !== networkCode)
+      ? currentNetworks.filter((n) => n !== networkCode)
       : [...currentNetworks, networkCode];
 
     onConfigChange({
       ...config,
-      supportedNetworks: newNetworks
+      supportedNetworks: newNetworks,
     });
   };
 
   const handleCapabilityToggle = (capabilityCode) => {
     const currentCapabilities = merchantCapabilities || [];
     const newCapabilities = currentCapabilities.includes(capabilityCode)
-      ? currentCapabilities.filter(c => c !== capabilityCode)
+      ? currentCapabilities.filter((c) => c !== capabilityCode)
       : [...currentCapabilities, capabilityCode];
 
     onConfigChange({
       ...config,
-      merchantCapabilities: newCapabilities
+      merchantCapabilities: newCapabilities,
     });
   };
 
@@ -79,7 +85,12 @@ const ApplePayConfig = ({
     <Box>
       <Stack spacing={6}>
         <Box>
-          <Typography variant="delta" as="h3" fontWeight="bold" style={{ marginBottom: "6px" }}>
+          <Typography
+            variant="delta"
+            as="h3"
+            fontWeight="bold"
+            style={{ marginBottom: "6px" }}
+          >
             Apple Pay Configuration
           </Typography>
           <Typography variant="pi" textColor="neutral600">
@@ -95,10 +106,16 @@ const ApplePayConfig = ({
               name="countryCode"
               value={countryCode}
               onChange={handleCountryChange}
-              hint="Select the country where your business operates"
               required
+              labelAction={
+                <InfoTooltip
+                  label="Country Code"
+                  description="Select the country where your business operates"
+                  id="countryCode-tooltip"
+                />
+              }
             >
-              {APPLE_PAY_SUPPORTED_COUNTRIES.map(country => (
+              {APPLE_PAY_SUPPORTED_COUNTRIES.map((country) => (
                 <Option key={country.code} value={country.code}>
                   {country.name} ({country.code})
                 </Option>
@@ -112,18 +129,29 @@ const ApplePayConfig = ({
               name="currencyCode"
               value={currencyCode}
               onChange={handleCurrencyChange}
-              hint={`Supported currencies for ${countryCode}`}
               required
+              labelAction={
+                <InfoTooltip
+                  label="Currency Code"
+                  description={`Supported currencies for ${countryCode}. Should match the selected country.`}
+                  id="currencyCode-tooltip"
+                />
+              }
             >
-              {supportedCurrencies.map(currency => (
+              {supportedCurrencies.map((currency) => (
                 <Option key={currency.code} value={currency.code}>
                   {currency.name} ({currency.code}) {currency.symbol}
                 </Option>
               ))}
             </Select>
             {supportedCurrencies.length === 0 && (
-              <Typography variant="pi" textColor="danger600" style={{ marginTop: "4px" }}>
-                No supported currencies for this country. Please select a different country.
+              <Typography
+                variant="pi"
+                textColor="danger600"
+                style={{ marginTop: "4px" }}
+              >
+                No supported currencies for this country. Please select a
+                different country.
               </Typography>
             )}
           </Box>
@@ -136,10 +164,18 @@ const ApplePayConfig = ({
               label="Button Style"
               name="buttonStyle"
               value={buttonStyle}
-              onChange={(value) => onConfigChange({ ...config, buttonStyle: value })}
-              hint="Visual style of the Apple Pay button"
+              onChange={(value) =>
+                onConfigChange({ ...config, buttonStyle: value })
+              }
+              labelAction={
+                <InfoTooltip
+                  label="Button Style"
+                  description="Visual style of the Apple Pay button (e.g., black, white, white-outline)"
+                  id="buttonStyle-tooltip"
+                />
+              }
             >
-              {APPLE_PAY_BUTTON_STYLES.map(style => (
+              {APPLE_PAY_BUTTON_STYLES.map((style) => (
                 <Option key={style.code} value={style.code}>
                   {style.name}
                 </Option>
@@ -152,10 +188,18 @@ const ApplePayConfig = ({
               label="Button Type"
               name="buttonType"
               value={buttonType}
-              onChange={(value) => onConfigChange({ ...config, buttonType: value })}
-              hint="Type of action the button represents"
+              onChange={(value) =>
+                onConfigChange({ ...config, buttonType: value })
+              }
+              labelAction={
+                <InfoTooltip
+                  label="Button Type"
+                  description="Type of action the button represents (e.g., buy, donate, plain)"
+                  id="buttonType-tooltip"
+                />
+              }
             >
-              {APPLE_PAY_BUTTON_TYPES.map(type => (
+              {APPLE_PAY_BUTTON_TYPES.map((type) => (
                 <Option key={type.code} value={type.code}>
                   {type.name}
                 </Option>
@@ -166,29 +210,45 @@ const ApplePayConfig = ({
 
         {/* Supported Networks */}
         <Box>
-          <Typography variant="pi" fontWeight="semiBold" style={{ marginLeft: "2px" }}>
+          <Typography
+            variant="pi"
+            fontWeight="semiBold"
+            style={{ marginLeft: "2px" }}
+          >
             Supported Networks
           </Typography>
-          <Typography variant="pi" textColor="neutral600" style={{ marginLeft: "2px" }}>
+          <Typography
+            variant="pi"
+            textColor="neutral600"
+            style={{ marginLeft: "2px" }}
+          >
             Select payment networks supported in {countryCode}
           </Typography>
           <Flex wrap="wrap" gap={4} style={{ marginTop: "12px" }}>
-            {APPLE_PAY_SUPPORTED_NETWORKS.map(network => {
-              const isSupported = supportedNetworksForCountry.includes(network.code);
+            {APPLE_PAY_SUPPORTED_NETWORKS.map((network) => {
+              const isSupported = supportedNetworksForCountry.includes(
+                network.code
+              );
               const isSelected = supportedNetworks?.includes(network.code);
 
               return (
-                <Box key={network.code} style={{ flex: "0 0 calc(50% - 8px)", minWidth: "250px" }}>
+                <Box
+                  key={network.code}
+                  style={{ flex: "0 0 calc(50% - 8px)", minWidth: "250px" }}
+                >
                   <Checkbox
                     name={`network-${network.code}`}
                     checked={isSelected}
                     onChange={() => handleNetworkToggle(network.code)}
                     disabled={!isSupported}
-                    hint={!isSupported ? `Not supported in ${countryCode}` : undefined}
                   >
                     {network.name} ({network.code})
                     {!isSupported && (
-                      <Typography variant="sigma" textColor="neutral500" style={{ marginLeft: "8px" }}>
+                      <Typography
+                        variant="sigma"
+                        textColor="neutral500"
+                        style={{ marginLeft: "8px" }}
+                      >
                         (Not available)
                       </Typography>
                     )}
@@ -198,7 +258,11 @@ const ApplePayConfig = ({
             })}
           </Flex>
           {supportedNetworks?.length === 0 && (
-            <Typography variant="pi" textColor="danger600" style={{ marginTop: "8px" }}>
+            <Typography
+              variant="pi"
+              textColor="danger600"
+              style={{ marginTop: "8px" }}
+            >
               At least one network must be selected
             </Typography>
           )}
@@ -206,18 +270,32 @@ const ApplePayConfig = ({
 
         {/* Merchant Capabilities */}
         <Box>
-          <Typography variant="pi" fontWeight="semiBold" style={{ marginLeft: "2px" }}>
+          <Typography
+            variant="pi"
+            fontWeight="semiBold"
+            style={{ marginLeft: "2px" }}
+          >
             Merchant Capabilities
           </Typography>
-          <Typography variant="pi" textColor="neutral600" style={{ marginLeft: "2px" }}>
-            Select payment capabilities. "3D Secure" is required for most payment methods.
+          <Typography
+            variant="pi"
+            textColor="neutral600"
+            style={{ marginLeft: "2px" }}
+          >
+            Select payment capabilities. "3D Secure" is required for most
+            payment methods.
           </Typography>
           <Flex wrap="wrap" gap={4} style={{ marginTop: "12px" }}>
-            {APPLE_PAY_MERCHANT_CAPABILITIES.map(capability => {
-              const isSelected = merchantCapabilities?.includes(capability.code);
+            {APPLE_PAY_MERCHANT_CAPABILITIES.map((capability) => {
+              const isSelected = merchantCapabilities?.includes(
+                capability.code
+              );
 
               return (
-                <Box key={capability.code} style={{ flex: "0 0 calc(50% - 8px)", minWidth: "250px" }}>
+                <Box
+                  key={capability.code}
+                  style={{ flex: "0 0 calc(50% - 8px)", minWidth: "250px" }}
+                >
                   <Checkbox
                     name={`capability-${capability.code}`}
                     checked={isSelected}
@@ -230,38 +308,65 @@ const ApplePayConfig = ({
             })}
           </Flex>
           {merchantCapabilities?.length === 0 && (
-            <Typography variant="pi" textColor="danger600" style={{ marginTop: "8px" }}>
-              At least one capability must be selected. "supports3DS" is recommended.
+            <Typography
+              variant="pi"
+              textColor="danger600"
+              style={{ marginTop: "8px" }}
+            >
+              At least one capability must be selected. "supports3DS" is
+              recommended.
             </Typography>
           )}
         </Box>
 
-
         {/* Merchant Identifier Info */}
         <Box>
-          <Typography variant="pi" fontWeight="semiBold" style={{ marginLeft: "2px" }}>
+          <Typography
+            variant="pi"
+            fontWeight="semiBold"
+            style={{ marginLeft: "2px" }}
+          >
             Merchant Identifier
           </Typography>
           <Typography variant="pi" textColor="neutral600">
             {settings?.mid || settings?.portalid
               ? `Using: ${settings.mid || settings.portalid}`
-              : "Merchant identifier will be obtained from Payone after domain verification. See documentation for setup instructions."
-            }
+              : "Merchant identifier will be obtained from Payone after domain verification. See documentation for setup instructions."}
           </Typography>
         </Box>
 
         {/* Domain Verification File Alert */}
         <Box marginTop={4}>
-          <Box padding={3} background="warning100" borderRadius="4px" borderColor="warning200" borderWidth="1px" borderStyle="solid">
-            <Typography variant="pi" fontWeight="bold" textColor="warning700" marginBottom={2}>
-              ⚠️ Domain Verification File Required {' '}
+          <Box
+            padding={3}
+            background="warning100"
+            borderRadius="4px"
+            borderColor="warning200"
+            borderWidth="1px"
+            borderStyle="solid"
+          >
+            <Typography
+              variant="pi"
+              fontWeight="bold"
+              textColor="warning700"
+              marginBottom={2}
+            >
+              ⚠️ Domain Verification File Required{" "}
             </Typography>
             <Typography variant="pi" textColor="neutral700" marginBottom={2}>
-              <strong>Download the Apple Pay domain verification file</strong> from your Payone merchant portal:
+              <strong>Download the Apple Pay domain verification file</strong>{" "}
+              from your Payone merchant portal:
             </Typography>
-            <Box padding={2} background="neutral0" borderRadius="4px" marginTop={2} marginBottom={2}>
+            <Box
+              padding={2}
+              background="neutral0"
+              borderRadius="4px"
+              marginTop={2}
+              marginBottom={2}
+            >
               <Typography variant="pi" style={{ fontSize: "12px" }}>
-                <strong>Download URL:</strong> Download the domain verification file from Payone documentation:{" "}
+                <strong>Download URL:</strong> Download the domain verification
+                file from Payone documentation:{" "}
                 <a
                   href="https://docs.payone.com/payment-methods/apple-pay/apple-pay-without-dev"
                   target="_blank"
@@ -275,17 +380,41 @@ const ApplePayConfig = ({
             <Typography variant="pi" textColor="neutral700" marginBottom={2}>
               <strong>Place the file at:</strong>
             </Typography>
-            <Box padding={2} background="neutral0" borderRadius="4px" marginTop={2} marginBottom={2}>
-              <Typography variant="pi" style={{ fontFamily: "monospace", fontSize: "12px" }}>
-                <strong>Strapi:</strong> <code>public/.well-known/apple-developer-merchantid-domain-association</code><br />
-                <strong>Frontend:</strong> <code>public/.well-known/apple-developer-merchantid-domain-association</code>
+            <Box
+              padding={2}
+              background="neutral0"
+              borderRadius="4px"
+              marginTop={2}
+              marginBottom={2}
+            >
+              <Typography
+                variant="pi"
+                style={{ fontFamily: "monospace", fontSize: "12px" }}
+              >
+                <strong>Strapi:</strong>{" "}
+                <code>
+                  public/.well-known/apple-developer-merchantid-domain-association
+                </code>
+                <br />
+                <strong>Frontend:</strong>{" "}
+                <code>
+                  public/.well-known/apple-developer-merchantid-domain-association
+                </code>
               </Typography>
             </Box>
             <Typography variant="pi" textColor="neutral700" marginTop={2}>
-              The file must be accessible at: <code>https://yourdomain.com/.well-known/apple-developer-merchantid-domain-association</code>
+              The file must be accessible at:{" "}
+              <code>
+                https://yourdomain.com/.well-known/apple-developer-merchantid-domain-association
+              </code>
             </Typography>
             <br />
-            <Typography variant="pi" fontWeight="bold" textColor="danger600" marginTop={2}>
+            <Typography
+              variant="pi"
+              fontWeight="bold"
+              textColor="danger600"
+              marginTop={2}
+            >
               Without this file, Apple Pay will NOT work on your domain!
             </Typography>
           </Box>
@@ -295,4 +424,4 @@ const ApplePayConfig = ({
   );
 };
 
-export default ApplePayConfig;
+export default ApplePayConfig;

package/admin/src/pages/App/components/{ApplePayConfigPanel.jsx → configuration/ApplePayConfigPanel.jsx}

@@ -1,70 +1,71 @@
-import React, { useState, useEffect } from "react";
-import {
-  Box,
-  Card,
-  CardBody,
-  Flex,
-  Typography,
-  Button,
-} from "@strapi/design-system";
-import { Check } from "@strapi/icons";
-import ApplePayConfig from "./ApplePayConfig";
-
-const ApplePayConfigPanel = ({ settings, onInputChange, isSaving, onSave }) => {
-  const [applePayConfig, setApplePayConfig] = useState(
-    settings?.applePayConfig || {}
-  );
-
-  useEffect(() => {
-    setApplePayConfig(settings?.applePayConfig || {});
-  }, [settings?.applePayConfig]);
-
-  return (
-    <Box
-      className="payment-container"
-      paddingTop={8}
-      paddingBottom={8}
-      paddingLeft={8}
-      paddingRight={8}
-    >
-      <Flex direction="column" alignItems="stretch" gap={8}>
-        <Box>
-          <Card className="payment-card">
-            <CardBody padding={6}>
-              <ApplePayConfig
-                config={applePayConfig}
-                onConfigChange={(newConfig) => {
-                  setApplePayConfig(newConfig);
-                  onInputChange("applePayConfig", newConfig);
-                }}
-                settings={settings}
-              />
-            </CardBody>
-          </Card>
-        </Box>
-
-        <Box paddingTop={4}>
-          <Flex direction="row" gap={4} alignItems="center">
-            <Button
-              loading={isSaving}
-              onClick={onSave}
-              startIcon={<Check />}
-              size="L"
-              variant="default"
-              className="payment-button payment-button-success"
-            >
-              Save Apple Pay Configuration
-            </Button>
-            <Typography variant="sigma" textColor="neutral600">
-              Note: Apple Pay configuration is used for Apple Pay payment
-              requests. Make sure to configure the correct merchant identifier,
-              supported networks, and capabilities for your region.
-            </Typography>
-          </Flex>
-        </Box>
-      </Flex>
-    </Box>
-  );
-};
-
-export default ApplePayConfigPanel;
+import React, { useState, useEffect } from "react";
+import {
+  Box,
+  Card,
+  CardBody,
+  Flex,
+  Typography,
+  Button,
+} from "@strapi/design-system";
+import { Check } from "@strapi/icons";
+import ApplePayConfig from "./ApplePayConfig";
+
+const ApplePayConfigPanel = ({ settings, onInputChange, isSaving, onSave }) => {
+  const [applePayConfig, setApplePayConfig] = useState(
+    settings?.applePayConfig || {}
+  );
+
+  useEffect(() => {
+    setApplePayConfig(settings?.applePayConfig || {});
+  }, [settings?.applePayConfig]);
+
+  return (
+    <Box
+      className="payment-container"
+      paddingTop={8}
+      paddingBottom={8}
+      paddingLeft={8}
+      paddingRight={8}
+    >
+      <Flex direction="column" alignItems="stretch" gap={8}>
+        <Box>
+          <Card className="payment-card">
+            <CardBody padding={6}>
+              <ApplePayConfig
+                config={applePayConfig}
+                onConfigChange={(newConfig) => {
+                  setApplePayConfig(newConfig);
+                  onInputChange("applePayConfig", newConfig);
+                }}
+                settings={settings}
+              />
+            </CardBody>
+          </Card>
+        </Box>
+
+        <Box paddingTop={4}>
+          <Flex direction="row" gap={4} alignItems="center">
+            <Button
+              loading={isSaving}
+              onClick={onSave}
+              startIcon={<Check />}
+              size="L"
+              variant="default"
+              className="payment-button payment-button-success"
+            >
+              Save Apple Pay Configuration
+            </Button>
+            <Typography variant="sigma" textColor="neutral600">
+              Note: Apple Pay configuration is used for Apple Pay payment
+              requests. Make sure to configure the correct merchant identifier,
+              supported networks, and capabilities for your region.
+            </Typography>
+          </Flex>
+        </Box>
+      </Flex>
+    </Box>
+  );
+};
+
+export default ApplePayConfigPanel;
+