From 04c71dad576cc259550aa162d45d7d44f353c1da Mon Sep 17 00:00:00 2001
From: Vitalij Mik <BlackScorp@users.noreply.github.com>
Date: Thu, 11 Jan 2024 09:50:58 +0100
Subject: [PATCH] MOL-1287: Fix custom fields for payment methods (#680)

Co-authored-by: Vitalij Mik <vitalij.mik@dasistweb.de>
---
 src/Service/PaymentMethodService.php | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/Service/PaymentMethodService.php b/src/Service/PaymentMethodService.php
index afe30336c..eab96efd1 100644
--- a/src/Service/PaymentMethodService.php
+++ b/src/Service/PaymentMethodService.php
@@ -162,10 +162,6 @@ public function addPaymentMethods(array $paymentMethods, Context $context): void
             $technicalName = '';
 
             if ($existingPaymentMethod instanceof PaymentMethodEntity) {
-
-                # extract the existing name
-                $mollieName = $paymentMethod['name'];
-
                 $paymentMethodData = [
                     # ALWAYS ADD THE ID, otherwise upsert would create NEW entries!
                     'id' => $existingPaymentMethod->getId(),
@@ -174,9 +170,6 @@ public function addPaymentMethods(array $paymentMethods, Context $context): void
                     # make sure to repair some fields in here
                     # so that Mollie does always work for our wonderful customers :)
                     'pluginId' => $pluginId,
-                    'customFields' => [
-                        'mollie_payment_method_name' => $mollieName,
-                    ],
                     # ------------------------------------------
                     # unfortunately some fields are required (*sigh)
                     # so we need to provide those with the value of
@@ -191,29 +184,26 @@ public function addPaymentMethods(array $paymentMethods, Context $context): void
             } else {
                 # let's create a full parameter list of everything
                 # that our new payment method needs to have
-
-                $mollieName = $paymentMethod['description'];
-
-
                 $paymentMethodData = [
                     'handlerIdentifier' => $paymentMethod['handler'],
                     'pluginId' => $pluginId,
                     # ------------------------------------------
-                    'name' => $mollieName,
+                    'name' => $paymentMethod['description'],
                     'description' => '',
                     'mediaId' => $mediaId,
                     'afterOrderEnabled' => true,
-                    # ------------------------------------------
-                    'customFields' => [
-                        'mollie_payment_method_name' => $mollieName
-                    ],
                 ];
             }
 
             if (mb_strlen($technicalName) > 0) {
-                $technicalName = self::TECHNICAL_NAME_PREFIX . $mollieName;
+                $technicalName = self::TECHNICAL_NAME_PREFIX .  $paymentMethod['name'];
             }
 
+            # custom field name is required to be specific, because we use it in the template to display components
+            $paymentMethodData['customFields'] = [
+                'mollie_payment_method_name' => $paymentMethod['name']
+            ];
+
             # starting with Shopware 6.5.7.0 this has to be filled out
             # so that you can still save the payment method in the administration
             if ($this->versionCompare->gte('6.5.7.0')) {