Merge pull request #15 from stefandoorn/feature/remove-duplicate-addi…

…tion

Make addition empty if the same as street + number (autofill)

src/Form/EventSubscriber/RemoveDuplicateAdditionEventSubscriber.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace StefanDoorn\SyliusStreetNumberPlugin\Form\EventSubscriber;
+
+use StefanDoorn\SyliusStreetNumberPlugin\Entity\Interfaces\AddressInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
+
+final class RemoveDuplicateAdditionEventSubscriber implements EventSubscriberInterface
+{
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            FormEvents::POST_SUBMIT => 'onPostSubmit',
+        ];
+    }
+
+    public function onPostSubmit(FormEvent $event): void
+    {
+        /** @var AddressInterface $data */
+        $data = $event->getData();
+
+        if (!$data instanceof AddressInterface) {
+            return;
+        }
+
+        if (empty($data->getAddition())) {
+            return;
+        }
+
+        $streetNumber = sprintf('%s %s', $data->getStreetWithoutNumberAndAddition(), $data->getNumber());
+
+        if ($data->getAddition() !== $streetNumber) {
+            return;
+        }
+
+        $data->setAddition(null);
+        $data->setStreet($streetNumber);
+    }
+}

src/Form/Extension/AddressTypeStreetNumberAdditionExtension.php

@@ -15,9 +15,15 @@ final class AddressTypeStreetNumberAdditionExtension extends AbstractTypeExtensi
     /** @var EventSubscriberInterface */
     private $appendAdditionDataToStreetFieldEventSubscriber;
 
-    public function __construct(EventSubscriberInterface $appendAdditionDataToStreetFieldEventSubscriber)
-    {
+    /** @var EventSubscriberInterface */
+    private $removeDuplicateAdditionEventSubscriber;
+
+    public function __construct(
+        EventSubscriberInterface $appendAdditionDataToStreetFieldEventSubscriber,
+        EventSubscriberInterface $removeDuplicateAdditionEventSubscriber
+    ) {
         $this->appendAdditionDataToStreetFieldEventSubscriber = $appendAdditionDataToStreetFieldEventSubscriber;
+        $this->removeDuplicateAdditionEventSubscriber = $removeDuplicateAdditionEventSubscriber;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -33,6 +39,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         );
 
         $builder->addEventSubscriber($this->appendAdditionDataToStreetFieldEventSubscriber);
+        $builder->addEventSubscriber($this->removeDuplicateAdditionEventSubscriber);
     }
 
     public function getExtendedType()

src/Resources/config/services_features/street_number_addition.xml

@@ -4,12 +4,15 @@
     <services>
         <service id="stefandoorn.sylius_street_number_plugin.form.extension.type.address_street_number_addition" class="StefanDoorn\SyliusStreetNumberPlugin\Form\Extension\AddressTypeStreetNumberAdditionExtension">
             <argument type="service" id="stefandoorn.sylius_street_number_plugin.form.event_listener.append_addition_data_to_street_field_event_subscriber" />
+            <argument type="service" id="stefandoorn.sylius_street_number_plugin.form.event_listener.remove_duplicate_addition_event_subscriber" />
 
             <tag name="form.type_extension" extended_type="Sylius\Bundle\AddressingBundle\Form\Type\AddressType" priority="-10" />
         </service>
 
         <service id="stefandoorn.sylius_street_number_plugin.form.event_listener.append_addition_data_to_street_field_event_subscriber" class="StefanDoorn\SyliusStreetNumberPlugin\Form\EventSubscriber\AppendDataToStreetFieldEventSubscriber">
             <argument>addition</argument>
         </service>
+
+        <service id="stefandoorn.sylius_street_number_plugin.form.event_listener.remove_duplicate_addition_event_subscriber" class="StefanDoorn\SyliusStreetNumberPlugin\Form\EventSubscriber\RemoveDuplicateAdditionEventSubscriber" />
     </services>
 </container>