Removing archiving and making the plugin more flexible

Brille24 · Mar 20, 2020 · 92d67e2 · 92d67e2
1 parent 5e87dbf
commit 92d67e2
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 32 deletions.
diff --git a/src/Entity/CustomerOptions/CustomerOption.php b/src/Entity/CustomerOptions/CustomerOption.php
@@ -16,7 +16,6 @@
 use Brille24\SyliusCustomerOptionsPlugin\Enumerations\CustomerOptionTypeEnum;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
-use Sylius\Component\Resource\Model\ArchivableTrait;
 use Sylius\Component\Resource\Model\TranslatableTrait;
 use Sylius\Component\Resource\Model\TranslationInterface;
 
@@ -27,8 +26,6 @@ class CustomerOption implements CustomerOptionInterface
         getTranslation as private doGetTranslation;
     }
 
-    use ArchivableTrait;
-
     /** @var int|null */
     private $id;
 

diff --git a/src/Entity/CustomerOptions/CustomerOptionInterface.php b/src/Entity/CustomerOptions/CustomerOptionInterface.php
@@ -14,12 +14,11 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
-use Sylius\Component\Resource\Model\ArchivableInterface;
 use Sylius\Component\Resource\Model\CodeAwareInterface;
 use Sylius\Component\Resource\Model\ResourceInterface;
 use Sylius\Component\Resource\Model\TranslatableInterface;
 
-interface CustomerOptionInterface extends ResourceInterface, CodeAwareInterface, TranslatableInterface, ArchivableInterface
+interface CustomerOptionInterface extends ResourceInterface, CodeAwareInterface, TranslatableInterface
 {
     /**
      * @param string|null $type

diff --git a/src/Resources/config/app/grids/customer_option_groups.yml b/src/Resources/config/app/grids/customer_option_groups.yml
@@ -4,7 +4,7 @@ sylius_grid:
             driver:
                 name: doctrine/orm
                 options:
-                    class: Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\CustomerOptionGroup
+                    class: '%brille24.model.customer_option_group.class%'
             fields:
                 code:
                     type: string

diff --git a/src/Resources/config/app/grids/customer_options.yml b/src/Resources/config/app/grids/customer_options.yml
@@ -7,7 +7,7 @@ sylius_grid:
             driver:
                 name: doctrine/orm
                 options:
-                    class: Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\CustomerOption
+                    class: '%brille24.model.customer_option.class%'
             fields:
                 code:
                     type: string
@@ -29,12 +29,6 @@ sylius_grid:
                 code:
                     type: string
                     label: sylius.ui.code
-                archival:
-                    type: exists
-                    label: sylius.ui.archival
-                    options:
-                        field: archivedAt
-                    default_value: false
             actions:
                 main:
                     create:
@@ -45,5 +39,3 @@ sylius_grid:
                     delete:
                         type: delete_unused_customer_option
                         label: 'sylius.ui.delete'
-                    archive:
-                        type: archive
diff --git a/src/Resources/config/app/routing/admin/customer_options.yml b/src/Resources/config/app/routing/admin/customer_options.yml
@@ -16,18 +16,3 @@ brille24_customer_options_admin:
             index:
                 icon: cube
     type: sylius.resource
-
-brille24_admin_customer_option_archive:
-    path: /customer-option/{id}/archive
-    methods: [PATCH]
-    defaults:
-        _controller: brille24.controller.customer_option:updateAction
-        _sylius:
-            section: admin
-            permission: true
-            template: '@SyliusUi/Grid/Action/archive.html.twig'
-            form:
-                type: Sylius\Bundle\ResourceBundle\Form\Type\ArchivableType
-            redirect:
-                route: brille24_admin_customer_option_index
-                parameters: {}
diff --git a/src/Resources/config/doctrine/CustomerOptions.CustomerOption.orm.xml b/src/Resources/config/doctrine/CustomerOptions.CustomerOption.orm.xml
@@ -17,8 +17,6 @@
         <field name="code" type="string" unique="true" nullable="false"/>
         <field name="required" type="boolean"/>
 
-        <field name="archivedAt" type="datetime" nullable="true" />
-
         <one-to-many
                 target-entity="Brille24\SyliusCustomerOptionsPlugin\Entity\CustomerOptions\CustomerOptionAssociationInterface"
                 mapped-by="option"

diff --git a/src/Resources/translations/messages.de.yml b/src/Resources/translations/messages.de.yml
@@ -85,3 +85,4 @@ brille24:
     grid:
         options_remaining: "{0} |]0,Inf]und %count% weitere"
         options_empty: Leer
+        delete_not_allowed: 'Die Kundenoption kann nicht gelöscht werden, weil sie in Verwendung ist.'