Implement common hooks structure as in AdminBundle

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/address.yaml

@@ -2,12 +2,12 @@ sylius_twig_hooks:
     hooks:
         'sylius_shop.checkout.address':
             content:
-                template: '@SyliusShop/checkout/shared/content.html.twig'
+                template: '@SyliusShop/checkout/common/content.html.twig'
                 priority: 0
 
         'sylius_shop.checkout.address.content':
             steps:
-                template: '@SyliusShop/checkout/shared/steps.html.twig'
+                template: '@SyliusShop/checkout/common/steps.html.twig'
                 priority: 100
             form:
                 component: 'sylius_shop:checkout:address:form'

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/complete.yaml

@@ -7,7 +7,7 @@ sylius_twig_hooks:
 
         'sylius_shop.checkout.complete.content':
             steps:
-                template: '@SyliusShop/checkout/shared/steps.html.twig'
+                template: '@SyliusShop/checkout/common/steps.html.twig'
                 priority: 300
             header:
                 template: '@SyliusShop/checkout/complete/content/header.html.twig'

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/select_payment.yaml

@@ -2,12 +2,12 @@ sylius_twig_hooks:
     hooks:
         'sylius_shop.checkout.select_payment':
             content:
-                template: '@SyliusShop/checkout/shared/content.html.twig'
+                template: '@SyliusShop/checkout/common/content.html.twig'
                 priority: 0
 
         'sylius_shop.checkout.select_payment.content':
             steps:
-                template: '@SyliusShop/checkout/shared/steps.html.twig'
+                template: '@SyliusShop/checkout/common/steps.html.twig'
                 priority: 100
             form:
                 component: 'sylius_shop:checkout:payment:form'

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/select_shipping.yaml

@@ -2,12 +2,12 @@ sylius_twig_hooks:
     hooks:
         'sylius_shop.checkout.select_shipping':
             content:
-                template: '@SyliusShop/checkout/shared/content.html.twig'
+                template: '@SyliusShop/checkout/common/content.html.twig'
                 priority: 0
 
         'sylius_shop.checkout.select_shipping.content':
             steps:
-                template: '@SyliusShop/checkout/shared/steps.html.twig'
+                template: '@SyliusShop/checkout/common/steps.html.twig'
                 priority: 100
             form:
                 component: 'sylius_shop:checkout:shipping:form'

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/shared.yaml

@@ -1,58 +1,58 @@
 sylius_twig_hooks:
     hooks:
-        'sylius_shop.checkout.shared.header':
+        'sylius_shop.checkout.common.header':
             logo:
-                template: '@SyliusShop/checkout/shared/header/logo.html.twig'
+                template: '@SyliusShop/checkout/common/header/logo.html.twig'
                 priority: 100
             account:
-                template: '@SyliusShop/checkout/shared/header/account.html.twig'
+                template: '@SyliusShop/checkout/common/header/account.html.twig'
                 priority: 0
-        
-        'sylius_shop.checkout.shared.sidebar':
+
+        'sylius_shop.checkout.common.sidebar':
             summary:
-                template: '@SyliusShop/checkout/shared/sidebar/summary.html.twig'
+                template: '@SyliusShop/checkout/common/sidebar/summary.html.twig'
                 priority: 0
-        
-        'sylius_shop.checkout.shared.sidebar.summary':
+
+        'sylius_shop.checkout.common.sidebar.summary':
             header:
-                template: '@SyliusShop/checkout/shared/sidebar/summary/header.html.twig'
+                template: '@SyliusShop/checkout/common/sidebar/summary/header.html.twig'
                 priority: 200
             items:
-                template: '@SyliusShop/checkout/shared/sidebar/summary/items.html.twig'
+                template: '@SyliusShop/checkout/common/sidebar/summary/items.html.twig'
                 priority: 100
             total:
-                template: '@SyliusShop/checkout/shared/sidebar/summary/total.html.twig'
+                template: '@SyliusShop/checkout/common/sidebar/summary/total.html.twig'
                 priority: 0
-        
-        'sylius_shop.checkout.shared.sidebar.summary.items':
+
+        'sylius_shop.checkout.common.sidebar.summary.items':
             item:
-                template: '@SyliusShop/checkout/shared/sidebar/summary/items/item.html.twig'
+                template: '@SyliusShop/checkout/common/sidebar/summary/items/item.html.twig'
                 priority: 0
-        
-        'sylius_shop.checkout.shared.sidebar.summary.items.item':
+
+        'sylius_shop.checkout.common.sidebar.summary.items.item':
             name:
-                template: '@SyliusShop/checkout/shared/sidebar/summary/items/item/name.html.twig'
+                template: '@SyliusShop/checkout/common/sidebar/summary/items/item/name.html.twig'
                 priority: 200
             quantity:
-                template: '@SyliusShop/checkout/shared/sidebar/summary/items/item/quantity.html.twig'
+                template: '@SyliusShop/checkout/common/sidebar/summary/items/item/quantity.html.twig'
                 priority: 100
             subtotal:
-                template: '@SyliusShop/checkout/shared/sidebar/summary/items/item/subtotal.html.twig'
+                template: '@SyliusShop/checkout/common/sidebar/summary/items/item/subtotal.html.twig'
                 priority: 0
-        
-        'sylius_shop.checkout.shared.sidebar.summary.total':
+
+        'sylius_shop.checkout.common.sidebar.summary.total':
             items_total:
-                template: '@SyliusShop/checkout/shared/sidebar/summary/total/items_total.html.twig'
+                template: '@SyliusShop/checkout/common/sidebar/summary/total/items_total.html.twig'
                 priority: 400
             promotion_total:
-                template: '@SyliusShop/checkout/shared/sidebar/summary/total/promotion_total.html.twig'
+                template: '@SyliusShop/checkout/common/sidebar/summary/total/promotion_total.html.twig'
                 priority: 300
             shipping_total:
-                template: '@SyliusShop/checkout/shared/sidebar/summary/total/shipping_total.html.twig'
+                template: '@SyliusShop/checkout/common/sidebar/summary/total/shipping_total.html.twig'
                 priority: 200
             taxes_total:
-                template: '@SyliusShop/checkout/shared/sidebar/summary/total/taxes_total.html.twig'
+                template: '@SyliusShop/checkout/common/sidebar/summary/total/taxes_total.html.twig'
                 priority: 100
             order_total:
-                template: '@SyliusShop/checkout/shared/sidebar/summary/total/order_total.html.twig'
+                template: '@SyliusShop/checkout/common/sidebar/summary/total/order_total.html.twig'
                 priority: 0

src/Sylius/Bundle/ShopBundle/templates/checkout/address.html.twig

@@ -1,4 +1,4 @@
-{% extends '@SyliusShop/checkout/shared/layout.html.twig' %}
+{% extends '@SyliusShop/checkout/common/layout.html.twig' %}
 
 {% set prefixes = ['sylius_shop.checkout'] %}
 {% set active_step = 'address' %}

src/Sylius/Bundle/ShopBundle/templates/checkout/common/layout.html.twig

@@ -5,7 +5,7 @@
         <div class="bg-white border-bottom py-4">
             <div class="container">
                 <div class="row align-items-center">
-                    {% hook 'sylius_shop.checkout.shared.header' with { order } %}
+                    {% hook 'sylius_shop.checkout.common.header' with { order } %}
                 </div>
             </div>
         </div>
@@ -18,7 +18,7 @@
                     </div>
                     {% block sidebar %}
                         <div class="col-12 col-lg-5 py-5 ps-lg-6 position-relative checkout-sidebar">
-                            {% hook 'sylius_shop.checkout.shared.sidebar' with { order } %}
+                            {% hook 'sylius_shop.checkout.common.sidebar' with { order } %}
                         </div>
                     {% endblock %}
                 </div>

src/Sylius/Bundle/ShopBundle/templates/checkout/complete.html.twig

@@ -1,4 +1,4 @@
-{% extends '@SyliusShop/checkout/shared/layout.html.twig' %}
+{% extends '@SyliusShop/checkout/common/layout.html.twig' %}
 
 {% block title %}{{ 'sylius.ui.complete'|trans }} | {{ parent() }}{% endblock %}
 {% block content_title %}{{ 'sylius.ui.summary_of_your_order'|trans }}{% endblock %}

src/Sylius/Bundle/ShopBundle/templates/checkout/select_payment.html.twig

@@ -1,4 +1,4 @@
-{% extends '@SyliusShop/checkout/shared/layout.html.twig' %}
+{% extends '@SyliusShop/checkout/common/layout.html.twig' %}
 
 {% set active_step = 'select_payment' %}
 {% set prefixes = ['sylius_shop.checkout'] %}

src/Sylius/Bundle/ShopBundle/templates/checkout/select_shipping.html.twig

@@ -1,4 +1,4 @@
-{% extends '@SyliusShop/checkout/shared/layout.html.twig' %}
+{% extends '@SyliusShop/checkout/common/layout.html.twig' %}
 
 {% set active_step = 'select_shipping' %}
 {% set prefixes = ['sylius_shop.checkout'] %}