PAYOSWXP-138: saving customer information: add switch to enable/disable

+ move saving to separate class to prevent saving during other request-builder calls + add saving of phonenumber into customer-address (prev. it was only saved into order-address)
PAYONE-GmbH · Apr 29, 2024 · 12702c6 · 12702c6
1 parent c66db9a
commit 12702c6
Show file tree

Hide file tree

Showing 27 changed files with 210 additions and 107 deletions.
diff --git a/src/Components/CustomerDataPersistor/CustomerDataPersistor.php b/src/Components/CustomerDataPersistor/CustomerDataPersistor.php
@@ -0,0 +1,125 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PayonePayment\Components\CustomerDataPersistor;
+
+use PayonePayment\RequestConstants;
+use Shopware\Core\Checkout\Customer\Aggregate\CustomerAddress\CustomerAddressEntity;
+use Shopware\Core\Checkout\Customer\CustomerEntity;
+use Shopware\Core\Checkout\Order\OrderEntity;
+use Shopware\Core\Framework\Context;
+use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
+use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
+use Shopware\Core\Framework\Validation\DataBag\RequestDataBag;
+use Shopware\Core\System\SystemConfig\SystemConfigService;
+
+class CustomerDataPersistor
+{
+    public function __construct(
+        private readonly EntityRepository $orderAddressRepository,
+        private readonly EntityRepository $customerRepository,
+        private readonly EntityRepository $customerAddressRepository,
+        private readonly SystemConfigService $configService
+    ) {
+    }
+
+    public function save(OrderEntity $order, RequestDataBag $dataBag, Context $context): void
+    {
+        $this->saveOrderData($order, $dataBag, $context);
+
+        if ($this->configService->getBool('PayonePayment.settings.saveUserEnteredDataToCustomer')) {
+            $customer = $this->getCustomer($order, $context);
+            if ($customer instanceof CustomerEntity) {
+                $this->saveCustomerData($customer, $dataBag, $context);
+                $customerAddress = $this->getCustomerAddress($customer, $context);
+                if ($customerAddress instanceof CustomerAddressEntity) {
+                    $this->saveCustomerAddressData($customerAddress, $dataBag, $context);
+                }
+            }
+        }
+    }
+
+    protected function saveCustomerData(CustomerEntity $customer, RequestDataBag $dataBag, Context $context): void
+    {
+        $birthday = $dataBag->get(RequestConstants::BIRTHDAY);
+        $birthday = \is_string($birthday) ? \DateTime::createFromFormat('Y-m-d', $birthday) ?: null : null;
+
+        if ($birthday instanceof \DateTime && $birthday->getTimestamp() !== $customer->getBirthday()?->getTimestamp()) {
+            $this->customerRepository->update(
+                [
+                    [
+                        'id' => $customer->getId(),
+                        'birthday' => $birthday,
+                    ],
+                ],
+                $context
+            );
+        }
+    }
+
+    protected function saveCustomerAddressData(CustomerAddressEntity $customerAddress, RequestDataBag $dataBag, Context $context): void
+    {
+        $phoneNumber = $dataBag->get(RequestConstants::PHONE);
+
+        if ($phoneNumber !== $customerAddress->getPhoneNumber()) {
+            $this->customerAddressRepository->update(
+                [
+                    [
+                        'id' => $customerAddress->getId(),
+                        'phoneNumber' => $phoneNumber,
+                    ],
+                ],
+                $context
+            );
+        }
+    }
+
+    protected function saveOrderData(OrderEntity $orderEntity, RequestDataBag $dataBag, Context $context): void
+    {
+        $phoneNumber = $dataBag->get(RequestConstants::PHONE);
+
+        $this->orderAddressRepository->update(
+            [
+                [
+                    'id' => $orderEntity->getBillingAddressId(),
+                    'phoneNumber' => $phoneNumber,
+                ],
+            ],
+            $context
+        );
+    }
+
+    private function getCustomer(OrderEntity $order, Context $context): ?CustomerEntity
+    {
+        $customer = $order->getOrderCustomer()?->getCustomer();
+        if ($customer instanceof CustomerEntity) {
+            return $customer;
+        }
+        $customerId = $order->getOrderCustomer()?->getCustomerId();
+        if (empty($customerId)) {
+            return null;
+        }
+
+        /** @var CustomerEntity|null $customer */
+        $customer = $this->customerRepository->search(new Criteria([$customerId]), $context)->first();
+
+        return $customer;
+    }
+
+    private function getCustomerAddress(CustomerEntity $customer, Context $context): ?CustomerAddressEntity
+    {
+        $customerAddress = $customer->getDefaultBillingAddress();
+        if ($customerAddress instanceof CustomerAddressEntity) {
+            return $customerAddress;
+        }
+
+        /** @var CustomerAddressEntity|null $customerAddress */
+        $customerAddress = $this->customerAddressRepository->search(
+            new Criteria([$customer->getDefaultBillingAddressId()]),
+            $context
+        )->first();
+
+        return $customerAddress;
+    }
+}
diff --git a/src/DependencyInjection/handler/payment_handler.xml b/src/DependencyInjection/handler/payment_handler.xml
@@ -19,6 +19,7 @@
             <argument key="$orderActionLogDataHandler" type="service" id="PayonePayment\Components\DataHandler\OrderActionLog\OrderActionLogDataHandlerInterface" />
             <argument key="$stateHandler" type="service" id="PayonePayment\Components\PaymentStateHandler\PaymentStateHandler" />
             <argument key="$requestParameterFactory" type="service" id="PayonePayment\Payone\RequestParameter\RequestParameterFactory"/>
+            <argument key="$customerDataPersistor" type="service" id="PayonePayment\Components\CustomerDataPersistor\CustomerDataPersistor"/>
         </service>
 
         <service id="PayonePayment\PaymentHandler\AbstractSynchronousPayonePaymentHandler"
@@ -29,6 +30,7 @@
             <argument key="$transactionDataHandler" type="service" id="PayonePayment\Components\DataHandler\Transaction\TransactionDataHandlerInterface" />
             <argument key="$orderActionLogDataHandler" type="service" id="PayonePayment\Components\DataHandler\OrderActionLog\OrderActionLogDataHandlerInterface" />
             <argument key="$requestParameterFactory" type="service" id="PayonePayment\Payone\RequestParameter\RequestParameterFactory"/>
+            <argument key="$customerDataPersistor" type="service" id="PayonePayment\Components\CustomerDataPersistor\CustomerDataPersistor"/>
         </service>
 
         <service id="PayonePayment\PaymentHandler\AbstractKlarnaPaymentHandler"

diff --git a/src/DependencyInjection/services.xml b/src/DependencyInjection/services.xml
@@ -129,5 +129,11 @@
             <argument key="$languageRepository" type="service" id="language.repository" />
         </service>
 
+        <service id="PayonePayment\Components\CustomerDataPersistor\CustomerDataPersistor" autowire="true">
+            <argument key="$orderAddressRepository" type="service" id="order_address.repository" />
+            <argument key="$customerRepository" type="service" id="customer.repository" />
+            <argument key="$customerAddressRepository" type="service" id="customer_address.repository" />
+        </service>
+
     </services>
 </container>
diff --git a/src/PaymentHandler/AbstractAsynchronousPayonePaymentHandler.php b/src/PaymentHandler/AbstractAsynchronousPayonePaymentHandler.php
@@ -5,6 +5,7 @@
 namespace PayonePayment\PaymentHandler;
 
 use PayonePayment\Components\ConfigReader\ConfigReaderInterface;
+use PayonePayment\Components\CustomerDataPersistor\CustomerDataPersistor;
 use PayonePayment\Components\DataHandler\OrderActionLog\OrderActionLogDataHandlerInterface;
 use PayonePayment\Components\DataHandler\Transaction\TransactionDataHandlerInterface;
 use PayonePayment\Components\DeviceFingerprint\AbstractDeviceFingerprintService;
@@ -38,6 +39,7 @@ public function __construct(
         protected readonly OrderActionLogDataHandlerInterface $orderActionLogDataHandler,
         protected readonly PaymentStateHandlerInterface $stateHandler,
         protected readonly RequestParameterFactory $requestParameterFactory,
+        protected readonly CustomerDataPersistor $customerDataPersistor,
         protected readonly ?AbstractDeviceFingerprintService $deviceFingerprintService = null
     ) {
         parent::__construct($configReader, $lineItemRepository, $requestStack);
@@ -59,6 +61,8 @@ public function pay(
             );
         }
 
+        $this->customerDataPersistor->save($transaction->getOrder(), $dataBag, $salesChannelContext->getContext());
+
         $paymentTransaction = PaymentTransaction::fromAsyncPaymentTransactionStruct($transaction, $transaction->getOrder());
 
         $authorizationMethod = $this->getAuthorizationMethod(

diff --git a/src/PaymentHandler/AbstractKlarnaPaymentHandler.php b/src/PaymentHandler/AbstractKlarnaPaymentHandler.php
@@ -6,6 +6,7 @@
 
 use PayonePayment\Components\CartHasher\CartHasherInterface;
 use PayonePayment\Components\ConfigReader\ConfigReaderInterface;
+use PayonePayment\Components\CustomerDataPersistor\CustomerDataPersistor;
 use PayonePayment\Components\DataHandler\OrderActionLog\OrderActionLogDataHandlerInterface;
 use PayonePayment\Components\DataHandler\Transaction\TransactionDataHandlerInterface;
 use PayonePayment\Components\PaymentStateHandler\PaymentStateHandlerInterface;
@@ -34,6 +35,7 @@ public function __construct(
         OrderActionLogDataHandlerInterface $orderActionLogDataHandler,
         PaymentStateHandlerInterface $stateHandler,
         RequestParameterFactory $requestParameterFactory,
+        CustomerDataPersistor $customerDataPersistor,
         protected CartHasherInterface $cartHasher
     ) {
         parent::__construct(
@@ -45,7 +47,8 @@ public function __construct(
             $transactionDataHandler,
             $orderActionLogDataHandler,
             $stateHandler,
-            $requestParameterFactory
+            $requestParameterFactory,
+            $customerDataPersistor
         );
     }
 

diff --git a/src/PaymentHandler/AbstractSynchronousPayonePaymentHandler.php b/src/PaymentHandler/AbstractSynchronousPayonePaymentHandler.php
@@ -5,6 +5,7 @@
 namespace PayonePayment\PaymentHandler;
 
 use PayonePayment\Components\ConfigReader\ConfigReaderInterface;
+use PayonePayment\Components\CustomerDataPersistor\CustomerDataPersistor;
 use PayonePayment\Components\DataHandler\OrderActionLog\OrderActionLogDataHandlerInterface;
 use PayonePayment\Components\DataHandler\Transaction\TransactionDataHandlerInterface;
 use PayonePayment\Components\DeviceFingerprint\AbstractDeviceFingerprintService;
@@ -34,6 +35,7 @@ public function __construct(
         protected readonly TransactionDataHandlerInterface $transactionDataHandler,
         protected readonly OrderActionLogDataHandlerInterface $orderActionLogDataHandler,
         protected readonly RequestParameterFactory $requestParameterFactory,
+        protected readonly CustomerDataPersistor $customerDataPersistor,
         protected readonly ?AbstractDeviceFingerprintService $deviceFingerprintService = null
     ) {
         parent::__construct($configReader, $lineItemRepository, $requestStack);
@@ -55,6 +57,8 @@ public function pay(
             );
         }
 
+        $this->customerDataPersistor->save($transaction->getOrder(), $dataBag, $salesChannelContext->getContext());
+
         $paymentTransaction = PaymentTransaction::fromSyncPaymentTransactionStruct($transaction, $transaction->getOrder());
 
         $authorizationMethod = $this->getAuthorizationMethod(

diff --git a/src/PaymentHandler/PayoneAmazonPayPaymentHandler.php b/src/PaymentHandler/PayoneAmazonPayPaymentHandler.php
@@ -7,6 +7,7 @@
 use Doctrine\DBAL\Connection;
 use PayonePayment\Components\AmazonPay\ButtonConfiguration;
 use PayonePayment\Components\ConfigReader\ConfigReaderInterface;
+use PayonePayment\Components\CustomerDataPersistor\CustomerDataPersistor;
 use PayonePayment\Components\DataHandler\OrderActionLog\OrderActionLogDataHandlerInterface;
 use PayonePayment\Components\DataHandler\Transaction\TransactionDataHandlerInterface;
 use PayonePayment\Components\DeviceFingerprint\AbstractDeviceFingerprintService;
@@ -40,13 +41,14 @@ public function __construct(
         OrderActionLogDataHandlerInterface $orderActionLogDataHandler,
         PaymentStateHandlerInterface $stateHandler,
         RequestParameterFactory $requestParameterFactory,
+        CustomerDataPersistor $customerDataPersistor,
         private readonly RouterInterface $router,
         private readonly Connection $connection,
         private readonly ButtonConfiguration $buttonConfiguration,
         private readonly EncoderInterface $encoder,
         ?AbstractDeviceFingerprintService $deviceFingerprintService = null
     ) {
-        parent::__construct($configReader, $lineItemRepository, $requestStack, $client, $translator, $transactionDataHandler, $orderActionLogDataHandler, $stateHandler, $requestParameterFactory, $deviceFingerprintService);
+        parent::__construct($configReader, $lineItemRepository, $requestStack, $client, $translator, $transactionDataHandler, $orderActionLogDataHandler, $stateHandler, $requestParameterFactory, $customerDataPersistor, $deviceFingerprintService);
     }
 
     public static function isCapturable(array $transactionData, array $payoneTransActionData): bool

diff --git a/src/PaymentHandler/PayoneCreditCardPaymentHandler.php b/src/PaymentHandler/PayoneCreditCardPaymentHandler.php
@@ -6,6 +6,7 @@
 
 use PayonePayment\Components\CardRepository\CardRepositoryInterface;
 use PayonePayment\Components\ConfigReader\ConfigReaderInterface;
+use PayonePayment\Components\CustomerDataPersistor\CustomerDataPersistor;
 use PayonePayment\Components\DataHandler\OrderActionLog\OrderActionLogDataHandlerInterface;
 use PayonePayment\Components\DataHandler\Transaction\TransactionDataHandlerInterface;
 use PayonePayment\Components\PaymentStateHandler\PaymentStateHandlerInterface;
@@ -41,6 +42,7 @@ public function __construct(
         OrderActionLogDataHandlerInterface $orderActionLogDataHandler,
         PaymentStateHandlerInterface $stateHandler,
         RequestParameterFactory $requestParameterFactory,
+        CustomerDataPersistor $customerDataPersistor,
         protected CardRepositoryInterface $cardRepository
     ) {
         parent::__construct(
@@ -52,7 +54,8 @@ public function __construct(
             $transactionDataHandler,
             $orderActionLogDataHandler,
             $stateHandler,
-            $requestParameterFactory
+            $requestParameterFactory,
+            $customerDataPersistor
         );
     }
 

diff --git a/src/PaymentHandler/PayoneDebitPaymentHandler.php b/src/PaymentHandler/PayoneDebitPaymentHandler.php
@@ -5,6 +5,7 @@
 namespace PayonePayment\PaymentHandler;
 
 use PayonePayment\Components\ConfigReader\ConfigReaderInterface;
+use PayonePayment\Components\CustomerDataPersistor\CustomerDataPersistor;
 use PayonePayment\Components\DataHandler\OrderActionLog\OrderActionLogDataHandlerInterface;
 use PayonePayment\Components\DataHandler\Transaction\TransactionDataHandlerInterface;
 use PayonePayment\Components\MandateService\MandateServiceInterface;
@@ -33,6 +34,7 @@ public function __construct(
         TransactionDataHandlerInterface $transactionDataHandler,
         OrderActionLogDataHandlerInterface $orderActionLogDataHandler,
         RequestParameterFactory $requestParameterFactory,
+        CustomerDataPersistor $customerDataPersistor,
         protected MandateServiceInterface $mandateService
     ) {
         parent::__construct(
@@ -43,7 +45,8 @@ public function __construct(
             $translator,
             $transactionDataHandler,
             $orderActionLogDataHandler,
-            $requestParameterFactory
+            $requestParameterFactory,
+            $customerDataPersistor
         );
     }
 

diff --git a/src/PaymentHandler/PayonePayolutionInstallmentPaymentHandler.php b/src/PaymentHandler/PayonePayolutionInstallmentPaymentHandler.php
@@ -6,6 +6,7 @@
 
 use PayonePayment\Components\CartHasher\CartHasherInterface;
 use PayonePayment\Components\ConfigReader\ConfigReaderInterface;
+use PayonePayment\Components\CustomerDataPersistor\CustomerDataPersistor;
 use PayonePayment\Components\DataHandler\OrderActionLog\OrderActionLogDataHandlerInterface;
 use PayonePayment\Components\DataHandler\Transaction\TransactionDataHandlerInterface;
 use PayonePayment\Components\Validator\Birthday;
@@ -33,6 +34,7 @@ public function __construct(
         TransactionDataHandlerInterface $transactionDataHandler,
         OrderActionLogDataHandlerInterface $orderActionLogDataHandler,
         RequestParameterFactory $requestParameterFactory,
+        CustomerDataPersistor $customerDataPersistor,
         protected CartHasherInterface $cartHasher
     ) {
         parent::__construct(
@@ -43,7 +45,8 @@ public function __construct(
             $translator,
             $transactionDataHandler,
             $orderActionLogDataHandler,
-            $requestParameterFactory
+            $requestParameterFactory,
+            $customerDataPersistor
         );
     }