Web2PrintBricksBundle

- add Pimcore11 commpatibility
studio1gmbh · Nov 20, 2023 · db78a37 · db78a37
1 parent fe82c89
commit db78a37
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -29,10 +29,8 @@
     }
   },
   "require": {
-    "pimcore/pimcore": "^10.0",
-    "pimcore/web2print-tools-bundle": "4.0.8",
-    "php": "^8.0",
-    "spiritix/php-chrome-html2pdf": "v1.7.3",
-    "studio1/utility": "2.0.7"
+    "pimcore/pimcore": "^11.0",
+    "pimcore/web2print-tools-bundle": "^5.0",
+    "php": "^8.2"
   }
 }
diff --git a/src/Installer.php b/src/Installer.php
@@ -28,7 +28,7 @@ class Installer extends SettingsStoreAwareInstaller
     /**
      * @inheritDoc
      */
-    public function install()
+    public function install(): void
     {
         $this
             ->installPredefinedProperties()

diff --git a/...es/views/areas/print-product-table/spec_attribute/column-attribute-table-values.html.twig b/...es/views/areas/print-product-table/spec_attribute/column-attribute-table-values.html.twig
@@ -69,4 +69,4 @@
     {% endif %}
 
 
-{% endfor %}
+{% endfor %}
diff --git a/src/Resources/views/areas/print-title-page/view.html.twig b/src/Resources/views/areas/print-title-page/view.html.twig
@@ -10,4 +10,4 @@
     <div class="heading">{{ pimcore_input('heading') }}</div>
     <div class="subheading">{{ pimcore_input('subheading') }}</div>
 
-</div>
+</div>
diff --git a/src/Resources/views/areas/print-toc/view.html.twig b/src/Resources/views/areas/print-toc/view.html.twig
@@ -43,7 +43,4 @@
 {% if not editmode %}
     <div class="toc-footer-text-placeholder-left">{{ pimcore_input('heading') }}</div>
     <div class="toc-footer-text-placeholder-right">{{ pimcore_input('heading') }}</div>
-{% endif %}
-
-
-
+{% endif %}
diff --git a/src/Resources/views/areas/print-wysiwyg/view.html.twig b/src/Resources/views/areas/print-wysiwyg/view.html.twig
@@ -5,4 +5,4 @@
 
     {{ pimcore_wysiwyg('content') }}
 
-</div>
+</div>
diff --git a/src/Resources/views/layouts/print_catalog.html.twig b/src/Resources/views/layouts/print_catalog.html.twig
@@ -31,11 +31,12 @@
     <link rel="stylesheet" type="text/css" href="/bundles/web2printbricks/static/print/css/print-preview.css" media="screen" />
 
     {% if printermarks is defined and printermarks == true %}
-        <link rel="stylesheet" type="text/css" href="/bundles/pimcoreadmin/css/print/print-printermarks.css" media="print" />
+        <link rel="stylesheet" type="text/css" href="/bundles/pimcorewebtoprint/css/print/print-printermarks.css" media="print" />
     {% endif %}
 
 
-    <script type="text/javascript" src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
+    <script type="text/javascript" src="https://code.jquery.com/jquery-3.6.3.slim.min.js"></script>
+
 
 
     {% block headscripts deferred %}

diff --git a/src/Resources/views/web2print/composer.json b/src/Resources/views/web2print/composer.json
@@ -0,0 +1,14 @@
+{
+  "name": "vendor_name/web2print",
+  "description": "description",
+  "minimum-stability": "stable",
+  "license": "proprietary",
+  "authors": [
+    {
+      "name": "lschmidt",
+      "email": "email@example.com"
+    }
+  ],
+  "require": {
+  }
+}
diff --git a/src/Resources/views/web2print/default.html.twig b/src/Resources/views/web2print/default.html.twig
@@ -4,4 +4,4 @@
 
     {{ include('@Web2PrintBricks/web2print/default_no_layout.html.twig') }}
 
-{% endblock %}
+{% endblock %}
diff --git a/src/Resources/views/web2print/default_no_layout.html.twig b/src/Resources/views/web2print/default_no_layout.html.twig
@@ -6,6 +6,7 @@
     <div class="page {{ app_print_get_register_name(document.getProperty('print_register_title')) }} {{ document.getProperty('print_register_type') }}" id="documentpage-{{ document.id }}">
 
         <div>
+
             {{
             pimcore_areablock('content', {
                 'allowed': [
@@ -24,4 +25,4 @@
 
     </div>
 
-{% endblock %}
+{% endblock %}
diff --git a/src/Web2PrintBricksBundle.php b/src/Web2PrintBricksBundle.php
@@ -13,6 +13,7 @@
 namespace Studio1\Web2PrintBricksBundle;
 
 use Pimcore\Extension\Bundle\AbstractPimcoreBundle;
+use Pimcore\Extension\Bundle\Installer;
 
 /**
  * Web2Print Bricks Bundle
@@ -24,7 +25,7 @@ class Web2PrintBricksBundle extends AbstractPimcoreBundle
      */
     public function getVersion(): string
     {
-        return '1.0.2';
+        return '2.0.0';
     }
 
     /**
@@ -46,7 +47,7 @@ public function getDescription(): string
     /**
      * @inheritDoc
      */
-    public function getInstaller(): ?object
+    public function getInstaller(): ?Installer\InstallerInterface
     {
         return $this->container->get(Installer::class);
     }