From 177eaa2ef50f1a7636c49874f358e7ef0f513ae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 11 Sep 2020 16:45:55 +0200 Subject: [PATCH 01/10] playful --- resources/views/pdf-designs/playful.html | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/resources/views/pdf-designs/playful.html b/resources/views/pdf-designs/playful.html index cb06ab79d622..672160867b64 100644 --- a/resources/views/pdf-designs/playful.html +++ b/resources/views/pdf-designs/playful.html @@ -68,7 +68,6 @@ margin-top: 1rem; padding: 1rem; border-top: 1px solid #009e90; - border-bottom: 1px solid #009e90; display: grid; grid-template-columns: 1fr 1fr; gap: 10px; @@ -77,6 +76,10 @@ margin-top: 1rem; padding: 1rem; border-top: 1px solid #009e90; + } + + .contact-wrapper-left-side, + .contact-wrapper-right-side { border-bottom: 1px solid #009e90; } @@ -117,10 +120,14 @@ text-align: right; } + #product-table-footer { + page-break-inside: avoid; + } + #product-table-footer > * { display: grid; grid-template-columns: 3fr 1fr 1fr; - padding-top: 1rem; + padding-top: 0.5rem; padding-left: 1rem; gap: 20px; } @@ -164,7 +171,7 @@
-
+

$to_label:

@@ -172,9 +179,8 @@
-
+

$from_label:

-
From 78bf39fcd1fcb46f77c97310875d0ea42787f644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 11 Sep 2020 16:46:09 +0200 Subject: [PATCH 02/10] plain --- resources/views/pdf-designs/plain.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html index cdfc6ebebe7d..e8eadaf91671 100644 --- a/resources/views/pdf-designs/plain.html +++ b/resources/views/pdf-designs/plain.html @@ -85,11 +85,15 @@ #product-table > tbody > tr > td:last-child { text-align: right; } + + #product-table-footer { + page-break-inside: avoid; + } #product-table-footer > * { display: grid; grid-template-columns: 3fr 1fr 1fr; - padding-top: 1rem; + padding-top: .5rem; padding-left: 1rem; gap: 20px; } From 3ac3f6006c31da05b93582444614faec76c46c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 11 Sep 2020 16:46:49 +0200 Subject: [PATCH 03/10] footer logic for custom props --- app/Services/PdfMaker/Design.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php index 953db989b4dd..1a64d205ed36 100644 --- a/app/Services/PdfMaker/Design.php +++ b/app/Services/PdfMaker/Design.php @@ -234,9 +234,9 @@ class Design extends BaseDesign $variable = sprintf('%s%s', '$', $property); if ( - !is_null($this->entity->{$property}) || - !empty($this->entity->{$property}) || - $this->entity->{$property} !== 0 + !is_null($this->entity->{$property}) && + !empty($this->entity->{$property}) && + $this->entity->{$property} != 0 ) { continue; } From d3f312b4eff376e5f1cb68e087393bb853dd64a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 11 Sep 2020 16:47:47 +0200 Subject: [PATCH 04/10] bold --- resources/views/pdf-designs/bold.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html index 52c25ccb579e..8560d000c2a5 100644 --- a/resources/views/pdf-designs/bold.html +++ b/resources/views/pdf-designs/bold.html @@ -110,10 +110,14 @@ background-color: #ebebeb; } + #product-table-footer { + page-break-inside: avoid; + } + #product-table-footer > * { display: grid; grid-template-columns: 3fr 1fr 1fr; - padding-top: 1.2rem; + padding-top: .5rem; padding-left: 1.2rem; gap: 20px; } From 0a33a408f2c29bfb0741183f7d1dec78b3439bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 11 Sep 2020 16:48:02 +0200 Subject: [PATCH 05/10] business --- resources/views/pdf-designs/business.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html index 6810f3614408..b2ddee254c3e 100644 --- a/resources/views/pdf-designs/business.html +++ b/resources/views/pdf-designs/business.html @@ -20,7 +20,7 @@ margin: 0; padding: 0; } - + .header-container { display: grid; grid-template-columns: 1.8fr 1fr 1fr; @@ -134,6 +134,11 @@ margin-right: 0; } } + + #product-table-footer { + page-break-inside: avoid; + } + #product-table-footer > *:last-child { border-bottom-left-radius: 1rem; border-bottom-right-radius: 1rem; From bc519a6f929a4d320595b7e8461f25e93cc015d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 11 Sep 2020 16:48:16 +0200 Subject: [PATCH 06/10] clean --- resources/views/pdf-designs/clean.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html index b6a58d6bdbd9..cf4f5e384a04 100644 --- a/resources/views/pdf-designs/clean.html +++ b/resources/views/pdf-designs/clean.html @@ -106,10 +106,14 @@ background-color: #f5f5f5; } + #product-table-footer { + page-break-inside: avoid; + } + #product-table-footer > * { display: grid; grid-template-columns: 3fr 1fr 1fr; - padding-top: 1rem; + padding-top: .5rem; padding-left: 1rem; gap: 20px; } From 45e2590d900792b0979411c448f8bef6cc1d2ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 11 Sep 2020 16:48:39 +0200 Subject: [PATCH 07/10] creative --- resources/views/pdf-designs/creative.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/views/pdf-designs/creative.html b/resources/views/pdf-designs/creative.html index 84d098ed2b1a..5966b7a140ca 100644 --- a/resources/views/pdf-designs/creative.html +++ b/resources/views/pdf-designs/creative.html @@ -107,6 +107,10 @@ background-color: #e8e8e8; } + #product-table-footer { + page-break-inside: avoid; + } + #product-table-footer > * { display: grid; grid-template-columns: 3fr 1fr 1fr; From bae6a097d78999b09442defe4d5f39ed5ab06c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 11 Sep 2020 16:49:59 +0200 Subject: [PATCH 08/10] elegant --- resources/views/pdf-designs/elegant.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/views/pdf-designs/elegant.html b/resources/views/pdf-designs/elegant.html index 9aae006f7d51..6a331eb6ef40 100644 --- a/resources/views/pdf-designs/elegant.html +++ b/resources/views/pdf-designs/elegant.html @@ -16,7 +16,6 @@ p { margin: 0; padding: 0; - page-break-after: always; } body { @@ -112,11 +111,15 @@ padding-bottom: 1rem; border-bottom: 4px solid; } + + #product-table-footer { + page-break-inside: avoid; + } #product-table-footer > * { display: grid; grid-template-columns: 3fr 1fr 1fr; - padding-top: 1rem; + padding-top: .5rem; padding-left: 1rem; gap: 20px; } From 9563f6e7a2df6a61fdaebe4880a2fae08e806d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 11 Sep 2020 16:50:49 +0200 Subject: [PATCH 09/10] hipster --- resources/views/pdf-designs/hipster.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/views/pdf-designs/hipster.html b/resources/views/pdf-designs/hipster.html index b92a10c6387c..7c984673b6ba 100644 --- a/resources/views/pdf-designs/hipster.html +++ b/resources/views/pdf-designs/hipster.html @@ -117,10 +117,14 @@ text-align: right; } + #product-table-footer { + page-break-inside: avoid; + } + #product-table-footer > * { display: grid; grid-template-columns: 3fr 1fr 1fr; - padding-top: 1.5rem; + padding-top: .5rem; padding-left: 1rem; gap: 20px; } From 2b70bd89a5111540c140fb628526206b815cdc0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 11 Sep 2020 16:54:56 +0200 Subject: [PATCH 10/10] modern --- resources/views/pdf-designs/modern.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/views/pdf-designs/modern.html b/resources/views/pdf-designs/modern.html index 5ad4baccbaeb..3f7439f393d5 100644 --- a/resources/views/pdf-designs/modern.html +++ b/resources/views/pdf-designs/modern.html @@ -115,10 +115,14 @@ margin-bottom: 0.5rem; } + #product-table-footer { + page-break-inside: avoid; + } + #product-table-footer > * { display: grid; grid-template-columns: 3fr 1fr 1fr; - margin-top: 1.5rem; + margin-top: .5rem; margin-right: 1.5rem; margin-left: 1.5rem; }