Skip to content

Commit 4e04789

Browse files
thomas-kl1thomas-kl1
committed
Merge branch 'master' into magento2.4.x
2 parents 7ffd01c + c20cfac commit 4e04789

File tree

16 files changed

+306
-76
lines changed

16 files changed

+306
-76
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: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@
99

1010
use Exception;
1111
use InvalidArgumentException;
12+
use Magento\Framework\App\Area;
13+
use Magento\Framework\App\State;
1214
use Magento\Framework\DataObject;
1315
use Magento\Framework\Filesystem;
1416
use Magento\Framework\Translate\InlineInterface;
17+
use Magento\Framework\View\DesignInterface;
1518
use Magento\Framework\View\Element\Template;
1619
use Magento\Framework\View\FileSystem as ViewFileSystem;
1720
use Magento\Framework\View\Page\Config;
18-
use Magento\Framework\View\Page\Config\Renderer;
19-
use Magento\Framework\View\Page\Config\RendererFactory;
21+
use Magento\Framework\View\Page\Config\RendererInterface;
22+
use Opengento\Gdpr\Model\View\Page\Config\RendererFactory;
2023
use Opengento\Gdpr\Service\Export\Renderer\HtmlRenderer\LayoutInitiatorInterface;
2124
use function extract;
2225
use function ob_end_clean;
@@ -25,13 +28,20 @@
2528

2629
final class HtmlRenderer extends AbstractRenderer
2730
{
31+
/**
32+
* @var State
33+
*/
34+
private $appState;
35+
36+
private $design;
37+
2838
/**
2939
* @var LayoutInitiatorInterface
3040
*/
3141
private $layoutInitiator;
3242

3343
/**
34-
* @var Renderer
44+
* @var RendererInterface
3545
*/
3646
private $pageConfigRenderer;
3747

@@ -51,6 +61,8 @@ final class HtmlRenderer extends AbstractRenderer
5161
private $template;
5262

5363
public function __construct(
64+
State $appState,
65+
DesignInterface $design,
5466
Filesystem $filesystem,
5567
LayoutInitiatorInterface $layoutInitiator,
5668
Config $pageConfig,
@@ -59,6 +71,8 @@ public function __construct(
5971
ViewFileSystem $viewFileSystem,
6072
string $template
6173
) {
74+
$this->appState = $appState;
75+
$this->design = $design;
6276
$this->layoutInitiator = $layoutInitiator;
6377
$this->pageConfigRenderer = $rendererFactory->create(['pageConfig' => $pageConfig]);
6478
$this->translateInline = $translateInline;
@@ -73,22 +87,34 @@ public function __construct(
7387
*/
7488
public function render(array $data): string
7589
{
90+
return $this->appState->emulateAreaCode(
91+
Area::AREA_FRONTEND,
92+
function () use ($data): string { return $this->renderHtml($data); }
93+
);
94+
}
95+
96+
/**
97+
* @param array $data
98+
* @return string
99+
* @throws Exception
100+
*/
101+
private function renderHtml(array $data): string
102+
{
103+
// Workaround for emulated area code
104+
$this->design->setArea($this->design->getArea());
105+
$this->design->setDefaultDesignTheme();
106+
76107
$layout = $this->layoutInitiator->createLayout();
77108

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

84113
$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,
114+
'headContent' => $this->pageConfigRenderer->renderHeadContent(),
88115
'htmlAttributes' => $this->pageConfigRenderer->renderElementAttributes(Config::ELEMENT_TYPE_HTML),
89116
'headAttributes' => $this->pageConfigRenderer->renderElementAttributes(Config::ELEMENT_TYPE_HEAD),
90117
'bodyAttributes' => $this->pageConfigRenderer->renderElementAttributes(Config::ELEMENT_TYPE_BODY),
91-
'loaderIcon' => 'images/loader-2.gif',//todo
92118
'layoutContent' => $layout->getOutput(),
93119
]);
94120
$this->translateInline->processResponseBody($output);

‎Service/Export/Renderer/HtmlRenderer/LayoutInitiator.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,7 @@ public function createLayout(): LayoutInterface
8181
'generatorPool' => $this->layoutGeneratorPool,
8282
]);
8383

84-
$layout->getUpdate()->addHandle('default');
8584
$layout->getUpdate()->addHandle($this->defaultLayoutHandle);
86-
/** @var Merge $update */
87-
$update = $layout->getUpdate();
88-
if ($update->isLayoutDefined()) {
89-
$update->removeHandle('default');
90-
}
9185

9286
return $this->addConfigLayout($layout);
9387
}

‎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
}

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"require": {
1313
"php": "^7.2",
1414
"ext-zip": "*",
15-
"mikehaertl/phpwkhtmltopdf": "^2.3.1",
15+
"tecnickcom/tcpdf": "^6.3",
1616
"magento/framework": "^103.0",
1717
"magento/module-backend": "^101.0||^102.0",
1818
"magento/module-config": "^101.1",

‎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">

0 commit comments

Comments
 (0)