Skip to content

SL-355: add Capture option to 3D Secure failure behavior setting - #317

Merged
justelis22 merged 37 commits into
SL-353/fields-settings-licencefrom
SL-355/payment-capture-3ds
Jul 9, 2026
Merged

SL-355: add Capture option to 3D Secure failure behavior setting#317
justelis22 merged 37 commits into
SL-353/fields-settings-licencefrom
SL-355/payment-capture-3ds

Conversation

@GytisZum

Copy link
Copy Markdown
Collaborator

Self-Checks

  • I have performed a self-review of my code.
  • I have updated/added necessary technical documentation in the README file.

JIRA task link

Summary

QA Checklist Labels

  • Bug fix?
  • New feature?
  • Improvement?
  • Technical debt?
  • Reusable?
  • Covered by tests?

QA Checklist

Additional Context

Frontend Changes

@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request enhances the payment module by providing merchants with more granular control over how transactions are handled when 3D Secure authentication fails. Previously, the only explicit option was to cancel the order. With this change, a new "Capture" option is introduced, allowing the system to attempt to capture the payment even without a liability shift, providing greater flexibility in payment processing workflows.

Highlights

  • New 3D Secure Failure Behavior: Introduced a new 'Capture' option for handling payments where 3D Secure authentication fails and liability shift is not granted, providing more flexibility in payment processing.
  • Conditional Payment Processing Logic: Updated payment processing logic in both the notification and return controllers to conditionally capture or cancel orders based on the newly configured 3D Secure failure behavior.
  • Configuration and UI Updates: Added a new constant in SaferPayConfig.php for the 'Capture' behavior, updated relevant translations, and integrated the new option into the admin settings user interface.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog
  • controllers/front/notify.php
    • Refactored the 3D Secure failure handling logic to support multiple behaviors (cancel, capture).
    • Added logic to capture an order if PAYMENT_BEHAVIOR_WITHOUT_3D_CAPTURE is configured and the transaction is not already captured.
    • Updated debug logs to reflect the new behaviors.
  • controllers/front/return.php
    • Modified the createAndValidateOrder method to incorporate the new PAYMENT_BEHAVIOR_WITHOUT_3D_CAPTURE option for 3D Secure failure scenarios.
    • Introduced conditional logic to either cancel or capture the order based on the configured behavior.
  • src/Config/SaferPayConfig.php
    • Added a new constant PAYMENT_BEHAVIOR_WITHOUT_3D_CAPTURE with a value of 2.
    • Changed the default value for PAYMENT_BEHAVIOR_WITHOUT_3D from 1 (Authorize) to 0 (Cancel).
  • src/Service/SettingsTranslationService.php
    • Updated the translation for behaviourWhen3dsFails to be more descriptive.
    • Added a new translation key captureWithout3ds for the new capture option.
  • views/js/admin/settings-app/src/components/settings/payment-processing.tsx
    • Added a new radio button option for "Capture" under the "Behavior when 3D Secure fails" setting, allowing administrators to select this new behavior.
Activity
  • No human activity (comments, reviews, etc.) has been recorded for this pull request yet.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request adds a 'Capture' option for the 3D Secure failure behavior setting. The changes are implemented across the backend and frontend, including new configuration options, translation strings, and UI elements. The core logic in the notify and return controllers has been updated to handle this new behavior. My main feedback is regarding code duplication between these two controllers, which could be refactored to improve maintainability.

Comment on lines 145 to 173
if (!$assertResponseBody->getLiability()->getLiabilityShift() &&
in_array($order->payment, SaferPayConfig::SUPPORTED_3DS_PAYMENT_METHODS) &&
(int) Configuration::get(SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D) === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_CANCEL
in_array($order->payment, SaferPayConfig::SUPPORTED_3DS_PAYMENT_METHODS)
) {
/** @var SaferPayOrderStatusService $orderStatusService */
$orderStatusService = $this->module->getService(SaferPayOrderStatusService::class);
$orderStatusService->cancel($order);

$logger->debug(sprintf('%s - Liability shift is false', self::FILE_NAME), [
'context' => [
'id_order' => $order->id,
],
]);

$logger->debug(sprintf('%s - liability shift is false', self::FILE_NAME), [
'context' => [
'id_order' => $order->id,
],
]);

die($this->module->l('Liability shift is false', self::FILE_NAME));
if ($paymentBehaviorWithout3D === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_CANCEL) {
$orderStatusService->cancel($order);

$logger->debug(sprintf('%s - Liability shift is false, canceling order', self::FILE_NAME), [
'context' => [
'id_order' => $order->id,
],
]);

die($this->module->l('Liability shift is false', self::FILE_NAME));
} elseif ($paymentBehaviorWithout3D === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_CAPTURE
&& SaferPayConfig::supportsOrderCapture($order->payment)
&& $transactionStatus !== TransactionStatus::CAPTURED
) {
$orderStatusService->capture($order);

$logger->debug(sprintf('%s - Liability shift is false, capturing order', self::FILE_NAME), [
'context' => [
'id_order' => $order->id,
],
]);
}
}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This block of logic for handling failed liability shift is nearly identical to the code in controllers/front/return.php on lines 334-350. This code duplication can lead to maintenance issues, where a change in one place might be forgotten in the other.

To improve maintainability, I recommend extracting this logic into a shared method. Since both SaferPayOfficialNotifyModuleFrontController and SaferPayOfficialReturnModuleFrontController extend AbstractSaferPayController, you could add a protected method to the base class to encapsulate this shared logic.

This refactoring would also be a good opportunity to improve the readability of the long elseif condition by breaking it down into smaller, well-named boolean variables.

Gytautas Zumaras and others added 26 commits March 17, 2026 10:23
Adds discernible accessible names to interactive controls that
were unlabelled at narrow viewports, resolving 33 of the 36 axe-core
violations found during SL-346 QA.

- Payment Methods mobile cards: add aria-label to "Logos" and
  "Custom form" switches (28 violations). Desktop layout was already
  labelled; only the md:sp-hidden mobile block was missing labels.
- Settings tab triggers: add aria-label to all five TabsTrigger
  buttons (5 violations). Visible text labels are wrapped in
  sp-hidden sm:sp-inline so on mobile only the icon shows; without
  aria-label the buttons had no accessible name.
- Darken --sp-muted-foreground from 46% to 38% lightness (4.31:1 -> ~6.4:1)
- Replace sp-text-emerald-600 with sp-text-emerald-700 in API Credentials
  (3.76:1 -> 5.27:1 on white, 3.57:1 -> ~5:1 on emerald-50)

Resolves 3 axe-core color-contrast violations across all 5 settings tabs.
Verified: 0 contrast issues remain inside #saferpay-settings-root.
Radix Label component does not auto-wire to SelectTrigger; without
an explicit aria-label, screen readers announced only the selected
value. Resolves last open finding in TC-346.1.
Previously Tab could escape the modal into background page content
violating WCAG 2.1.2 (Focus Order) for modal dialogs. Tab/Shift+Tab
now cycle within the modal's focusable elements.

Resolves TC-346.7.
PrestaShop core .btn-primary teal (#25b9d7) on white was 2.6:1 — fails
WCAG 2.1 AA (requires 4.5:1). Scoped override on #saferpay-admin-form
only, so other admin pages keep their PS theme. Refund/Capture buttons
now use the module brand teal #1c7c80 (5.27:1).
Without scope, screen readers cannot reliably associate header cells
with their data column. Resolves TC-346.10 (FO saved credit cards).
The PS Classic theme rendered the Remove link in teal #24b9d7 on white
(2.6:1) which fails WCAG 2.1 AA. Use brand teal #1c7c80 (5.27:1) via
inline color so the override does not bleed to other theme buttons.
The .btn-primary (BO admin order) and .btn-default (FO saved cards)
contrast issues originate in PrestaShop core/theme CSS, not in our
module. Overriding them at module level was the wrong layer:
- fragile against theme updates
- could clash with merchant theme customizations
- inconsistent with our decision to scope SL-346 to module-owned UI

These now match the same out-of-scope category as the BO breadcrumb,
help button, and submenu tabs. Module-owned a11y fixes (React Settings
app contrast, aria-labels, scope=col, focus trap, etc.) remain in PR.
- Disable Save Changes button when username/password empty, credential
  check is in flight, or inline credential error is shown
- Mark JSON API Username and Password as required (visual asterisk +
  aria-required) to surface the requirement before user clicks Save
The Saferpay Fields section was driven by a single hasBusinessLicense
flag derived from the active environment's stored license at page load.
Switching environments client-side did not re-evaluate it, so the
section stayed visible after switching to an environment with no
validated business license.

Expose testHasBusinessLicense and liveHasBusinessLicense separately
from the controller (initial payload and save response), and pick the
active one in api-credentials.tsx based on testMode.
When the Saferpay Management API license lookup fails during credentials
save, the previous flow showed a misleading green success toast that
asked merchants to verify credentials they had just successfully validated.

- Log the underlying error to the SaferPay module Logs tab via LoggerInterface
- Return a 'warning' flag in the save credentials response
- Render an amber warning toast with a clearer message that points to the Logs
…ntials

Disable Save Changes when API credentials empty or invalid
…nse-visibility

Fix Saferpay Fields visibility per active environment license
…toast

Log license fetch failures and surface honest warning toast on save
The polling script in saferpay_wait.tpl navigated the iframe itself via
window.location.href, leaving the parent window stuck on the SaferPay
iframe controller URL while the cart or order-confirmation page rendered
nested inside the iframe.

Use window.top so the redirect targets the parent window and the user
lands at /cart or /order-confirmation with the proper top-level chrome.
Address review feedback on PR #325:
- Use location.replace() so the polling page is not stored in history
  (Back from order-confirmation should not return to the spinner).
- Wrap window.top access in try/catch with an in-iframe fallback in
  case sandboxing or browser policy blocks the breakout.
…rictions-default

BUGFIX: payment methods default to all countries/currencies and dropdowns show All instead of 0
fix: break out of SaferPay iframe on payment status redirect
BUGFIX: redirect customer to cart instead of order history after Saferpay transaction abort
TLabutis and others added 9 commits May 15, 2026 15:25
…le-info

BUGFIX: clarify Hosted field style info banner to mention Custom form requirement
Frontend (api-credentials.tsx): show inline error and disable Save when
any comma-separated entry fails an email regex.

Backend (AdminSaferPayOfficialSettingsController): reject save when
testMerchantEmails or liveMerchantEmails contains a value that fails
Validate::isEmail() — guards against curl/devtools bypass.
BUGFIX: validate Merchant Emails field on save
When 'Behavior when 3D Secure Payer Authentication was not successful'
was set to Authorize, the order was still being captured because the
AUTHORIZE branch was missing and the CANCEL branch did not return early,
so control fell through to the default-payment-behavior Capture block.

Each 3DS-fail branch now returns/dies explicitly, so the configured
3DS-fail behavior is always honored.
isValidResponse() already logs API errors before throwing
SaferPayApiException, so the surrounding catch in get(),
getWithCredentials(), and postWithCredentials() produced a redundant
error row for every failed call. Guard the catch-block logger->error
with if ($response === null) so it only fires on transport-level
failures, where isValidResponse() never ran.
…6/accessibility-eaa-compliance

# Conflicts:
#	controllers/admin/AdminSaferPayOfficialSettingsController.php
…ance

SL-346: add accessibility improvements for EAA compliance
SL-358: add ConfigSet field validation, move hosted field style to general settings
…cription

SL-356: add Order reference on payment page toggle to control Descripton
@justelis22
justelis22 merged commit 84f1437 into SL-353/fields-settings-licence Jul 9, 2026
1 of 3 checks passed
@justelis22
justelis22 deleted the SL-355/payment-capture-3ds branch July 9, 2026 06:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants