PAYOSWXP-158: Remove 'v2' from name and description and add it to 'di…

…stinguishableName' via subscriber

src/DependencyInjection/listeners.xml

@@ -74,6 +74,10 @@
             <tag name="kernel.event_subscriber"/>
         </service>
 
+        <service id="PayonePayment\EventListener\PaymentDistinguishableNameEventListener">
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
         <service id="PayonePayment\EventListener\PayPalV2ExpressEventListener">
             <argument key="$activePaymentMethodsLoader" type="service" id="PayonePayment\Components\Helper\ActivePaymentMethodsLoaderInterface"/>
             <argument key="$configReader" type="service" id="PayonePayment\Components\ConfigReader\ConfigReaderInterface"/>

src/EventListener/PaymentDistinguishableNameEventListener.php

@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace PayonePayment\EventListener;
+
+use PayonePayment\PaymentMethod\PayonePaypalV2;
+use PayonePayment\PaymentMethod\PayonePaypalV2Express;
+use Shopware\Core\Checkout\Payment\PaymentEvents;
+use Shopware\Core\Checkout\Payment\PaymentMethodEntity;
+use Shopware\Core\Framework\DataAbstractionLayer\Event\EntityLoadedEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class PaymentDistinguishableNameEventListener implements EventSubscriberInterface
+{
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            PaymentEvents::PAYMENT_METHOD_LOADED_EVENT => 'updateDistinguishablePaymentNameForPayPalV2',
+        ];
+    }
+
+    public function updateDistinguishablePaymentNameForPayPalV2(EntityLoadedEvent $event): void
+    {
+        /** @var PaymentMethodEntity $payment */
+        foreach ($event->getEntities() as $payment) {
+            // Technical name is nullable <6.7.0
+            $technicalName = $payment->getTechnicalName() ?? '';
+
+            if (in_array($technicalName, [PayonePaypalV2::TECHNICAL_NAME, PayonePaypalV2Express::TECHNICAL_NAME], true)) {
+                $distinguishableName = str_replace('PayPal', 'PayPal v2', $payment->getTranslation('distinguishableName'));
+                $payment->setDistinguishableName($distinguishableName);
+                $payment->addTranslated('distinguishableName', $distinguishableName);
+            }
+        }
+    }
+}

src/PaymentMethod/PayonePaypalV2.php

@@ -15,22 +15,22 @@ class PayonePaypalV2 extends AbstractPaymentMethod
 
     protected string $id = self::UUID;
 
-    protected string $name = 'PAYONE PayPal v2';
+    protected string $name = 'PAYONE PayPal';
 
-    protected string $description = 'Pay easily and secure with PayPal v2.';
+    protected string $description = 'Pay easily and secure with PayPal.';
 
     protected string $paymentHandler = PayonePaypalV2PaymentHandler::class;
 
     protected ?string $template = null;
 
     protected array $translations = [
         'de-DE' => [
-            'name' => 'PAYONE PayPal v2',
-            'description' => 'Zahlen Sie sicher und bequem mit PayPal v2.',
+            'name' => 'PAYONE PayPal',
+            'description' => 'Zahlen Sie sicher und bequem mit PayPal.',
         ],
         'en-GB' => [
-            'name' => 'PAYONE PayPal v2',
-            'description' => 'Pay easily and secure with PayPal v2.',
+            'name' => 'PAYONE PayPal',
+            'description' => 'Pay easily and secure with PayPal.',
         ],
     ];
 

src/PaymentMethod/PayonePaypalV2Express.php

@@ -15,22 +15,22 @@ class PayonePaypalV2Express extends AbstractPaymentMethod
 
     protected string $id = self::UUID;
 
-    protected string $name = 'PAYONE Paypal Express v2';
+    protected string $name = 'PAYONE Paypal Express';
 
-    protected string $description = 'Pay easily and secure with PayPal Express v2.';
+    protected string $description = 'Pay easily and secure with PayPal Express.';
 
     protected string $paymentHandler = PayonePaypalV2ExpressPaymentHandler::class;
 
     protected ?string $template = null;
 
     protected array $translations = [
         'de-DE' => [
-            'name' => 'PAYONE PayPal Express v2',
-            'description' => 'Zahlen Sie sicher und bequem mit PayPal Express v2.',
+            'name' => 'PAYONE PayPal Express',
+            'description' => 'Zahlen Sie sicher und bequem mit PayPal Express.',
         ],
         'en-GB' => [
-            'name' => 'PAYONE PayPal Express v2',
-            'description' => 'Pay easily and secure with PayPal Express v2.',
+            'name' => 'PAYONE PayPal Express',
+            'description' => 'Pay easily and secure with PayPal Express.',
         ],
     ];