Added amount to partial capture and partial refund payment logs

Author: maciejzgadzaj

modules/log/commerce_log.commerce_log_templates.yml

@@ -31,15 +31,15 @@ payment_authorized_captured:
 payment_partially_captured:
   category: commerce_payment
   label: 'Payment partially captured'
-  template: '<p>Payment <em>{{ payment_remote_id }}</em> was partially captured.</p>'
+  template: '<p>Payment <em>{{ payment_remote_id }}</em> was partially captured ({{ captured_amount }}).</p>'
 payment_captured:
   category: commerce_payment
   label: 'Payment captured'
   template: '<p>Payment <em>{{ payment_remote_id }}</em> was fully captured.</p>'
 payment_partially_refunded:
   category: commerce_payment
   label: 'Payment partially refunded'
-  template: '<p>Payment <em>{{ payment_remote_id }}</em> was partially refunded.</p>'
+  template: '<p>Payment <em>{{ payment_remote_id }}</em> was partially refunded ({{ refunded_amount }}).</p>'
 payment_refunded:
   category: commerce_payment
   label: 'Payment refunded'

modules/log/src/EventSubscriber/PaymentEventSubscriber.php

@@ -167,6 +167,7 @@ public function onPartialCapture(PaymentEvent $event) {
     $payment = $event->getPayment();
     $this->logStorage->generate($payment, 'payment_partially_captured', [
       'payment_remote_id' => $payment->getRemoteId(),
+      'captured_amount' => $event->getAmount(),
     ])->save();
   }
 
@@ -193,6 +194,7 @@ public function onPartialRefund(PaymentEvent $event) {
     $payment = $event->getPayment();
     $this->logStorage->generate($payment, 'payment_partially_refunded', [
       'payment_remote_id' => $payment->getRemoteId(),
+      'refunded_amount' => $event->getAmount(),
     ])->save();
   }
 

modules/payment/src/Event/PaymentEvent.php

@@ -3,6 +3,7 @@
 namespace Drupal\commerce_payment\Event;
 
 use Drupal\commerce_payment\Entity\PaymentInterface;
+use Drupal\commerce_price\Price;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
@@ -19,6 +20,13 @@ class PaymentEvent extends Event {
    */
   protected $payment;
 
+  /**
+   * The payment operation amount.
+   *
+   * @var \Drupal\commerce_price\Price
+   */
+  protected $amount;
+
   /**
    * Constructs a new PaymentEvent.
    *
@@ -29,6 +37,24 @@ public function __construct(PaymentInterface $payment) {
     $this->payment = $payment;
   }
 
+  /**
+   * @param \Drupal\commerce_price\Price $amount
+   *   The payment operation amount.
+   */
+  public function setAmount(Price $amount) {
+    $this->amount = $amount;
+  }
+
+  /**
+   * Gets the payment operation amount.
+   *
+   * @return \Drupal\commerce_price\Price
+   *   The payment operation amount.
+   */
+  public function getAmount() {
+    return $this->amount;
+  }
+
   /**
    * Gets the payment.
    *

modules/payment/src/PluginForm/PaymentCaptureForm.php

@@ -41,6 +41,7 @@ public function submitConfigurationForm(array &$form, FormStateInterface $form_s
 
     /** @var \Drupal\commerce_payment\Event\PaymentEvent $event */
     $event = new PaymentEvent($payment);
+    $event->setAmount($amount);
     /** @var \Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher $event_dispatcher */
     $event_dispatcher = \Drupal::service('event_dispatcher');
     $event_name = ($payment->getOrder()->getTotalPrice()->greaterThan($payment->getAmount())) ? PaymentEvents::PAYMENT_PARTIALLY_CAPTURED : PaymentEvents::PAYMENT_CAPTURED;

modules/payment/src/PluginForm/PaymentRefundForm.php

@@ -55,6 +55,7 @@ public function submitConfigurationForm(array &$form, FormStateInterface $form_s
 
     /** @var \Drupal\commerce_payment\Event\PaymentEvent $event */
     $event = new PaymentEvent($payment);
+    $event->setAmount($amount);
     /** @var \Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher $event_dispatcher */
     $event_dispatcher = \Drupal::service('event_dispatcher');
     $event_name = ($payment->getBalance()->isZero()) ? PaymentEvents::PAYMENT_REFUNDED : PaymentEvents::PAYMENT_PARTIALLY_REFUNDED;