Dmytrii Kaiun · Jonathan Sacksick
--- a/modules/payment/src/PluginForm/PaymentMethodAddForm.php
+++ b/modules/payment/src/PluginForm/PaymentMethodAddForm.php
+   * The event dispatcher.
+   */
+  protected EventDispatcherInterface $eventDispatcher;
+
+  /**
+   * The order.
+   */
+  protected ?OrderInterface $order = NULL;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    $instance = parent::create($container);
+    $instance->eventDispatcher = $container->get('event_dispatcher');
+    $instance->order = $container->get('current_route_match')->getParameter('commerce_order');
--- a/modules/payment/src/PluginForm/PaymentMethodAddForm.php
+++ b/modules/payment/src/PluginForm/PaymentMethodAddForm.php
      $payment_gateway_plugin->createPaymentMethod($payment_method, $values['payment_details']);
    }
    catch (DeclineException $e) {
+      if (
+        $this->order instanceof OrderInterface &&
+        $payment_method->getPaymentGateway() instanceof PaymentGatewayInterface
+      ) {
+        $event = new FailedPaymentEvent($this->order, $payment_method->getPaymentGateway(), $e);
+        $this->eventDispatcher->dispatch($event, PaymentEvents::PAYMENT_FAILURE);
--- a/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentProcess.php
+++ b/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentProcess.php
        $this->checkoutFlow->redirectToStep($next_step_id);
      }
      catch (DeclineException $e) {
+        $event = new FailedPaymentEvent($this->order, $payment_gateway, $e, $payment);
+        $this->eventDispatcher->dispatch($event, PaymentEvents::PAYMENT_FAILURE);
--- a/modules/payment/src/Plugin/Commerce/InlineForm/PaymentGatewayForm.php
+++ b/modules/payment/src/Plugin/Commerce/InlineForm/PaymentGatewayForm.php
  public function submitInlineForm(array &$inline_form, FormStateInterface $form_state) {
    parent::submitInlineForm($inline_form, $form_state);

+    $payment_gateway = $this->entity->getPaymentGateway();
+    $order = $this->routeMatch->getParameter('commerce_order');
--- a/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentProcess.php
+++ b/modules/payment/src/Plugin/Commerce/CheckoutPane/PaymentProcess.php
        $this->checkoutFlow->redirectToStep($next_step_id);
      }
      catch (PaymentGatewayException $e) {
+        $event = new FailedPaymentEvent($this->order, $payment_gateway, $e, $payment);
--- a/modules/log/src/EventSubscriber/PaymentEventSubscriber.php
+++ b/modules/log/src/EventSubscriber/PaymentEventSubscriber.php
    ])->save();
  }

+  /**
+   * Creates a log when payment failed.
+   *
+   * @param \Drupal\commerce_payment\Event\FailedPaymentEvent $event
+   *   The failed payment event.
+   */
+  public function onPaymentFailure(FailedPaymentEvent $event): void {
+    $this->logStorage->generate($event->getOrder(), 'payment_failed', [
+      'error_message' => $event->getGatewayException()->getMessage(),
+      'gateway' => $event->getPaymentGateway()->label(),
+      'amount' => $event->getPayment()?->getBalance(),
+    ])->save();
-    $this->logStorage->generate($event->getOrder(), 'payment_failed', [
-      'error_message' => $event->getGatewayException()->getMessage(),
-      'gateway' => $event->getPaymentGateway()->label(),
-      'amount' => $event->getPayment()?->getBalance(),
-    ])->save();
+    $this->logStorage->generate($event->getOrder(), 'payment_failed', [
+      'id' => $payment->id(),
+      'remote_id' => $payment->getRemoteId(),
+      'method' => $payment->getPaymentMethod()?->label(),
+      'error_message' => $event->getGatewayException()->getMessage(),
+      'gateway' => $event->getPaymentGateway()->label(),
+      'amount' => $event->getPayment()?->getBalance(),
+    ])->save();
--- a/modules/payment/src/Event/FailedPaymentEvent.php 0 → 100644
+++ b/modules/payment/src/Event/FailedPaymentEvent.php 0 → 100644
+   * Constructs a new FailedPaymentEvent.
+   *
+   * @param \Drupal\commerce_order\Entity\OrderInterface $order
+   *   The order entity.
+   * @param \Drupal\commerce_payment\Entity\PaymentGatewayInterface $paymentGateway
+   *   The payment gateway.
+   * @param \Drupal\commerce_payment\Exception\PaymentGatewayException $gatewayException
+   *   The payment gateway exception.
+   * @param \Drupal\commerce_payment\Entity\PaymentInterface|null $payment
+   *   The payment.
+   */
+  public function __construct(
+    protected OrderInterface $order,
+    protected PaymentGatewayInterface $paymentGateway,
+    protected PaymentGatewayException $gatewayException,
+    protected ?PaymentInterface $payment = NULL
--- a/modules/payment/src/PluginForm/PaymentMethodEditForm.php
+++ b/modules/payment/src/PluginForm/PaymentMethodEditForm.php
      $payment_method->save();
    }
    catch (DeclineException $e) {
+      if (
+        $this->order instanceof OrderInterface &&
+        $payment_method->getPaymentGateway() instanceof PaymentGatewayInterface
+      ) {
+        $event = new FailedPaymentEvent($this->order, $payment_method->getPaymentGateway(), $e);
+        $this->eventDispatcher->dispatch($event, PaymentEvents::PAYMENT_FAILURE);