diff --git a/composer.json b/composer.json index 9f58e0f..5853ca2 100644 --- 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 index 8d4343c..cc83225 100644 --- 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/src/Resources/views/areas/print-product-table/spec_attribute/column-attribute-table-values.html.twig b/src/Resources/views/areas/print-product-table/spec_attribute/column-attribute-table-values.html.twig index 7d42b47..afee80a 100644 --- a/src/Resources/views/areas/print-product-table/spec_attribute/column-attribute-table-values.html.twig +++ b/src/Resources/views/areas/print-product-table/spec_attribute/column-attribute-table-values.html.twig @@ -69,4 +69,4 @@ {% endif %} -{% endfor %} +{% endfor %} \ No newline at end of file diff --git a/src/Resources/views/areas/print-title-page/view.html.twig b/src/Resources/views/areas/print-title-page/view.html.twig index 3453f70..f2f0637 100644 --- 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 @@
{{ pimcore_input('heading') }}
{{ pimcore_input('subheading') }}
- + \ No newline at end of file diff --git a/src/Resources/views/areas/print-toc/view.html.twig b/src/Resources/views/areas/print-toc/view.html.twig index d0fec72..48ebe4d 100644 --- 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 %} -{% endif %} - - - +{% endif %} \ No newline at end of file diff --git a/src/Resources/views/areas/print-wysiwyg/view.html.twig b/src/Resources/views/areas/print-wysiwyg/view.html.twig index 485c7d1..5ea0fbb 100644 --- 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') }} - + \ No newline at end of file diff --git a/src/Resources/views/layouts/print_catalog.html.twig b/src/Resources/views/layouts/print_catalog.html.twig index e7671e2..fa722f3 100644 --- a/src/Resources/views/layouts/print_catalog.html.twig +++ b/src/Resources/views/layouts/print_catalog.html.twig @@ -31,11 +31,12 @@ {% if printermarks is defined and printermarks == true %} - + {% endif %} - + + {% block headscripts deferred %} diff --git a/src/Resources/views/web2print/composer.json b/src/Resources/views/web2print/composer.json new file mode 100644 index 0000000..e647070 --- /dev/null +++ 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": { + } +} \ No newline at end of file diff --git a/src/Resources/views/web2print/default.html.twig b/src/Resources/views/web2print/default.html.twig index e164b8a..b074cff 100644 --- 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 %} \ No newline at end of file diff --git a/src/Resources/views/web2print/default_no_layout.html.twig b/src/Resources/views/web2print/default_no_layout.html.twig index d17ae5a..28dcf83 100644 --- a/src/Resources/views/web2print/default_no_layout.html.twig +++ b/src/Resources/views/web2print/default_no_layout.html.twig @@ -6,6 +6,7 @@
+ {{ pimcore_areablock('content', { 'allowed': [ @@ -24,4 +25,4 @@
-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/src/Web2PrintBricksBundle.php b/src/Web2PrintBricksBundle.php index 455e2bb..f13cd70 100644 --- 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); }