From b7bdf3b341ab51e7ba6dec7d71bff2816af0613e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Mon, 20 Jul 2020 13:02:30 +0200 Subject: [PATCH] Support $ instead of # for variables --- tests/Feature/PdfMaker/PdfMaker.php | 2 +- .../Feature/PdfMaker/PdfMakerDesignsTest.php | 59 ++++++++++++------- 2 files changed, 39 insertions(+), 22 deletions(-) diff --git a/tests/Feature/PdfMaker/PdfMaker.php b/tests/Feature/PdfMaker/PdfMaker.php index cba480b4f179..5f6c7da071b2 100644 --- a/tests/Feature/PdfMaker/PdfMaker.php +++ b/tests/Feature/PdfMaker/PdfMaker.php @@ -45,6 +45,6 @@ class PdfMaker public function getCompiledHTML() { - return $this->document->saveHTML(); + return $this->document->saveXML(); } } diff --git a/tests/Feature/PdfMaker/PdfMakerDesignsTest.php b/tests/Feature/PdfMaker/PdfMakerDesignsTest.php index bde0bbb558f1..c52b27b95692 100644 --- a/tests/Feature/PdfMaker/PdfMakerDesignsTest.php +++ b/tests/Feature/PdfMaker/PdfMakerDesignsTest.php @@ -16,21 +16,23 @@ class PdfMakerDesignsTest extends TestCase $this->state = [ 'variables' => [ - '#css' => asset('css/tailwindcss@1.4.6.css'), - '#global-margin' => 'm-12', + '$css' => asset('css/tailwindcss@1.4.6.css'), + '$global-margin' => 'm-12', - '#company-logo' => 'https://invoiceninja-invoice-templates.netlify.app/assets/images/invoiceninja-logo.png', - '#entity-number-label' => 'Invoice number', - '#entity-number' => '10000', - '#entity-date-label' => 'Invoice date', - '#entity-date' => '3th of June, 2025.', - '#due-date-label' => 'Due date', - '#due-date' => '5th of June, 2025.', - '#balance-due-label' => 'Balance due', - '#balance-due' => '$800.50', + '$company-logo' => 'https://invoiceninja-invoice-templates.netlify.app/assets/images/invoiceninja-logo.png', + '$entity-number-label' => 'Invoice number', + '$entity-number' => '10000', + '$entity-date-label' => 'Invoice date', + '$entity-date' => '3th of June, 2025.', + '$due-date-label' => 'Due date', + '$due-date' => '5th of June, 2025.', + '$balance-due-label' => 'Balance due', + '$balance-due' => '$800.50', - '#terms-label' => 'Terms', - '#terms' => 'Trend and SEO report has been sent via email. This is really long text just to test the width of the elements.', + '$terms-label' => 'Terms', + '$terms' => 'Trend and SEO report has been sent via email. This is really long text just to test the width of the elements.', + + '$invoice-issued-to' => 'Invoice issued to:', ], ]; } @@ -69,16 +71,16 @@ class PdfMakerDesignsTest extends TestCase 'id' => 'entity-details', 'elements' => [ ['element' => 'div', 'content' => '', 'elements' => [ - ['element' => 'p', 'content' => '#entity-number-label'], - ['element' => 'p', 'content' => '#entity-date-label'], - ['element' => 'p', 'content' => '#due-date-label'], - ['element' => 'p', 'content' => '#balance-due-label'], + ['element' => 'p', 'content' => '$entity-number-label'], + ['element' => 'p', 'content' => '$entity-date-label'], + ['element' => 'p', 'content' => '$due-date-label'], + ['element' => 'p', 'content' => '$balance-due-label'], ]], ['element' => 'div', 'content' => '', 'elements' => [ - ['element' => 'p', 'content' => '#entity-number'], - ['element' => 'p', 'content' => '#entity-date'], - ['element' => 'p', 'content' => '#due-date'], - ['element' => 'p', 'content' => '#balance-due'], + ['element' => 'p', 'content' => '$entity-number'], + ['element' => 'p', 'content' => '$entity-date'], + ['element' => 'p', 'content' => '$due-date'], + ['element' => 'p', 'content' => '$balance-due'], ]], ], ], @@ -130,4 +132,19 @@ class PdfMakerDesignsTest extends TestCase info($maker->getCompiledHTML()); } + + public function testClean() + { + $state = []; + + $maker = new PdfMaker($state); + + $maker + ->design(Business::class) + ->build(); + + exec('echo "" > storage/logs/laravel.log'); + + info($maker->getCompiledHTML()); + } }