Merge pull request #339 from GSadee/improve-invoice-grid

[Admin] Remove unneeded route + grid improvements

UPGRADE.md

@@ -19,3 +19,38 @@
    - `Sylius\InvoicingPlugin\Generator\SequentialInvoiceNumberGenerator`
 
 1. The translation keys have been changed from `sylius_invoicing_plugin` and `sylius_admin_order_creation` to `sylius_invoicing`.
+
+1. The `sylius_invoicing_admin_order_show_by_number` route and `Sylius\InvoicingPlugin\Ui\RedirectToOrderShowAction` controller
+   have been removed and replaced by the `sylius_admin_order_show` route from the Sylius Core.
+
+1. The following templates have been removed:
+   - `@SyliusInvoicingPlugin/Invoice/Grid/Field/orderNumber.html.twig`
+   - `@SyliusInvoicingPlugin/Invoice/Grid/Field/channel.html.twig`
+
+1. The invoice grid configuration has been updated accordingly to the above changes:
+
+   ```diff
+   sylius_grid:
+       grids:
+           sylius_invoicing_plugin_invoice:
+   #           ...
+               fields:
+   #               ...
+                   orderNumber:
+                       type: twig
+                       label: sylius.ui.order
+   -                   path: order.number
+   -                   options:
+   -                       template: '@SyliusInvoicingPlugin/Invoice/Grid/Field/orderNumber.html.twig'
+   +                   path: order
+   +                   options:
+   +                       template: "@SyliusAdmin/Order/Grid/Field/number.html.twig"
+                       sortable: order.number
+                   channel:
+                       type: twig
+                       label: sylius.ui.channel
+                       options:
+   -                       template: "@SyliusInvoicingPlugin/Invoice/Grid/Field/channel.html.twig"
+   +                       template: "@SyliusAdmin/Order/Grid/Field/channel.html.twig"
+   #           ...
+   ```

src/Resources/config/app/routing/admin_invoicing.yml

@@ -45,13 +45,3 @@ sylius_invoicing_plugin_admin_order_invoices_partial:
             repository:
                 method: findByOrderNumber
                 arguments: $orderNumber
-
-sylius_invoicing_admin_order_show_by_number:
-    path: /orders/by-number/{number}
-    methods: [GET]
-    defaults:
-        _controller: Sylius\InvoicingPlugin\Ui\RedirectToOrderShowAction
-        _sylius:
-            section: admin
-            permission: true
-            alias: invoicing_plugin

src/Resources/config/config.yml

@@ -46,15 +46,15 @@ sylius_grid:
                 orderNumber:
                     type: twig
                     label: sylius.ui.order
-                    path: order.number
+                    path: order
                     options:
-                        template: '@SyliusInvoicingPlugin/Invoice/Grid/Field/orderNumber.html.twig'
+                        template: "@SyliusAdmin/Order/Grid/Field/number.html.twig"
                     sortable: order.number
                 channel:
                     type: twig
                     label: sylius.ui.channel
                     options:
-                        template: "@SyliusInvoicingPlugin/Invoice/Grid/Field/channel.html.twig"
+                        template: "@SyliusAdmin/Order/Grid/Field/channel.html.twig"
                 total:
                     type: twig
                     label: sylius.ui.total

src/Resources/config/services/ui.xml

@@ -16,10 +16,5 @@
         <service id="sylius_invoicing_plugin.grid.filter.channel" class="Sylius\InvoicingPlugin\Grid\Filter\ChannelFilter">
             <tag name="sylius.grid_filter" type="invoice_channel" form_type="Sylius\InvoicingPlugin\Form\Type\ChannelFilterType" />
         </service>
-
-        <service id="Sylius\InvoicingPlugin\Ui\RedirectToOrderShowAction">
-            <argument type="service" id="router" />
-            <argument type="service" id="sylius.repository.order" />
-        </service>
     </services>
 </container>