Sylius · lchrusciel · May 19, 2021 · May 18, 2021
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,7 +1,11 @@
 ### UPGRADE FROM 1.0.0-RC.9 TO 1.0.0-RC.10
 
-Command bus `sylius_refund_plugin.command_bus` has been replaced with `sylius.command_bus`.
-Event bus `sylius_refund_plugin.event_bus` has been replaced with `sylius.event_bus`.
+1. Command bus `sylius_refund_plugin.command_bus` has been replaced with `sylius.command_bus`.
+
+1. Event bus `sylius_refund_plugin.event_bus` has been replaced with `sylius.event_bus`.
+
+1. `Sylius\RefundPlugin\Grid\Filter\ChannelFilter` and `Sylius\RefundPlugin\Form\Type\ChannelFilterType` services 
+have been removed and channel filter configuration in grid has been replaced by entity filter.
 
 ### UPGRADE FROM 1.0.0-RC.7 TO 1.0.0-RC.8
 

diff --git a/features/filtering_credit_memos.feature b/features/filtering_credit_memos.feature
@@ -35,4 +35,3 @@ Feature: Filtering credit memos
         And I filter credit memos by "Web-US" channel
         Then there should be 1 credit memo generated
         And the only credit memo should be generated for order "#00000001"
-
diff --git a/spec/Grid/Filter/ChannelFilterSpec.php b/spec/Grid/Filter/ChannelFilterSpec.php
diff --git a/src/Form/Type/ChannelFilterType.php b/src/Form/Type/ChannelFilterType.php
diff --git a/src/Grid/Filter/ChannelFilter.php b/src/Grid/Filter/ChannelFilter.php
diff --git a/src/Resources/config/app/config.yml b/src/Resources/config/app/config.yml
@@ -51,9 +51,6 @@ winzou_state_machine:
                 to: completed
 
 sylius_grid:
-    templates:
-        filter:
-            credit_memo_channel: '@SyliusRefundPlugin/Grid/Filter/channel.html.twig'
     grids:
         sylius_refund_credit_memo:
             driver:
@@ -128,8 +125,10 @@ sylius_grid:
                     type: date
                     label: sylius_refund.ui.issued_at
                 channel:
-                    type: credit_memo_channel
+                    type: entity
                     label: sylius.ui.channel
+                    form_options:
+                        class: "%sylius.model.channel.class%"
 
 doctrine:
     dbal:

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -124,15 +124,6 @@
             <argument type="service" id="sylius_refund.repository.credit_memo"/>
         </service>
 
-        <service id="Sylius\RefundPlugin\Form\Type\ChannelFilterType">
-            <argument type="service" id="sylius.repository.channel" />
-            <tag name="form.type" />
-        </service>
-
-        <service id="Sylius\RefundPlugin\Grid\Filter\ChannelFilter">
-            <tag name="sylius.grid_filter" type="credit_memo_channel" form_type="Sylius\RefundPlugin\Form\Type\ChannelFilterType" />
-        </service>
-
         <service id="sylius.order_processing.shipping_charges_processor" class="Sylius\RefundPlugin\OrderProcessor\ShippingChargesProcessor">
             <argument type="service" id="sylius.factory.adjustment" />
             <argument type="service" id="sylius.shipping_calculator" />

diff --git a/src/Resources/views/Grid/Filter/channel.html.twig b/src/Resources/views/Grid/Filter/channel.html.twig
diff --git a/tests/Behat/Page/Admin/CreditMemoIndexPage.php b/tests/Behat/Page/Admin/CreditMemoIndexPage.php
@@ -19,7 +19,7 @@ public function downloadCreditMemo(int $index): void
 
     public function filterByChannel(string $channelName): void
     {
-        $this->getDocument()->find('css', '#criteria_channel_channel')->selectOption($channelName);
+        $this->getDocument()->find('css', '#criteria_channel')->selectOption($channelName);
     }
 
     public function hasCreditMemoWithOrderNumber(int $index, string $orderNumber): bool
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,4 +35,3 @@ Feature: Filtering credit memos
		And I filter credit memos by "Web-US" channel
		Then there should be 1 credit memo generated
		And the only credit memo should be generated for order "#00000001"