Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions Classes/EventListener/Order/Finish/DocumentRenderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,28 @@
* LICENSE file that was distributed with this source code.
*/

use Extcode\Cart\Domain\Repository\Order\ItemRepository as OrderItemRepository;
use Extcode\Cart\Event\Order\FinishEvent;
use Extcode\CartPdf\Service\PdfService;
use Extcode\Cart\Domain\Repository\Order\ItemRepository as OrderItemRepository;
use Extcode\Cart\Event\Order\EventInterface;
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerAwareTrait;
use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;

class DocumentRenderer
class DocumentRenderer implements LoggerAwareInterface
{
use LoggerAwareTrait;

public function __construct(
protected PersistenceManager $persistenceManager,
protected OrderItemRepository $orderItemRepository,
protected PdfService $pdfService,
) {}

public function __invoke(FinishEvent $event): void
public function __invoke(EventInterface $event): void
{
$orderItem = $event->getOrderItem();
$settings = $event->getSettings();

$this->logger->debug('DocumentRenderer', $settings);
$generateDocuments = (array)($settings['autoGenerateDocuments'] ?? []);

if (empty($generateDocuments)) {
Expand Down
6 changes: 3 additions & 3 deletions Classes/Service/PdfService.php
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ private function renderCartHeader(OrderItem $orderItem, string $pdfType): string
$view->assign('orderItem', $orderItem);
$header = $view->render();

return trim(preg_replace('~[\\n]+~', '', $header));
return trim(preg_replace('~[\\n]+~', '', $header ?? ''));
}

private function renderCartBody(OrderItem $orderItem, string $pdfType): string
Expand All @@ -247,7 +247,7 @@ private function renderCartBody(OrderItem $orderItem, string $pdfType): string
$view->assign('product', $product);
$product = $view->render();

$bodyOut .= trim(preg_replace('~[\\n]+~', '', $product));
$bodyOut .= trim(preg_replace('~[\\n]+~', '', $product ?? ''));
}

return $bodyOut;
Expand All @@ -260,7 +260,7 @@ private function renderCartFooter(OrderItem $orderItem, string $pdfType): string
$view->assign('orderItem', $orderItem);
$footer = $view->render();

return trim(preg_replace('~[\\n]+~', '', $footer));
return trim(preg_replace('~[\\n]+~', '', $footer ?? ''));
}

private function createFileReferenceFromFalFileObject(File $file): FileReference
Expand Down
44 changes: 44 additions & 0 deletions Configuration/Services.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?php

declare(strict_types=1);

namespace Extcode\CartPdf;

use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

return static function (ContainerConfigurator $containerConfigurator, ContainerBuilder $containerBuilder) {
$services = $containerConfigurator->services();
$services->defaults()
->private()
->autowire()
->autoconfigure();

$services->load('Extcode\\CartPdf\\', __DIR__ . '/../Classes/')
->exclude(__DIR__ . '/../Classes/Domain/Model/');

// Make PdfService public
$services->set(\Extcode\CartPdf\Service\PdfService::class)
->public();

// Conditionally register event listeners based on cart_payone availability
if (class_exists('\\Extcode\\CartPayone\\Event\\Order\\FinishEvent')) {
// Register listeners for cart_payone events
$services->set('cart_pdf.event_listener.document_renderer.payone')
->class(\Extcode\CartPdf\EventListener\Order\Finish\DocumentRenderer::class)
->tag('event.listener', [
'identifier' => 'cart-pdf--order--finish--document-renderer-payone',
'event' => \Extcode\CartPayone\Event\Order\FinishEvent::class,
'before' => 'cart--order--finish--email',
]);
} else {
// Register listeners for standard cart events
$services->set('cart_pdf.event_listener.document_renderer.cart')
->class(\Extcode\CartPdf\EventListener\Order\Finish\DocumentRenderer::class)
->tag('event.listener', [
'identifier' => 'cart--order--finish--document-renderer',
'event' => \Extcode\Cart\Event\Order\FinishEvent::class,
'before' => 'cart--order--finish--email',
]);
}
};
16 changes: 0 additions & 16 deletions Configuration/Services.yaml

This file was deleted.