Sylius 20 adaptation

composer.json

@@ -11,8 +11,8 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.4 || ^8.0",
-        "sylius/sylius": "^1.12"
+        "php": "^8.0",
+        "sylius/sylius": "^2.0"
     },
     "require-dev": {
         "behat/behat": "^3.6.1",

src/DependencyInjection/Configuration.php

@@ -36,7 +36,7 @@ class Configuration  implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('asdoria_sylius_pictogram_plugin');
 

src/Form/DataTransformer/ProductsToPictogramGroupsTransformer.php

@@ -55,7 +55,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function transform($pictograms)
+    public function transform($pictograms): mixed
     {
         $this->setPictograms($pictograms);
 

src/Resources/config/app/config.yaml

@@ -23,9 +23,19 @@ liip_imagine:
             filters:
                 thumbnail:
                     size: [ 85, 85 ]
-jms_serializer:
-    metadata:
-        directories:
-            asdoria-pictogram:
-                namespace_prefix: "Asdoria\\SyliusPictogramPlugin\\PictogramBundle\\Entity"
-                path: "@AsdoriaSyliusPictogramPlugin/Resources/config/serializer"
+        sylius_admin_pictogram_thumbnail_small:
+            quality: 70
+            filters:
+                thumbnail:
+                    size: [ 25, 25 ]
+                    mode: outbound
+        sylius_shop_pictogram_thumbnail_medium:
+            quality: 70
+            filters:
+                thumbnail:
+                    size: [ 45, 45 ]
+        sylius_shop_pictogram_thumbnail_small:
+            quality: 70
+            filters:
+                thumbnail:
+                    size: [ 35, 35 ]

src/Resources/config/doctrine/Pictogram.orm.xml

@@ -3,7 +3,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:gedmo="http://gediminasm.org/schemas/orm/doctrine-extensions-mapping">
 
-    <mapped-superclass name="Asdoria\SyliusPictogramPlugin\Entity\Pictogram" table="asdoria_pictogram"   >
+    <mapped-superclass name="Asdoria\SyliusPictogramPlugin\Entity\Pictogram" table="asdoria_pictogram">
         <id name="id" column="id" type="integer">
             <generator strategy="AUTO" />
         </id>

src/Resources/config/routes/pictogram_group.yaml

@@ -5,7 +5,7 @@ asdoria_admin_pictogram_group:
     resource: |
         alias: asdoria.pictogram_group
         section: admin
-        templates: "@SyliusAdmin\\Crud"
+        templates: "@SyliusAdmin\\shared\\crud"
         except: ['show']
         redirect: index
         grid: asdoria_admin_pictogram_group

src/Resources/config/routes/pictogram_group_pictograms.yaml

@@ -13,7 +13,7 @@ asdoria_admin_pictogram_group_pictograms_index:
                     parameters:
                         pictogramGroupId: $pictogramGroupId
             section: admin
-            template: '@SyliusAdmin/Crud/index.html.twig'
+            template: '@SyliusAdmin/shared/crud/index.html.twig'
 
 asdoria_admin_pictogram_group_pictograms_create:
     path: /pictogram-groups/{pictogramGroupId}/pictograms/new
@@ -26,7 +26,7 @@ asdoria_admin_pictogram_group_pictograms_create:
                 parameters:
                     pictogramGroupId: $pictogramGroupId
             section: admin
-            template: '@AsdoriaSyliusPictogramPlugin/Admin/PictogramGroup/Pictograms/Crud/create.html.twig'
+            template: '@SyliusAdmin/shared/crud/create.html.twig'
             factory:
                 method: createForPictogramGroup
                 arguments:
@@ -41,8 +41,11 @@ asdoria_admin_pictogram_group_pictograms_create:
                     name: asdoria_admin_pictogram_group_pictograms_create
                     parameters:
                         pictogramGroupId: $pictogramGroupId
-                templates:
-                    form: '@AsdoriaSyliusPictogramPlugin/Admin/Pictogram/_form.html.twig'
+                index:
+                    route:
+                        name: asdoria_admin_pictogram_group_pictograms_index
+                        parameters:
+                            pictogramGroupId: $pictogramGroupId
 
 asdoria_admin_pictogram_group_pictograms_update:
     path: /pictogram-groups/{pictogramGroupId}/pictograms/{id}/edit
@@ -55,7 +58,7 @@ asdoria_admin_pictogram_group_pictograms_update:
                 parameters:
                     pictogramGroupId: $pictogramGroupId
             section: admin
-            template: '@AsdoriaSyliusPictogramPlugin/Admin/PictogramGroup/Pictograms/Crud/update.html.twig'
+            template: '@SyliusAdmin/shared/crud/update.html.twig'
             form:
                 type: Asdoria\SyliusPictogramPlugin\Form\Type\PictogramType
                 options:
@@ -67,8 +70,11 @@ asdoria_admin_pictogram_group_pictograms_update:
                     parameters:
                         pictogramGroupId: $pictogramGroupId
                         id: $id
-                templates:
-                    form: '@AsdoriaSyliusPictogramPlugin/Admin/Pictogram/_form.html.twig'
+                index:
+                    route:
+                        name: asdoria_admin_pictogram_group_pictograms_index
+                        parameters:
+                            pictogramGroupId: $pictogramGroupId
 
 asdoria_admin_pictogram_group_pictograms_delete:
     path: /pictogram-groups/{pictogramGroupId}/pictograms/{id}

src/Resources/config/services/menu.yaml

@@ -3,8 +3,3 @@ services:
         class: Asdoria\SyliusPictogramPlugin\Menu\AdminMenuListener
         tags:
             - { name: kernel.event_listener, event: sylius.menu.admin.main, method: addAdminMenuItems }
-
-    asdoria_pictogram.listener.admin.product_form_menu_builder:
-        class: Asdoria\SyliusPictogramPlugin\Menu\AdminProductFormMenuListener
-        tags:
-            - { name: kernel.event_listener, event: sylius.menu.admin.product.form, method: addItems }

src/Resources/config/twig_hooks.yaml

@@ -0,0 +1,65 @@
+sylius_twig_hooks:
+    hooks:
+        'sylius_admin.pictogram.index#javascripts':
+            pictogram:
+                template: "@AsdoriaSyliusPictogramPlugin/Admin/_javascripts.html.twig"
+
+        'sylius_admin.pictogram.index#stylesheets':
+            pictogram:
+                template: "@AsdoriaSyliusPictogramPlugin/Admin/_stylesheets.html.twig"
+
+        'sylius_admin.pictogram.create.content.form.sections':
+            general:
+                template: '@AsdoriaSyliusPictogramPlugin/Admin/Pictogram/_form.html.twig'
+
+        'sylius_admin.pictogram.update.content.form.sections':
+            general:
+                template: '@AsdoriaSyliusPictogramPlugin/Admin/Pictogram/_form.html.twig'
+
+        'sylius_admin.common.update.content.header':
+            breadcrumbs:
+                template: '@AsdoriaSyliusPictogramPlugin/Admin/PictogramGroup/Pictograms/Crud/Update/_breadcrumb.html.twig'
+
+        'sylius_admin.common.update.content.header.title_block.actions':
+            show:
+                enabled: false
+
+        'sylius_admin.pictogram_group.index#javascripts':
+            pictogram:
+                template: "@AsdoriaSyliusPictogramPlugin/Admin/_javascripts.html.twig"
+
+        'sylius_admin.pictogram_group.create.content.form.sections':
+            general:
+                template: '@AsdoriaSyliusPictogramPlugin/Admin/PictogramGroup/_form.html.twig'        
+
+        'sylius_admin.pictogram_group.update.content.form.sections':
+            general:
+                template: '@AsdoriaSyliusPictogramPlugin/Admin/PictogramGroup/_form.html.twig'
+
+        'sylius_admin.product.create#javascripts':
+             pictogram:
+                 template: "@AsdoriaSyliusPictogramPlugin/Admin/_javascripts.html.twig"
+
+        'sylius_admin.product.create#stylesheets':
+            pictogam:
+                template: "@AsdoriaSyliusPictogramPlugin/Admin/_stylesheets.html.twig"
+
+        'sylius_admin.product.update#javascripts':
+            pictogram:
+                template: "@AsdoriaSyliusPictogramPlugin/Admin/_javascripts.html.twig"
+
+        'sylius_admin.product.update#stylesheets':
+            pictogam:
+                template: "@AsdoriaSyliusPictogramPlugin/Admin/_stylesheets.html.twig"
+
+        'sylius_admin.product.update.content.form.side_navigation':
+            pictograms:
+                template: '@AsdoriaSyliusPictogramPlugin/Admin/Product/Sidebar/pictograms.html.twig'
+
+        'sylius_admin.product.update.content.form.sections':
+            pictograms:
+                template: "@AsdoriaSyliusPictogramPlugin/Admin/Product/Section/pictograms.html.twig"
+
+        'sylius_admin.product.update.content.form.sections.pictograms':
+            pictograms_collection:
+                template: "@AsdoriaSyliusPictogramPlugin/Admin/Product/Section/pictograms_collection.html.twig"

src/Resources/private/sass/pictogram.scss

@@ -9,6 +9,7 @@
 .pictograms {
   display: flex !important;
   flex-wrap: wrap;
+  margin: 0.75rem 0;
 }
 
 .pictograms .field > div {
@@ -22,7 +23,7 @@
   height: 100%;
   text-align: center;
   padding: 10px !important;
-  margin-left: 4.5rem;
+  margin-left: 2rem;
   border: solid 1px #d2d2d2;
 }
 
@@ -52,4 +53,4 @@
 
 .pictograms input:checked ~label {
   border: solid 1px #ff6461;
-}
+}

src/Resources/translations/messages.en.yaml

@@ -3,23 +3,27 @@ asdoria:
         admin:
             main:
                 pictogram_groups:
-                    header: Pictogram Groups
+                    header: Piktogramų grupės
     ui:
-        pictograms: Pictograms
-        pictogram_groups: Pictogram Groups
-        pictogram_group: Pictogram Group
-        new_pictogram: New Pictogram
-        new_pictogram_group: New pictogram group
-        edit_pictogram_group: Edit pictogram group
-        edit_pictogram: Edit pictogram
-        manage_pictograms: Managing Pictograms
+        pictogram: Piktograma
+        pictograms: Piktogramos
+        pictogram_groups: Piktogramų grupės
+        pictogram_group: Piktogramų grupė
+        new_pictogram: Nauja piktograma
+        new_pictogram_group: Nauja piktogramų grupė
+        edit_pictogram_group: Redaguoti piktogramų grupę
+        edit_pictogram: Redaguoti piktogramą
+        manage_pictograms: Piktogramų tvarkymas
     form:
         pictogram:
-            main_image: Main image
-            pictogram_group: Pictogram group
-            name: Name
+            main_image: Pagrindinis vaizdas
+            pictogram_group: Piktogramų grupė
+            name: Vardas
         pictogram_group:
-            name: Name
-            pictograms: Pictograms
+            name: Vardas
+            pictograms: Piktogramos
         pictogram_image:
-            file: Image
+            file: Vaizdas
+        translations:
+            pictogram: Piktogramų vertimai
+            pictogram_group: Piktogramų grupių vertimai

src/Resources/translations/messages.fr.yaml

@@ -5,6 +5,7 @@ asdoria:
                 pictogram_groups:
                     header: Groupe de Pictogramme
     ui:
+        pictogram: Pictogramme
         pictograms: Pictogrammes
         pictogram_groups: Groupes de pictogramme
         pictogram_group: Groupe de pictogramme
@@ -23,3 +24,6 @@ asdoria:
             pictograms: Pictogrammes
         pictogram_image:
             file: Image
+        translations:
+            pictogram: Pictogram translations
+            pictogram_group: Pictogram group translations

src/Resources/translations/messages.lt.yaml

@@ -0,0 +1,29 @@
+asdoria:
+    menu:
+        admin:
+            main:
+                pictogram_groups:
+                    header: Pictogram Groups
+    ui:
+        pictogram: Pictogram
+        pictograms: Pictograms
+        pictogram_groups: Pictogram Groups
+        pictogram_group: Pictogram Group
+        new_pictogram: New Pictogram
+        new_pictogram_group: New pictogram group
+        edit_pictogram_group: Edit pictogram group
+        edit_pictogram: Edit pictogram
+        manage_pictograms: Managing Pictograms
+    form:
+        pictogram:
+            main_image: Main image
+            pictogram_group: Pictogram group
+            name: Name
+        pictogram_group:
+            name: Name
+            pictograms: Pictograms
+        pictogram_image:
+            file: Image
+        translations:
+            pictogram: Pictogram translations
+            pictogram_group: Pictogram group translations

src/Resources/translations/validators.lt.yaml

@@ -0,0 +1,18 @@
+asdoria:
+    ui:
+        pictogram:
+            group:
+                not_blank: Piktograma turi būti susieta su grupe.
+            image:
+                not_blank: Piktogramoje turi būti atvaizdas, iliustruojantis save.
+        pictogram_group:
+            code:
+                unique: Šis kodas jau užimtas.
+                not_blank: Laukas „Kodas“ negali būti tuščias.
+        pictogram_group_translation:
+            name:
+                unique: Vardas jau užimtas.
+                not_blank: Laukas „Vardas“ negali būti tuščias.
+        image:
+            path:
+                not_blank: Turite įkelti vaizdą.