Resolve #3115858 "Merge with 3456047"
1 unresolved thread
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -6,6 +6,9 @@ use Drupal\commerce_order\Entity\OrderInterface;
@@ -6,6 +6,9 @@ use Drupal\commerce_order\Entity\OrderInterface;
@@ -32,12 +35,12 @@ use Symfony\Component\HttpFoundation\Response;
@@ -32,12 +35,12 @@ use Symfony\Component\HttpFoundation\Response;
@@ -55,10 +58,20 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -55,10 +58,20 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -128,6 +141,7 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -128,6 +141,7 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -201,24 +215,30 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -201,24 +215,30 @@ class Saferpay extends OffsitePaymentGatewayBase {
'#description' => $this->t('To be able to use this setting, Saferpay support must set this up for the configured account. <strong>Note</strong>: This will request an alias and make it available to third party code, but it will not create reusable payments yet.'),
@@ -248,6 +268,7 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -248,6 +268,7 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -257,20 +278,42 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -257,20 +278,42 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -301,9 +344,85 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -301,9 +344,85 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -339,48 +458,53 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -339,48 +458,53 @@ class Saferpay extends OffsitePaymentGatewayBase {
$this->logger->notice('Payment asserting for order %order_id failed. Saferpay status was %status. Saferpay transaction id was %transaction_id.', [
\Drupal::moduleHandler()->invokeAll('commerce_saferpay_assert_result', [$assert_result, $order, $payment]);
@@ -405,7 +529,8 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -405,7 +529,8 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -413,17 +538,24 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -413,17 +538,24 @@ class Saferpay extends OffsitePaymentGatewayBase {
'OrderId' => $this->token->replace($this->configuration['order_identifier'], ['commerce_order' => $order]),
'Description' => $this->token->replace($this->configuration['order_description'], ['commerce_order' => $order]),
'NotifyUrl' => Url::fromRoute('commerce_payment.notify', ['commerce_payment_gateway' => $this->parentEntity->id()], [
@@ -441,10 +573,11 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -441,10 +573,11 @@ class Saferpay extends OffsitePaymentGatewayBase {
$this->logger->info('PaymentPage initialized. Request id (order uuid): %request_id. Token: %token. Expires: %expires.', [
@@ -479,17 +612,17 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -479,17 +612,17 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -506,6 +639,102 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -506,6 +639,102 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -542,15 +771,6 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -542,15 +771,6 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -627,6 +847,34 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -627,6 +847,34 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -668,11 +916,13 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -668,11 +916,13 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -680,20 +930,22 @@ class Saferpay extends OffsitePaymentGatewayBase {
@@ -680,20 +930,22 @@ class Saferpay extends OffsitePaymentGatewayBase {
\ No newline at end of file