Skip to content

Commit 5a09d88

Browse files
thomas-kl1thomas-kl1
committed
Merge branch 'master' into magento2.3.x
2 parents 56d7378 + 9b98839 commit 5a09d88

File tree

10 files changed

+119
-51
lines changed

10 files changed

+119
-51
lines changed

‎Model/View/Page/Config/Renderer.php‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?php
2+
/**
3+
* Copyright © OpenGento, All rights reserved.
4+
* See LICENSE bundled with this library for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Opengento\Gdpr\Model\View\Page\Config;
9+
10+
use Magento\Framework\View\Asset\AssetInterface;
11+
use Magento\Framework\View\Asset\GroupedCollection;
12+
use Magento\Framework\View\Asset\PropertyGroup;
13+
use Magento\Framework\View\Page\Config\Renderer as ViewRenderer;
14+
use function file_get_contents;
15+
use function sprintf;
16+
use const PHP_EOL;
17+
18+
class Renderer extends ViewRenderer
19+
{
20+
protected function renderAssetHtml(PropertyGroup $group): string
21+
{
22+
$assets = $this->processMerge($group->getAll(), $group);
23+
$attributes = $this->getGroupAttributes($group);
24+
$result = '';
25+
26+
/** @var $asset AssetInterface */
27+
foreach ($assets as $asset) {
28+
$result .= $this->inlineHtml(
29+
$group->getProperty(GroupedCollection::PROPERTY_CONTENT_TYPE),
30+
$asset->getUrl(),
31+
$this->addDefaultAttributes($this->getAssetContentType($asset), $attributes)
32+
);
33+
}
34+
35+
return $result;
36+
}
37+
38+
private function inlineHtml(string $contentType, string $src, ?string $attributes): string
39+
{
40+
switch ($contentType) {
41+
case 'js':
42+
$result = '<script ' . $attributes . '>' . file_get_contents($src) . '</script>';
43+
break;
44+
45+
case 'css':
46+
$result = '<style ' . $attributes . '>' . file_get_contents($src) . '</style>';
47+
break;
48+
default:
49+
$result = sprintf($this->getAssetTemplate($contentType, $attributes), $src);
50+
break;
51+
}
52+
53+
return $result . PHP_EOL;
54+
}
55+
}

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ Languages:
8888

8989
- [x] en_US ; English
9090
- [x] de_DE ; German
91-
- [x] fr_FR ; French (partial)
92-
- [ ] nl_NL ; Dutch (partial)
91+
- [x] fr_FR ; French
92+
- [x] nl_NL ; Dutch
9393
- [ ] it_IT ; Italian (partial)
9494

9595
## Settings

‎Service/Export/Renderer/HtmlRenderer.php‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
use Magento\Framework\View\Element\Template;
1616
use Magento\Framework\View\FileSystem as ViewFileSystem;
1717
use Magento\Framework\View\Page\Config;
18-
use Magento\Framework\View\Page\Config\Renderer;
19-
use Magento\Framework\View\Page\Config\RendererFactory;
18+
use Magento\Framework\View\Page\Config\RendererInterface;
19+
use Opengento\Gdpr\Model\View\Page\Config\RendererFactory;
2020
use Opengento\Gdpr\Service\Export\Renderer\HtmlRenderer\LayoutInitiatorInterface;
21+
use function array_keys;
2122
use function extract;
2223
use function ob_end_clean;
2324
use function ob_get_clean;
@@ -31,7 +32,7 @@ final class HtmlRenderer extends AbstractRenderer
3132
private $layoutInitiator;
3233

3334
/**
34-
* @var Renderer
35+
* @var RendererInterface
3536
*/
3637
private $pageConfigRenderer;
3738

@@ -75,20 +76,15 @@ public function render(array $data): string
7576
{
7677
$layout = $this->layoutInitiator->createLayout();
7778

78-
$addBlock = $layout->getBlock('head.additional');
79-
$requireJs = $layout->getBlock('require.js');
8079
/** @var Template $block */
8180
$block = $layout->getBlock('main.content.customer.privacy.export.personal.data');
8281
$block->setData('viewModel', new DataObject($data));
8382

8483
$output = $this->renderPage([
85-
'requireJs' => $requireJs ? $requireJs->toHtml() : null,
86-
'headContent' => $this->pageConfigRenderer->renderHeadContent(),//todo replace style to inline css
87-
'headAdditional' => $addBlock ? $addBlock->toHtml() : null,
84+
'headContent' => $this->pageConfigRenderer->renderHeadContent(),
8885
'htmlAttributes' => $this->pageConfigRenderer->renderElementAttributes(Config::ELEMENT_TYPE_HTML),
8986
'headAttributes' => $this->pageConfigRenderer->renderElementAttributes(Config::ELEMENT_TYPE_HEAD),
9087
'bodyAttributes' => $this->pageConfigRenderer->renderElementAttributes(Config::ELEMENT_TYPE_BODY),
91-
'loaderIcon' => 'images/loader-2.gif',//todo
9288
'layoutContent' => $layout->getOutput(),
9389
]);
9490
$this->translateInline->processResponseBody($output);

‎Service/Export/Renderer/PdfRenderer.php‎

Lines changed: 5 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,19 @@
99

1010
use Exception;
1111
use Magento\Framework\Filesystem;
12-
use mikehaertl\wkhtmlto\Pdf;
13-
use mikehaertl\wkhtmlto\PdfFactory;
14-
use RuntimeException;
12+
use TCPDF;
1513

1614
final class PdfRenderer extends AbstractRenderer
1715
{
18-
/**
19-
* @var PdfFactory
20-
*/
21-
private $pdfFactory;
22-
2316
/**
2417
* @var HtmlRenderer
2518
*/
2619
private $htmlRenderer;
2720

2821
public function __construct(
2922
Filesystem $filesystem,
30-
PdfFactory $pdfFactory,
3123
HtmlRenderer $htmlRenderer
3224
) {
33-
$this->pdfFactory = $pdfFactory;
3425
$this->htmlRenderer = $htmlRenderer;
3526
parent::__construct($filesystem, 'pdf');
3627
}
@@ -41,31 +32,10 @@ public function __construct(
4132
*/
4233
public function render(array $data): string
4334
{
44-
/** @var Pdf $pdf */
45-
$pdf = $this->pdfFactory->create([
46-
'options' => [
47-
'ignoreWarnings' => true,
48-
'no-outline',
49-
'enable-external-links',
50-
'enable-internal-links',
51-
'encoding' => 'UTF-8',
52-
'margin-top' => 0,
53-
'margin-right' => 0,
54-
'margin-bottom' => 0,
55-
'margin-left' => 0,
56-
'dpi' => 300,
57-
'zoom' => 1,
58-
'disable-smart-shrinking',
59-
'lowquality',
60-
]
61-
]);
62-
63-
$pdf->addPage($this->htmlRenderer->render($data));
64-
65-
if (($result = $pdf->toString()) === false) {
66-
throw new RuntimeException('The PDF was not created successfully.');
67-
}
35+
$pdf = new TCPDF();
36+
$pdf->AddPage('P', 'A4');
37+
$pdf->writeHTML($this->htmlRenderer->render($data));
6838

69-
return $result;
39+
return $pdf->Output('', 'S');
7040
}
7141
}

‎etc/di.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1512,7 +1512,7 @@
15121512
<type name="Opengento\Gdpr\Service\Export\Renderer\HtmlRenderer">
15131513
<arguments>
15141514
<argument name="layoutInitiator" xsi:type="object">Opengento\Gdpr\Service\Export\Renderer\HtmlRenderer\LayoutInitiator</argument>
1515-
<argument name="template" xsi:type="string">Magento_Theme::root.phtml</argument>
1515+
<argument name="template" xsi:type="string">Opengento_Gdpr::root.phtml</argument>
15161516
</arguments>
15171517
</type>
15181518
<type name="Opengento\Gdpr\Service\Export\RendererFactory">

‎view/base/layout/customer_privacy_export_personal_data.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
* See LICENSE bundled with this library for license details.
66
*/
77
-->
8-
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="empty" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
8+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="customer_privacy_export" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<update handle="customer_privacy_export_personal_data_renderers"/>
1010
<head>
1111
<title>My Personal Data</title>
1212
</head>
1313
<body>
1414
<referenceContainer name="main">
15-
<block class="Magento\Framework\View\Element\Template" name="main.content.customer.privacy.export.personal.data" template="Opengento_Gdpr::export/result.phtml" cacheable="false"/>
15+
<block name="main.content.customer.privacy.export.personal.data" template="Opengento_Gdpr::export/result.phtml" cacheable="false"/>
1616
</referenceContainer>
17-
<move element="opengento.gdpr.customer.privacy.export.renderers" destination="main.content.customer.privacy.export.personal.data" as="exportRenderer"/>
1817
</body>
1918
</page>

‎view/base/layouts.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © OpenGento, All rights reserved.
5+
* See LICENSE bundled with this library for license details.
6+
*/
7+
-->
8+
<page_layouts xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/PageLayout/etc/layouts.xsd">
9+
<layout id="customer_privacy_export">
10+
<label>Customer Privacy Export Personal Data</label>
11+
</layout>
12+
</page_layouts>

‎view/base/page_layout/customer_privacy_export.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_layout.xsd">
9+
<container name="root">
10+
<container name="page.wrapper" as="page_wrapper" htmlTag="div" htmlClass="page-wrapper">
11+
<container name="main.content" htmlTag="main" htmlId="maincontent" htmlClass="page-main">
12+
<container name="columns.top" label="Before Main Columns"/>
13+
<container name="columns" htmlTag="div" htmlClass="columns">
14+
<container name="main" label="Main Content Container" htmlTag="div" htmlClass="column main"/>
15+
</container>
16+
</container>
17+
<container name="page.bottom.container" as="page_bottom_container" label="Before Page Footer Container" after="main.content" htmlTag="div" htmlClass="page-bottom"/>
18+
</container>
19+
</container>
20+
</layout>

‎view/base/templates/export/result.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use Magento\Framework\View\Element\Template;
1212
/** @var Template $block */
1313

1414
/** @var RendererList $rendererList */
15-
$rendererList = $block->getChildBlock('exportRenderer');
15+
$rendererList = $block->getLayout()->getBlock('opengento.gdpr.customer.privacy.export.renderers');
1616
/** @var DataObject $viewModel */
1717
$viewModel = $block->getData('viewModel');
1818
?>

‎view/base/templates/root.phtml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
/**
3+
* Copyright © OpenGento, All rights reserved.
4+
* See LICENSE bundled with this library for license details.
5+
*/
6+
declare(strict_types=1);
7+
?>
8+
<!doctype html>
9+
<html <?= $htmlAttributes ?? '' ?>>
10+
<head <?= $headAttributes ?? '' ?>>
11+
<?= $headContent ?? '' ?>
12+
</head>
13+
<body data-container="body" <?= $bodyAttributes ?? '' ?>>
14+
<?= $layoutContent ?? '' ?>
15+
</body>
16+
</html>

0 commit comments

Comments
 (0)