Rc_v2.2.16 by bartoszkaluzny-solteq · Pull Request #120 · paytrail/paytrail-for-adobe-commerce

bartoszkaluzny-solteq · 2026-03-24T09:52:17Z

No description provided.

Sync Solteq:staging <-> paytrail:master

SQMAGOPC-658: Apple screen reader issues with current module

…ge in MFTF tests

SQMAGOPC-618 Fix mftf tests

* mftf-automation: Add GitHub Actions workflow to run MFTF tests for Paytrail module

* mftf-automation: Remove obsolete Paytrail configuration and currency reset steps from MFTF test files

…figuration

…t the hour

SQMAGOPC-658: fix screen reader for selected elements

SQMAGOPC-668: Receipt controller improvement

Sync paytrail:master <-> Solteq:staging

SQMAGOPC-672: Partial refund issue investigation and fix

Sync v2.2.12 <-> Solteq:staging

SQMAGOPC-674: investigate issue 116 in github

SQMAGOPC-675: add 'klarna' to the flag list for manual invoice

SQMAGOPC-675

SQMAGOPC-646: Unable to add card

# Conflicts: # composer.json # etc/module.xml

SQMAGOPC-678: Check issue with recurring_payment_schedule on admin panel

SQMAGOPC-677: Module needs support for cancelling Klarna payments that are using ManualInvoiceActivation

Copilot

Pull request overview

Bumps the Paytrail_PaymentService module to v2.2.16 and introduces a new gateway command + observer flow to cancel Klarna invoices when an order is cancelled, along with an admin dropdown change for recurring payment selection.

Changes:

Bump module/composer version to 2.2.16 and document changes in the changelog.
Add an order_cancel_after observer to trigger a new invoice_cancellation gateway command for Klarna.
Change the “No recurring payment” admin option to an empty option in the recurring payment schedule attribute source.

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
etc/module.xml	Module setup_version bump to 2.2.16.
composer.json	Package version bump to 2.2.16.
CHANGELOG.md	Adds 2.2.16 release notes.
etc/events.xml	Registers a new observer for order cancellation.
etc/di.xml	Adds `invoice_cancellation` command wiring and additional virtual types.
Observer/OrderInvoiceCancellation.php	New observer that executes invoice cancellation on order cancel.
Gateway/Command/InvoiceCancellation.php	New command implementation for invoice cancellation.
Gateway/Http/Client/InvoiceCancellation.php	New HTTP client wrapper calling the Paytrail SDK cancelInvoice.
Gateway/Request/InvoiceCancellationDataBuilder.php	Builds the request payload for invoice cancellation.
Gateway/Response/InvoiceCancellationHandler.php	Response handler for invoice cancellation command.
Model/Attribute/SelectData.php	Adjusts recurring payment schedule select options.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-24T09:57:02Z

                }
            }
-            $this->_options[] = ['label' => __('No recurring payment'), 'value' => self::NO_RECURRING_PAYMENT_VALUE];
+            $this->_options[] = ['label' => __(' '), 'value' => ''];


The added option uses an empty-string value ('') even though the attribute is defined as type => int (see the data patch) and the default is SelectData::NO_RECURRING_PAYMENT_VALUE (null). Saving an empty string for an int EAV attribute may coerce to 0 / not match the configured default and can break downstream logic. Consider keeping the value as null (or another consistent sentinel) and only adjusting the label/display text if you want the admin UI to appear blank.

Suggested change

$this->_options[] = ['label' => __(' '), 'value' => ''];

$this->_options[] = ['label' => __(' '), 'value' => self::NO_RECURRING_PAYMENT_VALUE];

Copilot · 2026-03-24T09:57:03Z

+            $order = $observer->getEvent()->getOrder();
+            $paymentMethod = $order
+                ->getPayment()
+                ->getAdditionalInformation()[OrderPaymentMethodData::SELECTED_PAYMENT_METHOD_CODE];
+
+            if ($order->getState() === Order::STATE_CANCELED && $paymentMethod === 'klarna') {


This observer runs on every order cancellation, but it immediately reads Paytrail-specific additionalInformation via array indexing. For non-Paytrail orders (or Paytrail orders missing this key), this can throw and flood logs, preventing the cancellation flow from running. Guard by first checking the payment method code (e.g., Paytrail config code) and fetch the selected method via getAdditionalInformation($key) with an empty/null fallback.

Copilot · 2026-03-24T09:57:03Z

+                            'Invoice cancellation successfully with message: %message',
+                            ['message' => $this->getResponseMessage($response['data']->getHttpStatusCode())]


The translated phrase uses a %message placeholder, but the rest of the module uses Magento's positional placeholders (e.g. %1, %2). As written, the output may literally include %message. Use the standard placeholder style so the rendered order comment shows the resolved message correctly.

Suggested change

'Invoice cancellation successfully with message: %message',

['message' => $this->getResponseMessage($response['data']->getHttpStatusCode())]

'Invoice cancellation successfully with message: %1',

$this->getResponseMessage($response['data']->getHttpStatusCode())

Copilot · 2026-03-24T09:57:03Z

+                        $order->getPayment()->getTransactionId(),
+                        __(
+                            'Invoice cancellation successfully with message: %message',
+                            ['message' => $this->getResponseMessage($response['data']->getHttpStatusCode())]


$response['data'] is dereferenced (->getHttpStatusCode()) without verifying it is present/object. In the gateway client, there are execution paths where error can be null while data is still null (e.g., caught RequestException without a response), which would cause a fatal error here. Add a check that data is non-null and supports getHttpStatusCode() (or treat missing data as an error).

Copilot · 2026-03-24T09:57:04Z

+    <virtualType name="PaytrailInvoiceCancellationCommandManager" type="Magento\Payment\Gateway\Command\CommandManager">
+        <arguments>
+            <argument name="commandPool" xsi:type="object">PaytrailInvoiceCancellationCommandPool</argument>
+        </arguments>


PaytrailInvoiceCancellationCommandManager references PaytrailInvoiceCancellationCommandPool, but that pool is not defined anywhere in the module (search only finds this reference). Either define the missing virtualType/type for the pool or remove this unused CommandManager virtualType to avoid DI configuration that can break when compiled/instantiated.

@bartoszkaluzny-solteq this is a really valid comment. we have only <virtualType name="PaytrailCommandPool" type="Magento\Payment\Gateway\Command\CommandPool"> defined, so it works but not using this command pool, please validate the code

konrad-konieczny

check not used and non existing command pool

konrad-konieczny · 2026-03-24T11:08:56Z

+    <virtualType name="PaytrailInvoiceCancellationCommandManager" type="Magento\Payment\Gateway\Command\CommandManager">
+        <arguments>
+            <argument name="commandPool" xsi:type="object">PaytrailInvoiceCancellationCommandPool</argument>
+        </arguments>


@bartoszkaluzny-solteq this is a really valid comment. we have only <virtualType name="PaytrailCommandPool" type="Magento\Payment\Gateway\Command\CommandPool"> defined, so it works but not using this command pool, please validate the code

bartoszkaluzny-solteq and others added 30 commits August 29, 2025 13:54

Merge pull request #326 from paytrail/master

b6aab12

Sync Solteq:staging <-> paytrail:master

Merge pull request #325 from Solteq/SQMAGOPC-658

cf7b1d2

SQMAGOPC-658: Apple screen reader issues with current module

SQMAGOPC-618-2025: Disable checkout agreements and admin form key usa…

82dc334

…ge in MFTF tests

Merge pull request #327 from Solteq/SQMAGOPC-618-2025

5223fbe

SQMAGOPC-618 Fix mftf tests

mftf-automation (#328)

b452274

* mftf-automation: Add GitHub Actions workflow to run MFTF tests for Paytrail module

mftf-automation (#329)

7de704b

* mftf-automation: Remove obsolete Paytrail configuration and currency reset steps from MFTF test files

staging: Add workflow_dispatch trigger for MFTF tests in Paytrail con…

0233b64

…figuration

staging: Update MFTF workflow to include scheduled cron job

56cd00f

staging: Update cron schedule for MFTF tests to run at 20 minutes pas…

2b0ccf1

…t the hour

staging:

b72f323

Merge pull request #331 from Solteq/SQMAGOPC-658

287feb9

SQMAGOPC-658: fix screen reader for selected elements

Merge pull request #332 from Solteq/SQMAGOPC-668

3fb0e4e

SQMAGOPC-668: Receipt controller improvement

Merge pull request #333 from Solteq/RC_v2.2.12

013938e

Sync paytrail:master <-> Solteq:staging

SQMAGOPC: add code-validation

139f319

SQMAGOPC: update composer.json

0f5ca32

Merge pull request #334 from Solteq/SQMAGOPC-672

0d49771

SQMAGOPC-672: Partial refund issue investigation and fix

SQMAGOPC: revert v2.2.12 from staging

49c5d27

Merge branch 'staging' into RC_v2.2.12

87788c7

Merge pull request #336 from Solteq/RC_v2.2.12

e61a0d1

Sync v2.2.12 <-> Solteq:staging

Merge pull request #337 from Solteq/SQMAGOPC-674

49478e3

SQMAGOPC-674: investigate issue 116 in github

Merge pull request #338 from Solteq/SQMAGOPC-675

d7217b4

SQMAGOPC-675: add 'klarna' to the flag list for manual invoice

Merge pull request #339 from Solteq/SQMAGOPC-675

bae5dc5

SQMAGOPC-675

Merge pull request #340 from Solteq/SQMAGOPC-646

2c011b2

SQMAGOPC-646: Unable to add card

Merge branch 'upstream_master' into staging

9c92ed2

# Conflicts: # composer.json # etc/module.xml

SQMAGOPC-678: fix deprecated functionality

f70ef28

SQMAGOPC-678: fix deprecated string parsing

b9cec49

SQMAGOPC-678: fix code-validation comments

fba3bb9

SQMAGOPC-677: create observer for order cancellation event

bcf396c

SQMAGOPC-677: create gatewayCommand for invoice cancellation

970de5a

SQMAGOPC-677: fix PHPDoc comment

981be26

bartoszkaluzny-solteq and others added 8 commits March 18, 2026 10:28

SQMAGOPC-677: add validation for klarna payment method only

b1b0f25

SQMAGOPC-677: fix code validation comments

16da2f8

Merge pull request #342 from Solteq/SQMAGOPC-678

0b6ee85

SQMAGOPC-678: Check issue with recurring_payment_schedule on admin panel

Merge pull request #343 from Solteq/SQMAGOPC-677

41b2ba8

SQMAGOPC-677: Module needs support for cancelling Klarna payments that are using ManualInvoiceActivation

SQMAGOPC-677: improve observer

3049f63

Merge pull request #344 from Solteq/SQMAGOPC-677

964cf5f

SQMAGOPC-677: Module needs support for cancelling Klarna payments that are using ManualInvoiceActivation

Merge branch 'SQMAGOPC-677' into RC_v2.2.16

eb45a8c

SQMAGOPC: update versions to 2.2.16

1ca7259

bartoszkaluzny-solteq requested review from Copilot, konrad-konieczny and kotivuori March 24, 2026 09:52

Copilot started reviewing on behalf of bartoszkaluzny-solteq March 24, 2026 09:52 View session

Copilot AI reviewed Mar 24, 2026

View reviewed changes

konrad-konieczny suggested changes Mar 24, 2026

View reviewed changes

bartoszkaluzny-solteq added 2 commits March 26, 2026 09:22

SQMAGOPC-679: remove unnecessary DI configuration

01f6ced

Merge branch 'SQMAGOPC-679' into RC_v2.2.16

7a419c1

bartoszkaluzny-solteq closed this Apr 7, 2026

bartoszkaluzny-solteq deleted the RC_v2.2.16 branch April 7, 2026 06:06

Navigation Menu

Uh oh!

Rc_v2.2.16 - #120

Rc_v2.2.16#120
bartoszkaluzny-solteq wants to merge 40 commits into
paytrail:masterfrom
Solteq:RC_v2.2.16

bartoszkaluzny-solteq commented Mar 24, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Mar 24, 2026

Uh oh!

Copilot AI Mar 24, 2026

Uh oh!

Copilot AI Mar 24, 2026

Uh oh!

Copilot AI Mar 24, 2026

Uh oh!

Copilot AI Mar 24, 2026

Uh oh!

konrad-konieczny Mar 24, 2026

Uh oh!

konrad-konieczny left a comment

Uh oh!

konrad-konieczny Mar 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	$this->_options[] = ['label' => __(' '), 'value' => ''];
	$this->_options[] = ['label' => __(' '), 'value' => self::NO_RECURRING_PAYMENT_VALUE];

		'Invoice cancellation successfully with message: %message',
		['message' => $this->getResponseMessage($response['data']->getHttpStatusCode())]

Uh oh!

Conversation

bartoszkaluzny-solteq commented Mar 24, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

konrad-konieczny Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

konrad-konieczny left a comment

Choose a reason for hiding this comment

Uh oh!

konrad-konieczny Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants