Merge branch '2.0' into 2.0-docs

* 2.0:
  Fix missing logo in reset password templates
  Group body classes into one Twig file
  Admin security root hooks refactor
  [API] update info about resource configuration changes in upgrade file
  Implement common hooks structure as in AdminBundle
  [Admin] Add twig.payment_method.excluded_gateways parameter
  Remove unnecessary hook
  Rename dashboard hook
  [PaymentRequest] Adjust ids of the services to link them to Payment Requests
  Minor improvement
  [Admin] Add checkout.payment.allowed_states parameter
  [Admin] Add attributes to dropdown helper
  [Shop] Enable customization of body classes
  Chore: Remove useless route vars
  Remove unnecessary file
  Reorganize account twig hooks

UPGRADE-API-2.0.md

@@ -194,103 +194,64 @@ All the `setter` methods have been removed from the commands above and also ther
 
 ### Updated API Routes
 
-* AvatarImage
-
-- `'GET' - /api/v2/admin/avatar-images/{id}` → `'GET' - /api/v2/admin/administrators/{id}/avatar-image`
-- `'POST' - /api/v2/admin/avatar-images` → `'POST' - /api/v2/admin/administrators/{id}/avatar-image`
-- `'DELETE' - /api/v2/admin/avatar-images/{id}` → `'DELETE' - /api/v2/admin/administrators/{id}/avatar-image`
-
-* ShopUser, CustomerPassword and CustomerVerification
-
-- `'POST' - /api/v2/shop/reset-password-requests` → `'POST' - /api/v2/shop/reset-password`
-- `'PATCH' - /api/v2/shop/reset-password-requests/{resetPasswordToken}` → `'PATCH' - /api/v2/shop/reset-password/{resetPasswordToken}`
-- `'POST' - /api/v2/shop/account-verification-requests` → `'POST' - /api/v2/shop/verify-shop-user`
-- `'PATCH' - /api/v2/shop/account-verification-requests/{token}` → `'PATCH' - /api/v2/shop/verify-shop-user/{token}`
-
-* AdminUserPassword
-
-- `'POST' - /api/v2/admin/reset-password-requests` → `'POST' - /api/v2/admin/reset-password`
-- `'PATCH' - /api/v2/admin/reset-password-requests/{resetPasswordToken}` → `'PATCH' - /api/v2/admin/reset-password/{resetPasswordToken}`
-
-* CatalogPromotion
-
-- `'GET' - /api/v2/admin/catalog-promotion-actions/{id}` → `'GET' - /api/v2/admin/catalog-promotions/{code}/actions/{id}`
-- `'GET' - /api/v2/admin/catalog-promotion-scopes/{id}` → `'GET' - /api/v2/admin/catalog-promotions/{code}/scopes/{id}`
-
-* Translation
-
-- `'GET' - /api/v2/admin/[resource]-translations/{id}` → `'GET' - /api/v2/admin/[resource]/{code}/translations/{localeCode}`
-
-* ChannelPricing
-
-- `'GET' - /api/v2/admin/channel-pricings/{id}` → `'GET' - /api/v2/admin/product-variants/{code}/pricing/{id}`
-
-* Order
-
-- `'GET' - /api/v2/admin/order-items/{id}` → `'GET' - /api/v2/admin/orders/{orderToken}/items/{id}`
-
-* Payment
-
-- `'GET' - /api/v2/shop/payments/{id}` → `'GET' - /api/v2/shop/orders/{orderToken}/payments/{id}`
-
-* Product
-
-- `'GET' - /api/v2/admin/product-images/{id}` → `'GET' - /api/v2/admin/products/{code}/images/{id}`
-- `'GET' - /api/v2/admin/products-images` → `'GET' - /api/v2/admin/products/{code}/images`
-- `'GET' - /api/v2/shop/product-images/{id}` → `'GET' - /api/v2/shop/products/{code}/images/{id}`
-- `'GET' - /api/v2/admin/product-option-values/{code}` → `'GET' - /api/v2/admin/product-options/{optionCode}/values/{code}`
-- `'GET' - /api/v2/shop/product-option-values/{code}` → `'GET' - /api/v2/shop/product-options/{optionCode}/values/{code}`
-
-* Promotion
-
-- `'GET' - /api/v2/admin/promotion-actions/{id}` → `'GET' - /api/v2/admin/promotions/{code}/actions/{id}`
-- `'GET' - /api/v2/admin/promotion-coupons/{id}` → `'GET' - /api/v2/admin/promotions/{code}/coupons/{id}`
-- `'POST' - /api/v2/admin/promotion-coupons/generate` → `'POST' - /api/v2/admin/promotions/{promotionCode}/coupons/generate`
-- `'PUT' - /api/v2/admin/promotion-coupons/{code}` → `'PUT' - /api/v2/admin/promotions/{promotionCode}/coupons/{couponCode}`
-- `'DELETE' - /api/v2/admin/promotion-coupons/{code}` → `'DELETE' - /api/v2/admin/promotions/{promotionCode}/coupons/{couponCode}`
-- `'GET' - /api/v2/admin/promotion-rules/{id}` → `'GET' - /api/v2/admin/promotions/{code}/rules/{id}`
-
-* Provinces
-
-- `'GET' - /api/v2/admin/provinces/{code}` → `'GET' - /api/v2/admin/countries/{countryCode}/provinces/{provinceCode}`
-- `'PUT' - /api/v2/admin/provinces/{code}` → `'PUT' - /api/v2/admin/countries/{countryCode}/provinces/{provinceCode}`
-- `'GET' - /api/v2/shop/provinces/{code}` → `'GET' - /api/v2/shop/countries/{countryCode}/provinces/{provinceCode}`
-
-* Shipment
-
-- `'GET' - /api/v2/shop/shipments/{id}` → `'GET' - /api/v2/shop/orders/{orderToken}/shipments/{id}`
-
-* Taxon
-
-- `'GET' - /api/v2/admin/taxon-images/{id}` → `'GET' - /api/v2/admin/taxons/{code}/images/{id}`
-- `'POST' - /api/v2/admin/taxon-images` → `'POST' - /api/v2//admin/taxons/{code}/images`
-- `'PUT' - /api/v2/admin/taxon-images/{id}` → `'PUT' - /api/v2/admin/taxons/{code}/images/{id}`
-- `'DELETE' - /api/v2/admin/taxon-images/{id}` → `'DELETE' - /api/v2/admin/taxons/{code}/images/{id}`
-- `'GET' - /api/v2/shop/taxon-images/{id}` → `'GET' - /api/v2/shop/taxons/{code}/images/{id}`
+| Resource                                             | Original Route                                                       | Updated Route                                                            |
+|------------------------------------------------------|----------------------------------------------------------------------|--------------------------------------------------------------------------|
+| **AvatarImage**                                      | `GET - /api/v2/admin/avatar-images/{id}`                             | `GET - /api/v2/admin/administrators/{id}/avatar-image`                   |
+|                                                      | `POST - /api/v2/admin/avatar-images`                                 | `POST - /api/v2/admin/administrators/{id}/avatar-image`                  |
+|                                                      | `DELETE - /api/v2/admin/avatar-images/{id}`                          | `DELETE - /api/v2/admin/administrators/{id}/avatar-image`                |
+| **ShopUser, CustomerPassword, CustomerVerification** | `POST - /api/v2/shop/reset-password-requests`                        | `POST - /api/v2/shop/reset-password`                                     |
+|                                                      | `PATCH - /api/v2/shop/reset-password-requests/{resetPasswordToken}`  | `PATCH - /api/v2/shop/reset-password/{resetPasswordToken}`               |
+|                                                      | `POST - /api/v2/shop/account-verification-requests`                  | `POST - /api/v2/shop/verify-shop-user`                                   |
+|                                                      | `PATCH - /api/v2/shop/account-verification-requests/{token}`         | `PATCH - /api/v2/shop/verify-shop-user/{token}`                          |
+| **AdminUserPassword**                                | `POST - /api/v2/admin/reset-password-requests`                       | `POST - /api/v2/admin/reset-password`                                    |
+|                                                      | `PATCH - /api/v2/admin/reset-password-requests/{resetPasswordToken}` | `PATCH - /api/v2/admin/reset-password/{resetPasswordToken}`              |
+| **CatalogPromotion**                                 | `GET - /api/v2/admin/catalog-promotion-actions/{id}`                 | `GET - /api/v2/admin/catalog-promotions/{code}/actions/{id}`             |
+|                                                      | `GET - /api/v2/admin/catalog-promotion-scopes/{id}`                  | `GET - /api/v2/admin/catalog-promotions/{code}/scopes/{id}`              |
+| **Translation**                                      | `GET - /api/v2/admin/[resource]-translations/{id}`                   | `GET - /api/v2/admin/[resource]/{code}/translations/{localeCode}`        |
+| **ChannelPricing**                                   | `GET - /api/v2/admin/channel-pricings/{id}`                          | `GET - /api/v2/admin/product-variants/{code}/pricing/{id}`               |
+| **Order**                                            | `GET - /api/v2/admin/order-items/{id}`                               | `GET - /api/v2/admin/orders/{orderToken}/items/{id}`                     |
+| **Payment**                                          | `GET - /api/v2/shop/payments/{id}`                                   | `GET - /api/v2/shop/orders/{orderToken}/payments/{id}`                   |
+| **Product**                                          | `GET - /api/v2/admin/product-images/{id}`                            | `GET - /api/v2/admin/products/{code}/images/{id}`                        |
+|                                                      | `GET - /api/v2/admin/products-images`                                | `GET - /api/v2/admin/products/{code}/images`                             |
+|                                                      | `GET - /api/v2/shop/product-images/{id}`                             | `GET - /api/v2/shop/products/{code}/images/{id}`                         |
+|                                                      | `GET - /api/v2/admin/product-option-values/{code}`                   | `GET - /api/v2/admin/product-options/{optionCode}/values/{code}`         |
+|                                                      | `GET - /api/v2/shop/product-option-values/{code}`                    | `GET - /api/v2/shop/product-options/{optionCode}/values/{code}`          |
+| **Promotion**                                        | `GET - /api/v2/admin/promotion-actions/{id}`                         | `GET - /api/v2/admin/promotions/{code}/actions/{id}`                     |
+|                                                      | `GET - /api/v2/admin/promotion-coupons/{id}`                         | `GET - /api/v2/admin/promotions/{code}/coupons/{id}`                     |
+|                                                      | `POST - /api/v2/admin/promotion-coupons/generate`                    | `POST - /api/v2/admin/promotions/{promotionCode}/coupons/generate`       |
+|                                                      | `PUT - /api/v2/admin/promotion-coupons/{code}`                       | `PUT - /api/v2/admin/promotions/{promotionCode}/coupons/{couponCode}`    |
+|                                                      | `DELETE - /api/v2/admin/promotion-coupons/{code}`                    | `DELETE - /api/v2/admin/promotions/{promotionCode}/coupons/{couponCode}` |
+|                                                      | `GET - /api/v2/admin/promotion-rules/{id}`                           | `GET - /api/v2/admin/promotions/{code}/rules/{id}`                       |
+| **Provinces**                                        | `GET - /api/v2/admin/provinces/{code}`                               | `GET - /api/v2/admin/countries/{countryCode}/provinces/{provinceCode}`   |
+|                                                      | `PUT - /api/v2/admin/provinces/{code}`                               | `PUT - /api/v2/admin/countries/{countryCode}/provinces/{provinceCode}`   |
+|                                                      | `GET - /api/v2/shop/provinces/{code}`                                | `GET - /api/v2/shop/countries/{countryCode}/provinces/{provinceCode}`    |
+| **Shipment**                                         | `GET - /api/v2/shop/shipments/{id}`                                  | `GET - /api/v2/shop/orders/{orderToken}/shipments/{id}`                  |
+| **Taxon**                                            | `GET - /api/v2/admin/taxon-images/{id}`                              | `GET - /api/v2/admin/taxons/{code}/images/{id}`                          |
+|                                                      | `POST - /api/v2/admin/taxon-images`                                  | `POST - /api/v2//admin/taxons/{code}/images`                             |
+|                                                      | `PUT - /api/v2/admin/taxon-images/{id}`                              | `PUT - /api/v2/admin/taxons/{code}/images/{id}`                          |
+|                                                      | `DELETE - /api/v2/admin/taxon-images/{id}`                           | `DELETE - /api/v2/admin/taxons/{code}/images/{id}`                       |
+|                                                      | `GET - /api/v2/shop/taxon-images/{id}`                               | `GET - /api/v2/shop/taxons/{code}/images/{id}`                           |
 
 ### Other Resource Changes
 
-1. **Adjustment**
-    - The shop item endpoint is no longer exposed.
-
 1. **CustomerVerification**
-    - `Sylius\Bundle\ApiBundle\Command\Account\VerifyCustomerAccount` command has been renamed to `Sylius\Bundle\ApiBundle\Command\Account\VerifyShopUser`.
-    - `Sylius\Bundle\ApiBundle\Command\Account\ResendVerificationEmail` command has been renamed to `Sylius\Bundle\ApiBundle\Command\Account\RequestShopUserVerification`.
+    - The `Sylius\Bundle\ApiBundle\Command\Account\VerifyCustomerAccount` command has been renamed to `Sylius\Bundle\ApiBundle\Command\Account\VerifyShopUser`.
+    - The `Sylius\Bundle\ApiBundle\Command\Account\ResendVerificationEmail` command has been renamed to `Sylius\Bundle\ApiBundle\Command\Account\RequestShopUserVerification`.
 
 1. **GatewayConfig**
-    - The resource is no longer exposed.
+    - The resource is no longer exposed; the endpoints `GET /api/v2/admin/gateway-configs/id` and `GET /api/v2/admin/payment-methods/{code}/gateway-config` are no longer available.
 
 1. **Translation**
-    - All translation resources are no longer exposed.
+    - All translation resources are no longer exposed, as each one is now integrated into its main resource.
 
 1. **ChannelPriceHistoryConfig**
-    - The resource configuration has been removed, as it is now handled by the `Channel` resource.
+    - The resource configuration has been removed, as it is now managed by the `Channel` resource. The endpoints `GET /api/v2/admin/channel-price-history-configs/{id}` and `PUT /api/v2/admin/channel-price-history-configs/{id}` are no longer available.
 
 1. **ShopBillingData**
-    - The resource configuration has been removed, as it is now handled by the `Channel` resource.
+    - The resource configuration has been removed, as it is now managed by the `Channel` resource. The endpoints `GET /api/v2/admin/shop-billing-datas/{id}` and `GET /api/v2/admin/channels/{code}/shop-billing-data` are no longer available.
 
 1. **ZoneMember**
-    - The resource configuration has been removed, as it is now handled by the `Zone` resource.
+    - The resource configuration has been removed, as it is now managed by the `Zone` resource. The endpoints `GET /api/v2/admin/zone-members/{id}` and `GET /api/v2/admin/zones/{code}/members` are no longer available.
 
 1. **ProductOptionValueTranslation**
-    - There has been added a new resource configuration for the `ProductOptionValueTranslation` resource.
+    - A new resource configuration has been added for the `ProductOptionValueTranslation` resource it is now possible to manage translations for product option values.

src/Sylius/Bundle/AdminBundle/DependencyInjection/Configuration.php

@@ -41,6 +41,20 @@ final class Configuration implements ConfigurationInterface
                         ->end()
                     ->end()
                 ->end()
+                ->arrayNode('twig')
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->arrayNode('payment_method')
+                            ->addDefaultsIfNotSet()
+                            ->children()
+                                ->arrayNode('excluded_gateways')
+                                    ->scalarPrototype()->end()
+                                    ->defaultValue([])
+                                ->end()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
             ->end()
         ;
 

src/Sylius/Bundle/AdminBundle/DependencyInjection/SyliusAdminExtension.php

@@ -29,6 +29,7 @@ final class SyliusAdminExtension extends Extension
         $container->setParameter('sylius.admin.notification.hub_enabled', $config['notifications']['hub_enabled']);
         $container->setParameter('sylius.admin.notification.frequency', $config['notifications']['frequency']);
         $container->setParameter('sylius.admin.shop_enabled', false);
+        $container->setParameter('sylius.admin.twig.payment_method.excluded_gateways', $config['twig']['payment_method']['excluded_gateways']);
 
         if ($container->hasParameter('kernel.bundles')) {
             $bundles = $container->getParameter('kernel.bundles');

src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/security/login.yaml

@@ -1,6 +1,11 @@
 sylius_twig_hooks:
     hooks:
         'sylius_admin.security.login':
+            page:
+                template: '@SyliusAdmin/security/common/page.html.twig'
+                priority: 0
+
+        'sylius_admin.security.login.page':
             logo:
                 template: '@SyliusAdmin/security/common/logo.html.twig'
                 priority: 100
@@ -8,38 +13,38 @@ sylius_twig_hooks:
                 template: '@SyliusAdmin/security/common/content.html.twig'
                 priority: 0
 
-        'sylius_admin.security.login.logo':
-            logo:
+        'sylius_admin.security.login.page.logo':
+            image:
                 template: '@SyliusAdmin/security/common/logo/image.html.twig'
                 priority: 0
 
-        'sylius_admin.security.login.content':
+        'sylius_admin.security.login.page.content':
             header:
-                template: '@SyliusAdmin/security/login/content/header.html.twig'
+                template: '@SyliusAdmin/security/login/page/content/header.html.twig'
                 priority: 200
             flashes:
                 template: '@SyliusAdmin/shared/crud/common/content/flashes.html.twig'
                 priority: 100
             form:
-                template: '@SyliusAdmin/security/login/content/form.html.twig'
+                template: '@SyliusAdmin/security/login/page/content/form.html.twig'
                 priority: 0
 
-        'sylius_admin.security.login.content.form':
+        'sylius_admin.security.login.page.content.form':
             error:
-                template: '@SyliusAdmin/security/login/content/form/error.html.twig'
+                template: '@SyliusAdmin/security/login/page/content/form/error.html.twig'
                 priority: 500
             username:
-                template: '@SyliusAdmin/security/login/content/form/username.html.twig'
+                template: '@SyliusAdmin/security/login/page/content/form/username.html.twig'
                 priority: 400
             password:
-                template: '@SyliusAdmin/security/login/content/form/password.html.twig'
+                template: '@SyliusAdmin/security/login/page/content/form/password.html.twig'
                 priority: 300
             remember_me:
-                template: '@SyliusAdmin/security/login/content/form/remember_me.html.twig'
+                template: '@SyliusAdmin/security/login/page/content/form/remember_me.html.twig'
                 priority: 200
             submit:
-                template: '@SyliusAdmin/security/login/content/form/submit.html.twig'
+                template: '@SyliusAdmin/security/login/page/content/form/submit.html.twig'
                 priority: 100
             forgot_password:
-                template: '@SyliusAdmin/security/login/content/form/forgot_password.html.twig'
+                template: '@SyliusAdmin/security/login/page/content/form/forgot_password.html.twig'
                 priority: 0

src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/security/request_password_reset.yaml

@@ -1,6 +1,11 @@
 sylius_twig_hooks:
     hooks:
         'sylius_admin.security.request_password_reset':
+            page:
+                template: '@SyliusAdmin/security/common/page.html.twig'
+                priority: 0
+
+        'sylius_admin.security.request_password_reset.page':
             logo:
                 template: '@SyliusAdmin/security/common/logo.html.twig'
                 priority: 100
@@ -8,15 +13,20 @@ sylius_twig_hooks:
                 template: '@SyliusAdmin/security/common/content.html.twig'
                 priority: 0
 
-        'sylius_admin.security.request_password_reset.content':
-            form:
-                template: '@SyliusAdmin/security/request_password_reset/content/form.html.twig'
+        'sylius_admin.security.request_password_reset.page.logo':
+            image:
+                template: '@SyliusAdmin/security/common/logo/image.html.twig'
                 priority: 0
 
-        'sylius_admin.security.request_password_reset.content.form':
+        'sylius_admin.security.request_password_reset.page.content':
+            form:
+                template: '@SyliusAdmin/security/request_password_reset/page/content/form.html.twig'
+                priority: 0
+
+        'sylius_admin.security.request_password_reset.page.content.form':
             email:
-                template: '@SyliusAdmin/security/request_password_reset/content/form/email.html.twig'
+                template: '@SyliusAdmin/security/request_password_reset/page/content/form/email.html.twig'
                 priority: 100
             submit:
-                template: '@SyliusAdmin/security/request_password_reset/content/form/submit.html.twig'
+                template: '@SyliusAdmin/security/request_password_reset/page/content/form/submit.html.twig'
                 priority: 0

src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/security/reset_password.yaml

@@ -1,6 +1,11 @@
 sylius_twig_hooks:
     hooks:
         'sylius_admin.security.reset_password':
+            page:
+                template: '@SyliusAdmin/security/common/page.html.twig'
+                priority: 0
+
+        'sylius_admin.security.reset_password.page':
             logo:
                 template: '@SyliusAdmin/security/common/logo.html.twig'
                 priority: 100
@@ -8,15 +13,20 @@ sylius_twig_hooks:
                 template: '@SyliusAdmin/security/common/content.html.twig'
                 priority: 0
 
-        'sylius_admin.security.reset_password.content':
-            form:
-                template: '@SyliusAdmin/security/reset_password/content/form.html.twig'
+        'sylius_admin.security.reset_password.page.logo':
+            image:
+                template: '@SyliusAdmin/security/common/logo/image.html.twig'
                 priority: 0
 
-        'sylius_admin.security.reset_password.content.form':
+        'sylius_admin.security.reset_password.page.content':
+            form:
+                template: '@SyliusAdmin/security/reset_password/page/content/form.html.twig'
+                priority: 0
+
+        'sylius_admin.security.reset_password.page.content.form':
             password:
-                template: '@SyliusAdmin/security/reset_password/content/form/password.html.twig'
+                template: '@SyliusAdmin/security/reset_password/page/content/form/password.html.twig'
                 priority: 100
             submit:
-                template: '@SyliusAdmin/security/reset_password/content/form/submit.html.twig'
+                template: '@SyliusAdmin/security/reset_password/page/content/form/submit.html.twig'
                 priority: 0

src/Sylius/Bundle/AdminBundle/Resources/config/routing/admin_user.yml

@@ -10,13 +10,6 @@ sylius_admin_admin_user:
         form:
             type: Sylius\Bundle\AdminBundle\Form\Type\AdminUserType
         permission: true
-        vars:
-            all:
-                subheader: sylius.ui.manage_users_able_to_access_administration_panel
-                templates:
-                    form: "@SyliusAdmin/AdminUser/_form.html.twig"
-            index:
-                icon: "tabler:lock"
     type: sylius.resource
 
 sylius_admin_admin_user_remove_avatar:

src/Sylius/Bundle/AdminBundle/Resources/config/routing/channel.yml

@@ -9,11 +9,4 @@ sylius_admin_channel:
         form:
             type: Sylius\Bundle\AdminBundle\Form\Type\ChannelType
         permission: true
-        vars:
-            all:
-                subheader: sylius.ui.configure_channels_available_in_your_store
-                templates:
-                    form: "@SyliusAdmin/Channel/_form.html.twig"
-            index:
-                icon: "tabler:share"
     type: sylius.resource

src/Sylius/Bundle/AdminBundle/Resources/config/routing/country.yml

@@ -9,9 +9,4 @@ sylius_admin_country:
         form:
             type: Sylius\Bundle\AdminBundle\Form\Type\CountryType
         permission: true
-        vars:
-            all:
-                subheader: sylius.ui.manage_shipping_destinations
-            index:
-                icon: "tabler:flag"
     type: sylius.resource

src/Sylius/Bundle/AdminBundle/Resources/config/routing/customer.yml

@@ -9,13 +9,6 @@ sylius_admin_customer:
         form:
             type: Sylius\Bundle\AdminBundle\Form\Type\CustomerType
         permission: true
-        vars:
-            all:
-                subheader: sylius.ui.manage_your_customers
-                templates:
-                    form: "@SyliusAdmin/Customer/_form.html.twig"
-            index:
-                icon: "tabler:users"
     type: sylius.resource
 
 sylius_admin_customer_order_index:

src/Sylius/Bundle/AdminBundle/Resources/config/routing/customer_group.yml

@@ -9,12 +9,4 @@ sylius_admin_customer_group:
         form:
             type: Sylius\Bundle\AdminBundle\Form\Type\CustomerGroupType
         permission: true
-        vars:
-            all:
-                header: sylius.ui.customer_groups
-                subheader: sylius.ui.manage_customer_groups
-                templates:
-                    form: "@SyliusAdmin/CustomerGroup/_form.html.twig"
-            index:
-                icon: "tabler:archive"
     type: sylius.resource

src/Sylius/Bundle/AdminBundle/Resources/config/routing/locale.yml

@@ -9,13 +9,6 @@ sylius_admin_locale:
         form:
             type: Sylius\Bundle\AdminBundle\Form\Type\LocaleType
         permission: true
-        vars:
-            all:
-                subheader: sylius.ui.manage_languages_available_in_the_store
-                templates:
-                    form: "@SyliusAdmin/Locale/_form.html.twig"
-            index:
-                icon: "tabler:bubble-text"
     type: sylius.resource
 
 sylius_admin_locale_delete:

src/Sylius/Bundle/AdminBundle/Resources/config/routing/order.yml

@@ -8,11 +8,6 @@ sylius_admin_order:
         form:
             type: Sylius\Bundle\AdminBundle\Form\Type\OrderType
         permission: true
-        vars:
-            all:
-                subheader: sylius.ui.process_your_orders
-            index:
-                icon: "tabler:shopping-cart"
     type: sylius.resource
 
 sylius_admin_order_show:

src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment.yml

@@ -6,11 +6,6 @@ sylius_admin_payment:
         only: ['index']
         grid: sylius_admin_payment
         permission: true
-        vars:
-            all:
-                subheader: sylius.ui.manage_payments
-            index:
-                icon: "tabler:credit-card-pay"
     type: sylius.resource
 
 sylius_admin_payment_complete:

src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment_method.yml

@@ -9,13 +9,6 @@ sylius_admin_payment_method:
         form:
             type: Sylius\Bundle\AdminBundle\Form\Type\PaymentMethodType
         permission: true
-        vars:
-            all:
-                subheader: sylius.ui.manage_payment_methods_available_to_your_customers
-                templates:
-                    form: "@SyliusAdmin/PaymentMethod/_form.html.twig"
-            index:
-                icon: "tabler:credit-card-pay"
     type: sylius.resource
 
 sylius_admin_payment_method_create:

src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml

@@ -8,13 +8,6 @@ sylius_admin_product:
         form:
             type: Sylius\Bundle\AdminBundle\Form\Type\ProductType
         permission: true
-        vars:
-            all:
-                subheader: sylius.ui.manage_your_product_catalog
-                templates:
-                    form: "@SyliusAdmin/Product/_form.html.twig"
-            index:
-                icon: "tabler:cube"
     type: sylius.resource
 
 sylius_admin_product_create_simple:

src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_association_type.yml

@@ -9,11 +9,4 @@ sylius_admin_product_association_type:
         grid: sylius_admin_product_association_type
         form:
             type: Sylius\Bundle\AdminBundle\Form\Type\ProductAssociationTypeType
-        vars:
-            all:
-                subheader: sylius.ui.manage_association_types_of_your_products
-                templates:
-                    form: "@SyliusAdmin/ProductAssociationType/_form.html.twig"
-            index:
-                icon: "tabler:subtask"
     type: sylius.resource

src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_attribute.yml

@@ -9,13 +9,6 @@ sylius_admin_product_attribute:
         form:
             type: Sylius\Bundle\AdminBundle\Form\Type\ProductAttributeType
         permission: true
-        vars:
-            all:
-                subheader: sylius.ui.manage_attributes_of_your_products
-                templates:
-                    form: "@SyliusAdmin/ProductAttribute/_form.html.twig"
-            index:
-                icon: "tabler:cube-spark"
     type: sylius.resource
 
 sylius_admin_product_attribute_create:

src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_option.yml

@@ -9,11 +9,4 @@ sylius_admin_product_option:
         form:
             type: Sylius\Bundle\AdminBundle\Form\Type\ProductOptionType
         permission: true
-        vars:
-            all:
-                subheader: sylius.ui.manage_configuration_options_of_your_products
-                templates:
-                    form: "@SyliusAdmin/ProductOption/_form.html.twig"
-            index:
-                icon: "tabler:settings"
     type: sylius.resource

src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_review.yml

@@ -9,13 +9,6 @@ sylius_admin_product_review:
         grid: sylius_admin_product_review
         form:
             type: Sylius\Bundle\AdminBundle\Form\Type\ProductReviewType
-        vars:
-            all:
-                subheader: sylius.ui.manage_reviews_of_your_products
-                templates:
-                    form: "@SyliusAdmin/ProductReview/_form.html.twig"
-            index:
-                icon: "tabler:news"
     type: sylius.resource
 
 sylius_admin_product_review_accept:

src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_variant.yml

@@ -13,7 +13,6 @@ sylius_admin_product_variant_index:
                 route:
                     parameters:
                         productId: $productId
-                subheader: sylius.ui.manage_variants
 
 sylius_admin_product_variant_create:
     path: /new

src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion.yml

@@ -9,17 +9,6 @@ sylius_admin_promotion:
         form:
             type: Sylius\Bundle\AdminBundle\Form\Type\PromotionType
         permission: true
-        vars:
-            all:
-                subheader: sylius.ui.manage_discounts_and_promotional_campaigns
-                templates:
-                    form: "@SyliusAdmin/Promotion/_form.html.twig"
-            index:
-                icon: "tabler:shopping-cart-down"
-            update:
-                templates:
-                    form: "@SyliusAdmin/Promotion/_form.html.twig"
-                    toolbar: "@SyliusAdmin/Promotion/_toolbar.html.twig"
     type: sylius.resource
 
 sylius_admin_promotion_archive:

src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipment.yml

@@ -6,11 +6,6 @@ sylius_admin_shipment:
         only: ['index', 'show']
         grid: sylius_admin_shipment
         permission: true
-        vars:
-            all:
-                subheader: sylius.ui.manage_shipments
-            index:
-                icon: "tabler:truck"
     type: sylius.resource
 
 sylius_admin_shipment_ship:

src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipping_category.yml

@@ -9,11 +9,4 @@ sylius_admin_shipping_category:
         form:
             type: Sylius\Bundle\AdminBundle\Form\Type\ShippingCategoryType
         permission: true
-        vars:
-            all:
-                subheader: sylius.ui.manage_shipping_categories_for_your_store
-                templates:
-                    form: "@SyliusAdmin/ShippingCategory/_form.html.twig"
-            index:
-                icon: "tabler:layout-list"
     type: sylius.resource

src/Sylius/Bundle/AdminBundle/Resources/config/routing/tax_category.yml

@@ -9,11 +9,4 @@ sylius_admin_tax_category:
         form:
             type: Sylius\Bundle\AdminBundle\Form\Type\TaxCategoryType
         permission: true
-        vars:
-            all:
-                subheader: sylius.ui.manage_taxation_of_your_products
-                templates:
-                    form: "@SyliusAdmin/TaxCategory/_form.html.twig"
-            index:
-                icon: "tabler:tags"
     type: sylius.resource

src/Sylius/Bundle/AdminBundle/Resources/config/routing/zone.yml

@@ -9,11 +9,6 @@ sylius_admin_zone:
         form:
             type: Sylius\Bundle\AdminBundle\Form\Type\ZoneType
         permission: true
-        vars:
-            all:
-                subheader: sylius.ui.manage_geographical_zones
-            index:
-                icon: "tabler:world"
     type: sylius.resource
 
 sylius_admin_zone_create:
@@ -33,7 +28,6 @@ sylius_admin_zone_create:
             redirect: sylius_admin_zone_update
             permission: true
             vars:
-                subheader: sylius.ui.manage_geographical_zones
                 route:
                     parameters:
                         type: $type

src/Sylius/Bundle/AdminBundle/Resources/config/services/twig.xml

@@ -51,6 +51,7 @@
 
         <service id="sylius_admin.twig.extension.payment_method" class="Sylius\Bundle\AdminBundle\Twig\PaymentMethodExtension">
             <argument>%sylius.gateway_factories%</argument>
+            <argument>%sylius.admin.twig.payment_method.excluded_gateways%</argument>
             <tag name="twig.extension" />
         </service>
 

src/Sylius/Bundle/AdminBundle/Tests/DependencyInjection/ConfigurationTest.php

@@ -41,6 +41,26 @@ final class ConfigurationTest extends TestCase
         );
     }
 
+    /** @test */
+    public function it_sets_default_twigs_payment_method_excluded_gateways(): void
+    {
+        $this->assertProcessedConfigurationEquals(
+            [[]],
+            ['twig' => ['payment_method' => ['excluded_gateways' => []]]],
+            'twig.payment_method.excluded_gateways',
+        );
+    }
+
+    /** @test */
+    public function it_allows_to_configure_twigs_payment_method_excluded_gateways(): void
+    {
+        $this->assertProcessedConfigurationEquals(
+            [['twig' => ['payment_method' => ['excluded_gateways' => ['offline-test']]]]],
+            ['twig' => ['payment_method' => ['excluded_gateways' => ['offline-test']]]],
+            'twig.payment_method.excluded_gateways',
+        );
+    }
+
     protected function getConfiguration(): Configuration
     {
         return new Configuration();

src/Sylius/Bundle/AdminBundle/Tests/DependencyInjection/SyliusAdminExtensionTest.php

@@ -28,6 +28,16 @@ final class SyliusAdminExtensionTest extends AbstractExtensionTestCase
         $this->assertContainerBuilderHasParameter('sylius.admin.notification.hub_enabled', false);
     }
 
+    /** @test */
+    public function it_loads_twig_payment_method_excluded_gateways_properly(): void
+    {
+        $this->container->setParameter('kernel.environment', 'dev');
+
+        $this->load(['twig' => ['payment_method' => ['excluded_gateways' => ['offline-test']]]]);
+
+        $this->assertContainerBuilderHasParameter('sylius.admin.twig.payment_method.excluded_gateways', ['offline-test']);
+    }
+
     protected function getContainerExtensions(): array
     {
         return [new SyliusAdminExtension()];

src/Sylius/Bundle/AdminBundle/Tests/Twig/PaymentMethodExtensionTest.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Sylius Sp. z o.o.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\AdminBundle\Tests\Twig;
+
+use PHPUnit\Framework\TestCase;
+use Sylius\Bundle\AdminBundle\Twig\PaymentMethodExtension;
+
+final class PaymentMethodExtensionTest extends TestCase
+{
+    /** @test */
+    public function it_gets_payment_gateways(): void
+    {
+        $gatewayFactories = ['offline' => 'Offline', 'stripe' => 'Stripe'];
+        $excludedGatewayFactories = ['offline'];
+
+        $paymentMethodExtension = new PaymentMethodExtension($gatewayFactories, $excludedGatewayFactories);
+
+        $paymentGateways = $paymentMethodExtension->getPaymentGateways();
+
+        $this->assertArrayHasKey('stripe', $paymentGateways);
+        $this->assertArrayNotHasKey('offline', $paymentGateways);
+    }
+}

src/Sylius/Bundle/AdminBundle/Twig/PaymentMethodExtension.php

@@ -20,9 +20,12 @@ final class PaymentMethodExtension extends AbstractExtension
 {
     /**
      * @param array<string, string> $gatewayFactories
+     * @param array<string> $excludedGatewayFactories
      */
-    public function __construct(private readonly array $gatewayFactories)
-    {
+    public function __construct(
+        private readonly array $gatewayFactories,
+        private readonly array $excludedGatewayFactories = [],
+    ) {
     }
 
     public function getFunctions(): array
@@ -37,6 +40,10 @@ final class PaymentMethodExtension extends AbstractExtension
      */
     public function getPaymentGateways(): array
     {
-        return $this->gatewayFactories;
+        return array_filter(
+            $this->gatewayFactories,
+            fn (string $gatewayFactory) => !in_array($gatewayFactory, $this->excludedGatewayFactories, true),
+            ARRAY_FILTER_USE_KEY
+        );
     }
 }

src/Sylius/Bundle/AdminBundle/templates/security/common/page.html.twig

@@ -0,0 +1,5 @@
+<div class="page page-center">
+    <div class="container container-tight py-4">
+        {% hook 'page' %}
+    </div>
+</div>

src/Sylius/Bundle/AdminBundle/templates/security/login.html.twig

@@ -5,9 +5,5 @@
 {% block body_class %}d-flex flex-column{% endblock %}
 
 {% block body %}
-    <div class="page page-center">
-        <div class="container container-tight py-4">
     {% hook 'sylius_admin.security.login' with { form, last_error, last_username } %}
-        </div>
-    </div>
 {% endblock %}

src/Sylius/Bundle/AdminBundle/templates/security/request_password_reset.html.twig

@@ -5,9 +5,5 @@
 {% block body_class %}d-flex flex-column{% endblock %}
 
 {% block body %}
-    <div class="page page-center">
-        <div class="container container-tight py-4">
     {% hook 'sylius_admin.security.request_password_reset' with { form } %}
-        </div>
-    </div>
 {% endblock %}

src/Sylius/Bundle/AdminBundle/templates/security/reset_password.html.twig

@@ -5,9 +5,5 @@
 {% block body_class %}d-flex flex-column{% endblock %}
 
 {% block body %}
-    <div class="page page-center">
-        <div class="container container-tight py-4">
     {% hook 'sylius_admin.security.reset_password' with { form } %}
-        </div>
-    </div>
 {% endblock %}

src/Sylius/Bundle/AdminBundle/templates/shared/helper/dropdown.html.twig

@@ -31,7 +31,8 @@
             {% set item = {
                 type: null,
                 class: null,
-                icon: null
+                icon: null,
+                attributes: {}
             }|merge(item) %}
 
             {% if item.type == 'header' %}
@@ -40,7 +41,7 @@
                 <hr class="dropdown-divider">
             {% else %}
                 {% set extra_class = item.class ? ' ' ~ item.class %}
-                <a class="dropdown-item{{ item.class ? extra_class }}" href="{{ item.url }}" {{ sylius_test_html_attribute('user-dropdown-item', item.title|trans({}, null, 'en_US')) }}>
+                <a class="dropdown-item{{ item.class ? extra_class }}" href="{{ item.url }}" {{ sylius_test_html_attribute('user-dropdown-item', item.title|trans({}, null, 'en_US')) }} {% for attr, value in item.attributes %}{{ attr }}="{{ value }}" {% endfor %}>
                     {{ item.icon ? ux_icon(item.icon, {'class': 'icon dropdown-item-icon ' ~ extra_class }) }}
                     {{ item.title|trans }}
                 </a>

src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml

@@ -215,8 +215,8 @@
             <argument type="service" id="sylius.repository.payment" />
             <argument type="service" id="sylius.factory.payment_request" />
             <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="sylius.provider.default_action" />
-            <argument type="service" id="sylius.provider.default_payload" />
+            <argument type="service" id="sylius.provider.payment_request.default_action" />
+            <argument type="service" id="sylius.provider.payment_request.default_payload" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
         </service>
 

src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml

@@ -197,7 +197,7 @@
         <service id="sylius_api.validator.chosen_payment_request_action_eligibility" class="Sylius\Bundle\ApiBundle\Validator\Constraints\ChosenPaymentRequestActionEligibilityValidator">
             <argument type="service" id="sylius.repository.payment_method" />
             <argument type="service" id="sylius.command_provider.payment_request.default" />
-            <argument type="service" id="sylius.provider.gateway_factory_name" />
+            <argument type="service" id="sylius.provider.payment_request.gateway_factory_name" />
             <tag name="validator.constraint_validator" alias="sylius_api_chosen_payment_request_action_eligibility" />
         </service>
 

src/Sylius/Bundle/CoreBundle/DependencyInjection/Configuration.php

@@ -29,6 +29,7 @@ use Sylius\Component\Core\Model\ChannelPricing;
 use Sylius\Component\Core\Model\ChannelPricingInterface;
 use Sylius\Component\Core\Model\ChannelPricingLogEntry;
 use Sylius\Component\Core\Model\ChannelPricingLogEntryInterface;
+use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Core\Model\ProductImage;
 use Sylius\Component\Core\Model\ProductImageInterface;
 use Sylius\Component\Core\Model\ProductTaxon;
@@ -135,6 +136,20 @@ final class Configuration implements ConfigurationInterface
                     ->prototype('scalar')->end()
                     ->defaultValue(['image/jpeg', 'image/png', 'image/gif', 'image/webp'])
                 ->end()
+                ->arrayNode('checkout')
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->arrayNode('payment')
+                            ->addDefaultsIfNotSet()
+                            ->children()
+                                ->arrayNode('allowed_states')
+                                    ->prototype('scalar')->end()
+                                    ->defaultValue([PaymentInterface::STATE_NEW, PaymentInterface::STATE_CART])
+                                ->end()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
             ->end()
         ;
 

src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php

@@ -73,6 +73,7 @@ final class SyliusCoreExtension extends AbstractResourceExtension implements Pre
         $container->setParameter('sylius_core.orders_statistics.intervals_map', $config['orders_statistics']['intervals_map'] ?? []);
         $container->setParameter('sylius_core.max_int_value', $config['max_int_value']);
         $container->setParameter('sylius_core.allowed_images_mime_types', $config['allowed_images_mime_types']);
+        $container->setParameter('sylius_core.checkout.payment.allowed_states', $config['checkout']['payment']['allowed_states']);
 
         /** @var string $env */
         $env = $container->getParameter('kernel.environment');

src/Sylius/Bundle/CoreBundle/Form/Type/Checkout/ChangePaymentMethodType.php

@@ -22,6 +22,11 @@ use Symfony\Component\Form\FormEvents;
 
 final class ChangePaymentMethodType extends AbstractType
 {
+    /** @param array<string> $allowedPaymentStates */
+    public function __construct(private readonly array $allowedPaymentStates = [PaymentInterface::STATE_NEW, PaymentInterface::STATE_CART])
+    {
+    }
+
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event): void {
@@ -29,7 +34,7 @@ final class ChangePaymentMethodType extends AbstractType
             $form = $event->getForm();
 
             foreach ($payments as $key => $payment) {
-                if (!in_array($payment->getState(), [PaymentInterface::STATE_NEW, PaymentInterface::STATE_CART], true)) {
+                if (!in_array($payment->getState(), $this->allowedPaymentStates, true)) {
                     $form->remove((string) $key);
                 }
             }

src/Sylius/Bundle/CoreBundle/Resources/config/services/checkout.xml

@@ -74,5 +74,10 @@
             <argument>%sylius.form.type.checkout_complete.validation_groups%</argument>
             <tag name="form.type" />
         </service>
+
+        <service id="sylius.form.type.checkout.change_payment_method" class="Sylius\Bundle\CoreBundle\Form\Type\Checkout\ChangePaymentMethodType">
+            <argument>%sylius_core.checkout.payment.allowed_states%</argument>
+            <tag name="form.type" />
+        </service>
     </services>
 </container>

src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/controllers.xml

@@ -38,7 +38,7 @@
             </argument>
             <argument type="service" id="sylius.resource_controller.request_configuration_factory" />
             <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="sylius.processor.http_response" />
+            <argument type="service" id="sylius.processor.payment_request.http_response" />
         </service>
 
     </services>

src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml

@@ -34,8 +34,8 @@
         <service abstract="true" id="sylius.provider.order_pay.pay_response.payment_request" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestPayResponseProvider">
             <argument type="service" id="sylius.factory.payment_request" />
             <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="sylius.provider.default_action" />
-            <argument type="service" id="sylius.provider.default_payload" />
+            <argument type="service" id="sylius.provider.payment_request.default_action" />
+            <argument type="service" id="sylius.provider.payment_request.default_payload" />
             <argument type="service" id="sylius.checker.finalized_payment_request" />
         </service>
 
@@ -45,7 +45,7 @@
 
         <service abstract="true" id="sylius.provider.order_pay.after_pay_response.payment_request" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestAfterPayResponseProvider">
             <argument type="service" id="sylius.factory.payment_request" />
-            <argument type="service" id="sylius.processor.http_response" />
+            <argument type="service" id="sylius.processor.payment_request.http_response" />
             <argument type="service" id="sylius.repository.payment_request" />
         </service>
     </services>

src/Sylius/Bundle/CoreBundle/Tests/DependencyInjection/ConfigurationTest.php

@@ -214,6 +214,26 @@ final class ConfigurationTest extends TestCase
         );
     }
 
+    /** @test */
+    public function it_sets_default_checkout_payment_allowed_states(): void
+    {
+        $this->assertProcessedConfigurationEquals(
+            [[]],
+            ['checkout' => ['payment' => ['allowed_states' => ['new', 'cart']]]],
+            'checkout',
+        );
+    }
+
+    /** @test */
+    public function it_allows_setting_custom_checkout_payment_allowed_states(): void
+    {
+        $this->assertProcessedConfigurationEquals(
+            [['checkout' => ['payment' => ['allowed_states' => ['new', 'cart', 'pending']]]]],
+            ['checkout' => ['payment' => ['allowed_states' => ['new', 'cart', 'pending']]]],
+            'checkout',
+        );
+    }
+
     protected function getConfiguration(): ConfigurationInterface
     {
         return new Configuration();

src/Sylius/Bundle/CoreBundle/Tests/DependencyInjection/SyliusCoreExtensionTest.php

@@ -374,6 +374,16 @@ final class SyliusCoreExtensionTest extends AbstractExtensionTestCase
         ]);
     }
 
+    /** @test */
+    public function it_loads_checkout_payment_allowed_states_configuration_properly(): void
+    {
+        $this->container->setParameter('kernel.environment', 'dev');
+
+        $this->load(['checkout' => ['payment' => ['allowed_states' => ['new', 'test']]]]);
+
+        $this->assertContainerBuilderHasParameter('sylius_core.checkout.payment.allowed_states', ['new', 'test']);
+    }
+
     protected function getContainerExtensions(): array
     {
         return [new SyliusCoreExtension()];

src/Sylius/Bundle/PaymentBundle/Resources/config/services/command_provider.xml

@@ -19,7 +19,7 @@
     <services>
         <service id="sylius.command_provider.gateway_factory" class="Sylius\Bundle\PaymentBundle\CommandProvider\GatewayFactoryCommandProvider">
             <argument type="service" id="sylius.checker.payment_request_duplication" />
-            <argument type="service" id="sylius.provider.gateway_factory_name" />
+            <argument type="service" id="sylius.provider.payment_request.gateway_factory_name" />
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider" index-by="gateway-factory" />
         </service>
         <service id="sylius.command_provider.payment_request.default" alias="sylius.command_provider.gateway_factory" />

src/Sylius/Bundle/PaymentBundle/Resources/config/services/controllers.xml

@@ -22,20 +22,20 @@
         <service id="sylius.controller.payment_request_notify" class="Sylius\Bundle\PaymentBundle\Action\PaymentRequestNotifyAction">
             <argument type="service" id="sylius.repository.payment_request" />
             <argument type="service" id="sylius.checker.finalized_payment_request" />
-            <argument type="service" id="sylius.processor.notify_payload" />
+            <argument type="service" id="sylius.processor.payment_request.notify_payload" />
             <argument type="service" id="sylius.manager.payment_request" />
             <argument type="service" id="sylius.announcer.payment_request" />
-            <argument type="service" id="sylius.provider.notify_response" />
+            <argument type="service" id="sylius.provider.payment_request.notify_response" />
         </service>
 
         <service id="sylius.controller.payment_method_notify" class="Sylius\Bundle\PaymentBundle\Action\PaymentMethodNotifyAction">
             <argument type="service" id="sylius.repository.payment_method" />
-            <argument type="service" id="sylius.provider.notify_payment" />
+            <argument type="service" id="sylius.provider.payment_request.notify_payment" />
             <argument type="service" id="sylius.factory.payment_request" />
-            <argument type="service" id="sylius.processor.notify_payload" />
+            <argument type="service" id="sylius.processor.payment_request.notify_payload" />
             <argument type="service" id="sylius.repository.payment_request" />
             <argument type="service" id="sylius.announcer.payment_request" />
-            <argument type="service" id="sylius.provider.notify_response" />
+            <argument type="service" id="sylius.provider.payment_request.notify_response" />
         </service>
     </services>
 </container>

src/Sylius/Bundle/PaymentBundle/Resources/config/services/processors.xml

@@ -17,15 +17,15 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
 >
     <services>
-        <service id="sylius.processor.notify_payload" class="Sylius\Bundle\PaymentBundle\Processor\NotifyPayloadProcessor">
+        <service id="sylius.processor.payment_request.notify_payload" class="Sylius\Bundle\PaymentBundle\Processor\NotifyPayloadProcessor">
             <argument type="service" id="sylius.normalizer.symfony_request" />
         </service>
-        <service id="Sylius\Bundle\PaymentBundle\Processor\NotifyPayloadProcessorInterface" alias="sylius.processor.notify_payload" />
+        <service id="Sylius\Bundle\PaymentBundle\Processor\NotifyPayloadProcessorInterface" alias="sylius.processor.payment_request.notify_payload" />
 
-        <service id="sylius.processor.http_response" class="Sylius\Bundle\PaymentBundle\Processor\HttpResponseProcessor">
+        <service id="sylius.processor.payment_request.http_response" class="Sylius\Bundle\PaymentBundle\Processor\HttpResponseProcessor">
             <argument type="service" id="sylius.announcer.payment_request" />
             <argument type="service" id="sylius.provider.http_response.default" />
         </service>
-        <service id="Sylius\Bundle\PaymentBundle\Processor\HttpResponseProcessorInterface" alias="sylius.processor.http_response" />
+        <service id="Sylius\Bundle\PaymentBundle\Processor\HttpResponseProcessorInterface" alias="sylius.processor.payment_request.http_response" />
     </services>
 </container>

src/Sylius/Bundle/PaymentBundle/Resources/config/services/provider.xml

@@ -17,38 +17,38 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
 >
     <services>
-        <service id="sylius.provider.gateway_factory_name" class="Sylius\Bundle\PaymentBundle\Provider\GatewayFactoryNameProvider" />
-        <service id="Sylius\Bundle\PaymentBundle\Provider\GatewayFactoryNameProviderInterface" alias="sylius.provider.gateway_factory_name" />
+        <service id="sylius.provider.payment_request.gateway_factory_name" class="Sylius\Bundle\PaymentBundle\Provider\GatewayFactoryNameProvider" />
+        <service id="Sylius\Bundle\PaymentBundle\Provider\GatewayFactoryNameProviderInterface" alias="sylius.provider.payment_request.gateway_factory_name" />
 
         <service id="sylius.provider.payment_request" class="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestProvider">
             <argument type="service" id="sylius.repository.payment_request" />
         </service>
         <service id="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestProviderInterface" alias="sylius.provider.payment_request" />
 
-        <service id="sylius.provider.http_response.gateway_factory" class="Sylius\Bundle\PaymentBundle\Provider\GatewayFactoryHttpResponseProvider">
-            <argument type="service" id="sylius.provider.gateway_factory_name" />
+        <service id="sylius.provider.payment_request.http_response.gateway_factory" class="Sylius\Bundle\PaymentBundle\Provider\GatewayFactoryHttpResponseProvider">
+            <argument type="service" id="sylius.provider.payment_request.gateway_factory_name" />
             <argument type="tagged_locator" tag="sylius.payment_request.provider.http_response" index-by="gateway-factory" />
         </service>
-        <service id="sylius.provider.http_response.default" alias="sylius.provider.http_response.gateway_factory" />
+        <service id="sylius.provider.http_response.default" alias="sylius.provider.payment_request.http_response.gateway_factory" />
 
-        <service id="sylius.provider.default_action" class="Sylius\Bundle\PaymentBundle\Provider\DefaultActionProvider" />
-        <service id="Sylius\Bundle\PaymentBundle\Provider\DefaultActionProviderInterface" alias="sylius.provider.default_action" />
+        <service id="sylius.provider.payment_request.default_action" class="Sylius\Bundle\PaymentBundle\Provider\DefaultActionProvider" />
+        <service id="Sylius\Bundle\PaymentBundle\Provider\DefaultActionProviderInterface" alias="sylius.provider.payment_request.default_action" />
 
-        <service id="sylius.provider.default_payload" class="Sylius\Bundle\PaymentBundle\Provider\DefaultPayloadProvider" />
-        <service id="Sylius\Bundle\PaymentBundle\Provider\DefaultPayloadProviderInterface" alias="sylius.provider.default_payload" />
+        <service id="sylius.provider.payment_request.default_payload" class="Sylius\Bundle\PaymentBundle\Provider\DefaultPayloadProvider" />
+        <service id="Sylius\Bundle\PaymentBundle\Provider\DefaultPayloadProviderInterface" alias="sylius.provider.payment_request.default_payload" />
 
-        <service id="sylius.provider.http_response.offline" class="Sylius\Bundle\PaymentBundle\Provider\ActionsHttpResponseProvider">
-            <argument type="tagged_locator" tag="sylius.provider.http_response.offline" index-by="action" />
+        <service id="sylius.provider.payment_request.http_response.offline" class="Sylius\Bundle\PaymentBundle\Provider\ActionsHttpResponseProvider">
+            <argument type="tagged_locator" tag="sylius.provider.payment_request.http_response.offline" index-by="action" />
             <tag name="sylius.payment_request.provider.http_response" gateway-factory="offline" />
         </service>
 
-        <service id="sylius.provider.notify_payment" class="Sylius\Bundle\PaymentBundle\Provider\CompositeNotifyPaymentProvider">
+        <service id="sylius.provider.payment_request.notify_payment" class="Sylius\Bundle\PaymentBundle\Provider\CompositeNotifyPaymentProvider">
             <argument type="tagged_iterator" tag="sylius.payment_request.payment_notify_provider" />
         </service>
-        <service id="sylius.provider.notify_payment.composite" alias="sylius.provider.notify_payment" />
-        <service id="Sylius\Bundle\PaymentBundle\Provider\NotifyPaymentProviderInterface" alias="sylius.provider.notify_payment" />
+        <service id="sylius.provider.payment_request.notify_payment.composite" alias="sylius.provider.payment_request.notify_payment" />
+        <service id="Sylius\Bundle\PaymentBundle\Provider\NotifyPaymentProviderInterface" alias="sylius.provider.payment_request.notify_payment" />
 
-        <service id="sylius.provider.notify_response" class="Sylius\Bundle\PaymentBundle\Provider\NotifyResponseProvider" />
-        <service id="Sylius\Bundle\PaymentBundle\Provider\NotifyResponseProviderInterface" alias="sylius.provider.notify_response" />
+        <service id="sylius.provider.payment_request.notify_response" class="Sylius\Bundle\PaymentBundle\Provider\NotifyResponseProvider" />
+        <service id="Sylius\Bundle\PaymentBundle\Provider\NotifyResponseProviderInterface" alias="sylius.provider.payment_request.notify_response" />
     </services>
 </container>

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/address_book/create.yaml

@@ -1,45 +1,45 @@
 sylius_twig_hooks:
     hooks:
-        'sylius_shop.account.address_book.create':
+        'sylius_shop.account.address_book.create.content':
             breadcrumbs:
-                template: '@SyliusShop/account/address_book/create/breadcrumbs.html.twig'
+                template: '@SyliusShop/account/address_book/create/content/breadcrumbs.html.twig'
                 priority: 200
             menu:
-                template: '@SyliusShop/account/common/layout/menu.html.twig'
+                template: '@SyliusShop/account/common/content/menu.html.twig'
                 priority: 100
-            content:
-                template: '@SyliusShop/account/common/layout/content.html.twig'
+            main:
+                template: '@SyliusShop/account/common/content/main.html.twig'
                 priority: 0
 
-        'sylius_shop.account.address_book.create.content':
+        'sylius_shop.account.address_book.create.content.main':
             form:
                 component: 'sylius_shop:account:address:form'
                 props:
                     form: '@=_context.form'
                     resource: '@=_context.address'
-                    template: '@SyliusShop/account/address_book/common/content/form.html.twig'
+                    template: '@SyliusShop/account/address_book/common/main/form.html.twig'
                 priority: 0
 
-        'sylius_shop.account.address_book.create.content.header':
+        'sylius_shop.account.address_book.create.content.main.header':
             title:
-                template: '@SyliusShop/account/address_book/create/content/header/title.html.twig'
+                template: '@SyliusShop/account/address_book/create/content/main/header/title.html.twig'
                 priority: 100
             subtitle:
-                template: '@SyliusShop/account/address_book/create/content/header/subtitle.html.twig'
+                template: '@SyliusShop/account/address_book/create/content/main/header/subtitle.html.twig'
                 priority: 0
 
-        'sylius_shop.account.address_book.create.content.form':
+        'sylius_shop.account.address_book.create.content.main.form':
             fields:
-                template: '@SyliusShop/account/address_book/common/content/form/fields.html.twig'
+                template: '@SyliusShop/account/address_book/common/main/form/fields.html.twig'
                 priority: 100
             buttons:
-                template: '@SyliusShop/account/address_book/common/content/form/buttons.html.twig'
+                template: '@SyliusShop/account/address_book/common/main/form/buttons.html.twig'
                 priority: 0
 
-        'sylius_shop.account.address_book.create.content.form.buttons':
+        'sylius_shop.account.address_book.create.content.main.form.buttons':
             add:
-                template: '@SyliusShop/account/address_book/create/content/form/buttons/add.html.twig'
+                template: '@SyliusShop/account/address_book/create/content/main/form/buttons/add.html.twig'
                 priority: 100
             cancel:
-                template: '@SyliusShop/account/address_book/common/content/form/buttons/cancel.html.twig'
+                template: '@SyliusShop/account/address_book/common/main/form/buttons/cancel.html.twig'
                 priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/address_book/index.yaml

@@ -1,83 +1,83 @@
 sylius_twig_hooks:
     hooks:
-        'sylius_shop.account.address_book.index':
+        'sylius_shop.account.address_book.index.content':
             breadcrumbs:
-                template: '@SyliusShop/account/address_book/index/breadcrumbs.html.twig'
+                template: '@SyliusShop/account/address_book/index/content/breadcrumbs.html.twig'
                 priority: 200
             menu:
-                template: '@SyliusShop/account/common/layout/menu.html.twig'
+                template: '@SyliusShop/account/common/content/menu.html.twig'
                 priority: 100
-            content:
-                template: '@SyliusShop/account/common/layout/content.html.twig'
+            main:
+                template: '@SyliusShop/account/common/content/main.html.twig'
                 priority: 0
 
-        'sylius_shop.account.address_book.index.content':
+        'sylius_shop.account.address_book.index.content.main':
             buttons:
-                template: '@SyliusShop/account/address_book/index/content/buttons.html.twig'
+                template: '@SyliusShop/account/address_book/index/content/main/buttons.html.twig'
                 priority: 100
             addresses:
-                template: '@SyliusShop/account/address_book/index/content/addresses.html.twig'
+                template: '@SyliusShop/account/address_book/index/content/main/addresses.html.twig'
                 priority: 0
 
-        'sylius_shop.account.address_book.index.content.header':
+        'sylius_shop.account.address_book.index.content.main.header':
             title:
-                template: '@SyliusShop/account/address_book/index/content/header/title.html.twig'
+                template: '@SyliusShop/account/address_book/index/content/main/header/title.html.twig'
                 priority: 100
             subtitle:
-                template: '@SyliusShop/account/address_book/index/content/header/subtitle.html.twig'
+                template: '@SyliusShop/account/address_book/index/content/main/header/subtitle.html.twig'
                 priority: 0
 
-        'sylius_shop.account.address_book.index.content.buttons':
+        'sylius_shop.account.address_book.index.content.main.buttons':
             add_address:
-                template: '@SyliusShop/account/address_book/index/content/buttons/add_address.html.twig'
+                template: '@SyliusShop/account/address_book/index/content/main/buttons/add_address.html.twig'
                 priority: 0
 
-        'sylius_shop.account.address_book.index.content.addresses':
+        'sylius_shop.account.address_book.index.content.main.addresses':
             default:
-                template: '@SyliusShop/account/address_book/index/content/addresses/default.html.twig'
+                template: '@SyliusShop/account/address_book/index/content/main/addresses/default.html.twig'
                 priority: 100
             list:
-                template: '@SyliusShop/account/address_book/index/content/addresses/list.html.twig'
+                template: '@SyliusShop/account/address_book/index/content/main/addresses/list.html.twig'
                 priority: 0
 
-        'sylius_shop.account.address_book.index.content.addresses.default':
+        'sylius_shop.account.address_book.index.content.main.addresses.default':
             badge:
-                template: '@SyliusShop/account/address_book/index/content/addresses/default/badge.html.twig'
+                template: '@SyliusShop/account/address_book/index/content/main/addresses/default/badge.html.twig'
                 priority: 200
             content:
-                template: '@SyliusShop/account/address_book/common/content/address/content.html.twig'
+                template: '@SyliusShop/account/address_book/common/main/address/content.html.twig'
                 priority: 100
             actions:
-                template: '@SyliusShop/account/address_book/common/content/address/actions.html.twig'
+                template: '@SyliusShop/account/address_book/common/main/address/actions.html.twig'
                 priority: 0
 
-        'sylius_shop.account.address_book.index.content.addresses.default.actions':
+        'sylius_shop.account.address_book.index.content.main.addresses.default.actions':
             edit:
-                template: '@SyliusShop/account/address_book/common/content/address/actions/edit.html.twig'
+                template: '@SyliusShop/account/address_book/common/main/address/actions/edit.html.twig'
                 priority: 100
             delete:
-                template: '@SyliusShop/account/address_book/common/content/address/actions/delete.html.twig'
+                template: '@SyliusShop/account/address_book/common/main/address/actions/delete.html.twig'
                 priority: 0
 
-        'sylius_shop.account.address_book.index.content.addresses.list':
+        'sylius_shop.account.address_book.index.content.main.addresses.list':
             address:
-                template: '@SyliusShop/account/address_book/index/content/addresses/list/address.html.twig'
+                template: '@SyliusShop/account/address_book/index/content/main/addresses/list/address.html.twig'
                 priority: 0
 
-        'sylius_shop.account.address_book.index.content.addresses.list.address':
+        'sylius_shop.account.address_book.index.content.main.addresses.list.address':
             content:
-                template: '@SyliusShop/account/address_book/common/content/address/content.html.twig'
+                template: '@SyliusShop/account/address_book/common/main/address/content.html.twig'
                 priority: 100
             actions:
-                template: '@SyliusShop/account/address_book/common/content/address/actions.html.twig'
+                template: '@SyliusShop/account/address_book/common/main/address/actions.html.twig'
                 priority: 0
 
-        'sylius_shop.account.address_book.index.content.addresses.list.address.actions':
+        'sylius_shop.account.address_book.index.content.main.addresses.list.address.actions':
             edit:
-                template: '@SyliusShop/account/address_book/common/content/address/actions/edit.html.twig'
+                template: '@SyliusShop/account/address_book/common/main/address/actions/edit.html.twig'
                 priority: 200
             delete:
-                template: '@SyliusShop/account/address_book/common/content/address/actions/delete.html.twig'
+                template: '@SyliusShop/account/address_book/common/main/address/actions/delete.html.twig'
                 priority: 100
             set_default:
                 component: 'sylius_shop:account:address:default_form'

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/address_book/update.yaml

@@ -1,47 +1,47 @@
 sylius_twig_hooks:
     hooks:
-        'sylius_shop.account.address_book.update':
+        'sylius_shop.account.address_book.update.content':
             breadcrumbs:
-                template: '@SyliusShop/account/address_book/update/breadcrumbs.html.twig'
+                template: '@SyliusShop/account/address_book/update/content/breadcrumbs.html.twig'
                 priority: 200
             menu:
-                template: '@SyliusShop/account/common/layout/menu.html.twig'
+                template: '@SyliusShop/account/common/content/menu.html.twig'
                 priority: 100
-            content:
-                template: '@SyliusShop/account/common/layout/content.html.twig'
+            main:
+                template: '@SyliusShop/account/common/content/main.html.twig'
                 priority: 0
 
-        'sylius_shop.account.address_book.update.content':
+        'sylius_shop.account.address_book.update.content.main':
             form:
                 component: 'sylius_shop:account:address:form'
                 props:
                     form: '@=_context.form'
                     resource: '@=_context.address'
-                    template: '@SyliusShop/account/address_book/common/content/form.html.twig'
+                    template: '@SyliusShop/account/address_book/common/main/form.html.twig'
                 configuration:
                     method: 'PUT'
                 priority: 0
 
-        'sylius_shop.account.address_book.update.content.header':
+        'sylius_shop.account.address_book.update.content.main.header':
             title:
-                template: '@SyliusShop/account/address_book/update/content/header/title.html.twig'
+                template: '@SyliusShop/account/address_book/update/content/main/header/title.html.twig'
                 priority: 100
             subtitle:
-                template: '@SyliusShop/account/address_book/update/content/header/subtitle.html.twig'
+                template: '@SyliusShop/account/address_book/update/content/main/header/subtitle.html.twig'
                 priority: 0
 
-        'sylius_shop.account.address_book.update.content.form':
+        'sylius_shop.account.address_book.update.content.main.form':
             fields:
-                template: '@SyliusShop/account/address_book/common/content/form/fields.html.twig'
+                template: '@SyliusShop/account/address_book/common/main/form/fields.html.twig'
                 priority: 100
             buttons:
-                template: '@SyliusShop/account/address_book/common/content/form/buttons.html.twig'
+                template: '@SyliusShop/account/address_book/common/main/form/buttons.html.twig'
                 priority: 0
 
-        'sylius_shop.account.address_book.update.content.form.buttons':
+        'sylius_shop.account.address_book.update.content.main.form.buttons':
             save:
-                template: '@SyliusShop/account/address_book/update/content/form/buttons/save.html.twig'
+                template: '@SyliusShop/account/address_book/update/content/main/form/buttons/save.html.twig'
                 priority: 100
             cancel:
-                template: '@SyliusShop/account/address_book/common/content/form/buttons/cancel.html.twig'
+                template: '@SyliusShop/account/address_book/common/main/form/buttons/cancel.html.twig'
                 priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/change_password.yaml

@@ -1,52 +1,52 @@
 sylius_twig_hooks:
     hooks:
-        'sylius_shop.account.change_password.update':
+        'sylius_shop.account.change_password.update.content':
             breadcrumbs:
-                template: '@SyliusShop/account/change_password/update/breadcrumbs.html.twig'
+                template: '@SyliusShop/account/change_password/update/content/breadcrumbs.html.twig'
                 priority: 200
             menu:
-                template: '@SyliusShop/account/common/layout/menu.html.twig'
+                template: '@SyliusShop/account/common/content/menu.html.twig'
                 priority: 100
-            content:
-                template: '@SyliusShop/account/common/layout/content.html.twig'
+            main:
+                template: '@SyliusShop/account/common/content/main.html.twig'
                 priority: 0
 
-        'sylius_shop.account.change_password.update.content':
+        'sylius_shop.account.change_password.update.content.main':
             form:
                 component: 'sylius_shop:account:change_password_form'
                 props:
                     form: '@=_context.form'
-                    template: '@SyliusShop/account/change_password/update/content/form.html.twig'
+                    template: '@SyliusShop/account/change_password/update/content/main/form.html.twig'
                 priority: 0
 
-        'sylius_shop.account.change_password.update.content.header':
+        'sylius_shop.account.change_password.update.content.main.header':
             title:
-                template: '@SyliusShop/account/change_password/update/content/header/title.html.twig'
+                template: '@SyliusShop/account/change_password/update/content/main/header/title.html.twig'
                 priority: 100
             subtitle:
-                template: '@SyliusShop/account/change_password/update/content/header/subtitle.html.twig'
+                template: '@SyliusShop/account/change_password/update/content/main/header/subtitle.html.twig'
                 priority: 0
 
-        'sylius_shop.account.change_password.update.content.form':
+        'sylius_shop.account.change_password.update.content.main.form':
             fields:
-                template: '@SyliusShop/account/change_password/update/content/form/fields.html.twig'
+                template: '@SyliusShop/account/change_password/update/content/main/form/fields.html.twig'
                 priority: 100
             buttons:
-                template: '@SyliusShop/account/change_password/update/content/form/buttons.html.twig'
+                template: '@SyliusShop/account/change_password/update/content/main/form/buttons.html.twig'
                 priority: 0
 
-        'sylius_shop.account.change_password.update.content.form.fields':
+        'sylius_shop.account.change_password.update.content.main.form.fields':
             current_password:
-                template: '@SyliusShop/account/change_password/update/content/form/fields/current_password.html.twig'
+                template: '@SyliusShop/account/change_password/update/content/main/form/fields/current_password.html.twig'
                 priority: 200
             new_password:
-                template: '@SyliusShop/account/change_password/update/content/form/fields/new_password.html.twig'
+                template: '@SyliusShop/account/change_password/update/content/main/form/fields/new_password.html.twig'
                 priority: 100
             confirm_new_password:
-                template: '@SyliusShop/account/change_password/update/content/form/fields/confirm_new_password.html.twig'
+                template: '@SyliusShop/account/change_password/update/content/main/form/fields/confirm_new_password.html.twig'
                 priority: 0
 
-        'sylius_shop.account.change_password.update.content.form.buttons':
+        'sylius_shop.account.change_password.update.content.main.form.buttons':
             submit:
-                template: '@SyliusShop/account/change_password/update/content/form/buttons/submit.html.twig'
+                template: '@SyliusShop/account/change_password/update/content/main/form/buttons/submit.html.twig'
                 priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/create.yaml

@@ -1,17 +1,22 @@
 sylius_twig_hooks:
     hooks:
         'sylius_shop.account.common.create':
-            breadcrumbs:
-                template: '@SyliusShop/account/common/layout/breadcrumbs.html.twig'
-                priority: 200
-            menu:
-                template: '@SyliusShop/account/common/layout/menu.html.twig'
-                priority: 100
             content:
-                template: '@SyliusShop/account/common/layout/content.html.twig'
+                template: '@SyliusShop/account/common/content.html.twig'
                 priority: 0
 
         'sylius_shop.account.common.create.content':
-            header:
-                template: '@SyliusShop/account/common/layout/content/header.html.twig'
+            breadcrumbs:
+                template: '@SyliusShop/account/common/content/breadcrumbs.html.twig'
+                priority: 200
+            menu:
+                template: '@SyliusShop/account/common/content/menu.html.twig'
+                priority: 100
+            main:
+                template: '@SyliusShop/account/common/content/main.html.twig'
+                priority: 0
+
+        'sylius_shop.account.common.create.content.main':
+            header:
+                template: '@SyliusShop/account/common/content/main/header.html.twig'
                 priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/index.yaml

@@ -1,17 +1,22 @@
 sylius_twig_hooks:
     hooks:
         'sylius_shop.account.common.index':
-            breadcrumbs:
-                template: '@SyliusShop/account/common/layout/breadcrumbs.html.twig'
-                priority: 200
-            menu:
-                template: '@SyliusShop/account/common/layout/menu.html.twig'
-                priority: 100
             content:
-                template: '@SyliusShop/account/common/layout/content.html.twig'
+                template: '@SyliusShop/account/common/content.html.twig'
                 priority: 0
 
         'sylius_shop.account.common.index.content':
-            header:
-                template: '@SyliusShop/account/common/layout/content/header.html.twig'
+            breadcrumbs:
+                template: '@SyliusShop/account/common/content/breadcrumbs.html.twig'
+                priority: 200
+            menu:
+                template: '@SyliusShop/account/common/content/menu.html.twig'
+                priority: 100
+            main:
+                template: '@SyliusShop/account/common/content/main.html.twig'
+                priority: 0
+
+        'sylius_shop.account.common.index.content.main':
+            header:
+                template: '@SyliusShop/account/common/content/main/header.html.twig'
                 priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/show.yaml

@@ -1,17 +1,22 @@
 sylius_twig_hooks:
     hooks:
         'sylius_shop.account.common.show':
-            breadcrumbs:
-                template: '@SyliusShop/account/common/layout/breadcrumbs.html.twig'
-                priority: 200
-            menu:
-                template: '@SyliusShop/account/common/layout/menu.html.twig'
-                priority: 100
             content:
-                template: '@SyliusShop/account/common/layout/content.html.twig'
+                template: '@SyliusShop/account/common/content.html.twig'
                 priority: 0
 
         'sylius_shop.account.common.show.content':
-            header:
-                template: '@SyliusShop/account/common/layout/content/header.html.twig'
+            breadcrumbs:
+                template: '@SyliusShop/account/common/content/breadcrumbs.html.twig'
+                priority: 200
+            menu:
+                template: '@SyliusShop/account/common/content/menu.html.twig'
+                priority: 100
+            main:
+                template: '@SyliusShop/account/common/content/main.html.twig'
+                priority: 0
+
+        'sylius_shop.account.common.show.content.main':
+            header:
+                template: '@SyliusShop/account/common/content/main/header.html.twig'
                 priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/update.yaml

@@ -1,17 +1,22 @@
 sylius_twig_hooks:
     hooks:
         'sylius_shop.account.common.update':
-            breadcrumbs:
-                template: '@SyliusShop/account/common/layout/breadcrumbs.html.twig'
-                priority: 200
-            menu:
-                template: '@SyliusShop/account/common/layout/menu.html.twig'
-                priority: 100
             content:
-                template: '@SyliusShop/account/common/layout/content.html.twig'
+                template: '@SyliusShop/account/common/content.html.twig'
                 priority: 0
 
         'sylius_shop.account.common.update.content':
-            header:
-                template: '@SyliusShop/account/common/layout/content/header.html.twig'
+            breadcrumbs:
+                template: '@SyliusShop/account/common/content/breadcrumbs.html.twig'
+                priority: 200
+            menu:
+                template: '@SyliusShop/account/common/content/menu.html.twig'
+                priority: 100
+            main:
+                template: '@SyliusShop/account/common/content/main.html.twig'
+                priority: 0
+
+        'sylius_shop.account.common.update.content.main':
+            header:
+                template: '@SyliusShop/account/common/content/main/header.html.twig'
                 priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/dashboard.yaml

@@ -1,49 +1,49 @@
 sylius_twig_hooks:
     hooks:
-        'sylius_shop.account.dashboard.index.content':
-            main_section:
-                template: '@SyliusShop/account/dashboard/index/content/main_section.html.twig'
+        'sylius_shop.account.dashboard.index.content.main':
+            section:
+                template: '@SyliusShop/account/dashboard/index/content/main/section.html.twig'
                 priority: 0
 
-        'sylius_shop.account.dashboard.index.content.header':
+        'sylius_shop.account.dashboard.index.content.main.header':
             title:
-                template: '@SyliusShop/account/dashboard/index/content/header/title.html.twig'
+                template: '@SyliusShop/account/dashboard/index/content/main/header/title.html.twig'
                 priority: 100
             subtitle:
-                template: '@SyliusShop/account/dashboard/index/content/header/subtitle.html.twig'
+                template: '@SyliusShop/account/dashboard/index/content/main/header/subtitle.html.twig'
                 priority: 0
 
-        'sylius_shop.account.dashboard.index.content.main_section':
+        'sylius_shop.account.dashboard.index.content.main.section':
             user_info:
-                template: '@SyliusShop/account/dashboard/index/content/main_section/user_info.html.twig'
+                template: '@SyliusShop/account/dashboard/index/content/main/section/user_info.html.twig'
                 priority: 100
             buttons:
-                template: '@SyliusShop/account/dashboard/index/content/main_section/buttons.html.twig'
+                template: '@SyliusShop/account/dashboard/index/content/main/section/buttons.html.twig'
                 priority: 0
 
-        'sylius_shop.account.dashboard.index.content.main_section.user_info':
+        'sylius_shop.account.dashboard.index.content.main.section.user_info':
             account_status:
-                template: '@SyliusShop/account/dashboard/index/content/main_section/user_info/status.html.twig'
+                template: '@SyliusShop/account/dashboard/index/content/main/section/user_info/status.html.twig'
                 priority: 100
             user_details:
-                template: '@SyliusShop/account/dashboard/index/content/main_section/user_info/details.html.twig'
+                template: '@SyliusShop/account/dashboard/index/content/main/section/user_info/details.html.twig'
                 priority: 0
 
-        'sylius_shop.account.dashboard.index.content.main_section.user_info.details':
+        'sylius_shop.account.dashboard.index.content.main.section.user_info.details':
             full_name:
-                template: '@SyliusShop/account/dashboard/index/content/main_section/user_info/details/full_name.html.twig'
+                template: '@SyliusShop/account/dashboard/index/content/main/section/user_info/details/full_name.html.twig'
                 priority: 100
             email:
-                template: '@SyliusShop/account/dashboard/index/content/main_section/user_info/details/email.html.twig'
+                template: '@SyliusShop/account/dashboard/index/content/main/section/user_info/details/email.html.twig'
                 priority: 0
 
-        'sylius_shop.account.dashboard.index.content.main_section.buttons':
+        'sylius_shop.account.dashboard.index.content.main.section.buttons':
             edit:
-                template: '@SyliusShop/account/dashboard/index/content/main_section/buttons/edit.html.twig'
+                template: '@SyliusShop/account/dashboard/index/content/main/section/buttons/edit.html.twig'
                 priority: 200
             change_password:
-                template: '@SyliusShop/account/dashboard/index/content/main_section/buttons/change_password.html.twig'
+                template: '@SyliusShop/account/dashboard/index/content/main/section/buttons/change_password.html.twig'
                 priority: 100
             verify:
-                template: '@SyliusShop/account/dashboard/index/content/main_section/buttons/verify.html.twig'
+                template: '@SyliusShop/account/dashboard/index/content/main/section/buttons/verify.html.twig'
                 priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/order/index.yaml

@@ -1,30 +1,25 @@
 sylius_twig_hooks:
     hooks:
-        'sylius_shop.account.order.index':
+        'sylius_shop.account.order.index.content':
             breadcrumbs:
-                template: '@SyliusShop/account/order/index/breadcrumbs.html.twig'
+                template: '@SyliusShop/account/order/index/content/breadcrumbs.html.twig'
                 priority: 200
             menu:
-                template: '@SyliusShop/account/common/layout/menu.html.twig'
+                template: '@SyliusShop/account/common/content/menu.html.twig'
                 priority: 100
-            content:
-                template: '@SyliusShop/account/common/layout/content.html.twig'
+            main:
+                template: '@SyliusShop/account/common/content/main.html.twig'
                 priority: 0
 
-        'sylius_shop.account.order.index.content':
-            main_section:
-                template: '@SyliusShop/account/order/index/content/main_section.html.twig'
-                priority: 0
-
-        'sylius_shop.account.order.index.content.header':
-            title:
-                template: '@SyliusShop/account/order/index/content/header/title.html.twig'
-                priority: 100
-            subtitle:
-                template: '@SyliusShop/account/order/index/content/header/subtitle.html.twig'
-                priority: 0
-
-        'sylius_shop.account.order.index.content.main_section':
+        'sylius_shop.account.order.index.content.main':
             grid:
                 template: '@SyliusShop/shared/grid.html.twig'
                 priority: 0
+
+        'sylius_shop.account.order.index.content.main.header':
+            title:
+                template: '@SyliusShop/account/order/index/content/main/header/title.html.twig'
+                priority: 100
+            subtitle:
+                template: '@SyliusShop/account/order/index/content/main/header/subtitle.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/order/show.yaml

@@ -1,39 +1,39 @@
 sylius_twig_hooks:
     hooks:
-        'sylius_shop.account.order.show':
+        'sylius_shop.account.order.show.content':
             breadcrumbs:
-                template: '@SyliusShop/account/order/show/breadcrumbs.html.twig'
+                template: '@SyliusShop/account/order/show/content/breadcrumbs.html.twig'
                 priority: 200
             menu:
-                template: '@SyliusShop/account/common/layout/menu.html.twig'
+                template: '@SyliusShop/account/common/content/menu.html.twig'
                 priority: 100
-            content:
-                template: '@SyliusShop/account/common/layout/content.html.twig'
+            main:
+                template: '@SyliusShop/account/common/content/main.html.twig'
                 priority: 0
 
-        'sylius_shop.account.order.show.content':
+        'sylius_shop.account.order.show.content.main':
             summary:
-                template: "@SyliusShop/account/order/show/content/summary.html.twig"
+                template: "@SyliusShop/account/order/show/content/main/summary.html.twig"
                 priority: 0
 
-        'sylius_shop.account.order.show.content.header':
+        'sylius_shop.account.order.show.content.main.header':
             title:
-                template: "@SyliusShop/account/order/show/content/header/title.html.twig"
+                template: "@SyliusShop/account/order/show/content/main/header/title.html.twig"
                 priority: 200
             buttons:
-                template: "@SyliusShop/account/order/show/content/header/buttons.html.twig"
+                template: "@SyliusShop/account/order/show/content/main/header/buttons.html.twig"
                 priority: 100
             details:
-                template: "@SyliusShop/account/order/show/content/header/details.html.twig"
+                template: "@SyliusShop/account/order/show/content/main/header/details.html.twig"
                 priority: 0
 
-        'sylius_shop.account.order.show.content.header.details':
+        'sylius_shop.account.order.show.content.main.header.details':
             state:
-                template: "@SyliusShop/account/order/show/content/header/details/state.html.twig"
+                template: "@SyliusShop/account/order/show/content/main/header/details/state.html.twig"
                 priority: 200
             completed_at:
-                template: "@SyliusShop/account/order/show/content/header/details/completed_at.html.twig"
+                template: "@SyliusShop/account/order/show/content/main/header/details/completed_at.html.twig"
                 priority: 100
             currency:
-                template: "@SyliusShop/account/order/show/content/header/details/currency.html.twig"
+                template: "@SyliusShop/account/order/show/content/main/header/details/currency.html.twig"
                 priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/profile_update.yaml

@@ -1,70 +1,70 @@
 sylius_twig_hooks:
     hooks:
-        'sylius_shop.account.profile_update.update':
+        'sylius_shop.account.profile_update.update.content':
             breadcrumbs:
-                template: '@SyliusShop/account/profile_update/update/breadcrumbs.html.twig'
+                template: '@SyliusShop/account/profile_update/update/content/breadcrumbs.html.twig'
                 priority: 200
             menu:
-                template: '@SyliusShop/account/common/layout/menu.html.twig'
+                template: '@SyliusShop/account/common/content/menu.html.twig'
                 priority: 100
-            content:
-                template: '@SyliusShop/account/common/layout/content.html.twig'
+            main:
+                template: '@SyliusShop/account/common/content/main.html.twig'
                 priority: 0
 
-        'sylius_shop.account.profile_update.update.content':
+        'sylius_shop.account.profile_update.update.content.main':
             form:
                 component: 'sylius_shop:account:profile_update:form'
                 props:
                     resource: '@=_context.resource'
                     form: '@=_context.form'
-                    template: '@SyliusShop/account/profile_update/update/content/form.html.twig'
+                    template: '@SyliusShop/account/profile_update/update/content/main/form.html.twig'
                 priority: 0
 
-        'sylius_shop.account.profile_update.update.content.header':
+        'sylius_shop.account.profile_update.update.content.main.header':
             title:
-                template: '@SyliusShop/account/profile_update/update/content/header/title.html.twig'
+                template: '@SyliusShop/account/profile_update/update/content/main/header/title.html.twig'
                 priority: 100
             subtitle:
-                template: '@SyliusShop/account/profile_update/update/content/header/subtitle.html.twig'
+                template: '@SyliusShop/account/profile_update/update/content/main/header/subtitle.html.twig'
                 priority: 0
 
-        'sylius_shop.account.profile_update.update.content.form':
+        'sylius_shop.account.profile_update.update.content.main.form':
             full_name:
-                template: '@SyliusShop/account/profile_update/update/content/form/full_name.html.twig'
+                template: '@SyliusShop/account/profile_update/update/content/main/form/full_name.html.twig'
                 priority: 500
             email:
-                template: '@SyliusShop/account/profile_update/update/content/form/email.html.twig'
+                template: '@SyliusShop/account/profile_update/update/content/main/form/email.html.twig'
                 priority: 400
             additional_information:
-                template: '@SyliusShop/account/profile_update/update/content/form/additional_information.html.twig'
+                template: '@SyliusShop/account/profile_update/update/content/main/form/additional_information.html.twig'
                 priority: 300
             phone_number:
-                template: '@SyliusShop/account/profile_update/update/content/form/phone_number.html.twig'
+                template: '@SyliusShop/account/profile_update/update/content/main/form/phone_number.html.twig'
                 priority: 200
             newsletter:
-                template: '@SyliusShop/account/profile_update/update/content/form/newsletter.html.twig'
+                template: '@SyliusShop/account/profile_update/update/content/main/form/newsletter.html.twig'
                 priority: 100
             buttons:
-                template: '@SyliusShop/account/profile_update/update/content/form/buttons.html.twig'
+                template: '@SyliusShop/account/profile_update/update/content/main/form/buttons.html.twig'
                 priority: 0
 
-        'sylius_shop.account.profile_update.update.content.form.full_name':
+        'sylius_shop.account.profile_update.update.content.main.form.full_name':
             name:
-                template: '@SyliusShop/account/profile_update/update/content/form/full_name/name.html.twig'
+                template: '@SyliusShop/account/profile_update/update/content/main/form/full_name/name.html.twig'
                 priority: 100
             surname:
-                template: '@SyliusShop/account/profile_update/update/content/form/full_name/surname.html.twig'
+                template: '@SyliusShop/account/profile_update/update/content/main/form/full_name/surname.html.twig'
                 priority: 0
 
-        'sylius_shop.account.profile_update.update.content.form.additional_information':
+        'sylius_shop.account.profile_update.update.content.main.form.additional_information':
             birthday:
-                template: '@SyliusShop/account/profile_update/update/content/form/additional_information/birthday.html.twig'
+                template: '@SyliusShop/account/profile_update/update/content/main/form/additional_information/birthday.html.twig'
                 priority: 100
             gender:
-                template: '@SyliusShop/account/profile_update/update/content/form/additional_information/gender.html.twig'
+                template: '@SyliusShop/account/profile_update/update/content/main/form/additional_information/gender.html.twig'
                 priority: 0
 
-        'sylius_shop.account.profile_update.update.content.form.buttons':
+        'sylius_shop.account.profile_update.update.content.main.form.buttons':
             submit:
-                template: '@SyliusShop/account/profile_update/update/content/form/buttons/submit.html.twig'
+                template: '@SyliusShop/account/profile_update/update/content/main/form/buttons/submit.html.twig'
                 priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/base.yaml

@@ -1,5 +1,10 @@
 sylius_twig_hooks:
     hooks:
+        'sylius_shop.base#body_classes':
+            defaults:
+                template: '@SyliusShop/shared/layout/base/body_classes/defaults.html.twig'
+                priority: 0     
+                
         'sylius_shop.base#stylesheets':
             styles:
                 template: '@SyliusShop/shared/layout/base/styles.html.twig'

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/Resources/config/services/order_pay/offline/providers.xml

@@ -19,7 +19,7 @@
     <services>
         <service id="sylius_shop.provider.order_pay.http_response.offline.status" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\Offline\StatusHttpResponseProvider">
             <argument type="service" id="sylius_shop.provider.order_pay.final_url" />
-            <tag name="sylius.provider.http_response.offline" action="status" />
+            <tag name="sylius.provider.payment_request.http_response.offline" action="status" />
         </service>
     </services>
 </container>