From 540b1848881d747638313d7da130f9521a16d374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Sun, 25 Apr 2021 15:17:47 +0200 Subject: [PATCH 1/4] Put in the #footer of templates --- resources/views/pdf-designs/bold.html | 2 +- resources/views/pdf-designs/business.html | 2 +- resources/views/pdf-designs/clean.html | 2 +- resources/views/pdf-designs/creative.html | 2 +- resources/views/pdf-designs/elegant.html | 2 +- resources/views/pdf-designs/hipster.html | 2 +- resources/views/pdf-designs/modern.html | 2 +- resources/views/pdf-designs/plain.html | 2 +- resources/views/pdf-designs/playful.html | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html index 7cb4876dfac9..07cb841094fe 100644 --- a/resources/views/pdf-designs/bold.html +++ b/resources/views/pdf-designs/bold.html @@ -239,7 +239,7 @@ diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html index ab62a4a52aa8..b599c2181c41 100644 --- a/resources/views/pdf-designs/clean.html +++ b/resources/views/pdf-designs/clean.html @@ -223,5 +223,5 @@ diff --git a/resources/views/pdf-designs/creative.html b/resources/views/pdf-designs/creative.html index d880a7483da5..22ad3504abc9 100644 --- a/resources/views/pdf-designs/creative.html +++ b/resources/views/pdf-designs/creative.html @@ -221,5 +221,5 @@ diff --git a/resources/views/pdf-designs/elegant.html b/resources/views/pdf-designs/elegant.html index d7e6abeaa7a1..98e2cdc10701 100644 --- a/resources/views/pdf-designs/elegant.html +++ b/resources/views/pdf-designs/elegant.html @@ -221,6 +221,6 @@ diff --git a/resources/views/pdf-designs/hipster.html b/resources/views/pdf-designs/hipster.html index b4b054c0c604..666ab0031125 100644 --- a/resources/views/pdf-designs/hipster.html +++ b/resources/views/pdf-designs/hipster.html @@ -258,5 +258,5 @@ diff --git a/resources/views/pdf-designs/modern.html b/resources/views/pdf-designs/modern.html index e7f975360dc6..107567d8f72e 100644 --- a/resources/views/pdf-designs/modern.html +++ b/resources/views/pdf-designs/modern.html @@ -248,7 +248,7 @@ From f0255d4ed94bb81d2880c561664745f2ec00ea67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Sun, 25 Apr 2021 15:20:23 +0200 Subject: [PATCH 2/4] Show $entity.public_notes in the totalsTable & remove $entity_footer --- app/Services/PdfMaker/Design.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php index 3228b94f26e2..7a2272012794 100644 --- a/app/Services/PdfMaker/Design.php +++ b/app/Services/PdfMaker/Design.php @@ -440,10 +440,10 @@ class Design extends BaseDesign $elements = [ ['element' => 'div', 'properties' => ['style' => 'display: flex; flex-direction: column;'], 'elements' => [ + ['element' => 'p', 'content' => strtr($_variables['values']['$entity.public_notes'], $_variables), 'properties' => ['data-ref' => 'total_table-public_notes', 'style' => 'text-align: left;']], ['element' => 'p', 'content' => '', 'properties' => ['style' => 'text-align: left; display: flex; flex-direction: column;'], 'elements' => [ ['element' => 'span', 'content' => '$entity.terms_label: ', 'properties' => ['hidden' => $this->entityVariableCheck('$entity.terms'), 'data-ref' => 'total_table-terms-label', 'style' => 'font-weight: bold; text-align: left; margin-top: 1rem;']], ['element' => 'span', 'content' => strtr($_variables['values']['$entity.terms'], $_variables), 'properties' => ['data-ref' => 'total_table-terms', 'style' => 'text-align: left;']], - ['element' => 'span', 'content' => strtr($_variables['values']['$entity_footer'], $_variables), 'properties' => ['data-ref' => 'total_table-footer', 'style' => 'text-align: left; margin-top: 1rem;']], ]], ['element' => 'img', 'properties' => ['hidden' => $this->client->getSetting('signature_on_pdf'), 'style' => 'max-width: 50%; height: auto;', 'src' => '$contact.signature']], ['element' => 'div', 'properties' => ['style' => 'margin-top: 1.5rem; display: flex; align-items: flex-start;'], 'elements' => [ From 0651ddaff084231afd3e4542370aeb5f20223725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Sun, 25 Apr 2021 15:22:29 +0200 Subject: [PATCH 3/4] Update CSS for the --- resources/views/pdf-designs/bold.html | 2 +- resources/views/pdf-designs/business.html | 2 +- resources/views/pdf-designs/clean.html | 2 +- resources/views/pdf-designs/creative.html | 2 +- resources/views/pdf-designs/elegant.html | 2 +- resources/views/pdf-designs/modern.html | 2 +- resources/views/pdf-designs/plain.html | 2 +- resources/views/pdf-designs/playful.html | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html index 07cb841094fe..09b8e686d3b2 100644 --- a/resources/views/pdf-designs/bold.html +++ b/resources/views/pdf-designs/bold.html @@ -216,7 +216,7 @@ color: white; } - [data-ref="total_table-public_notes"] { + [data-ref="total_table-footer"] { padding-top: 0.5rem } diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html index b9ac71d61f9c..bc81d675378d 100644 --- a/resources/views/pdf-designs/business.html +++ b/resources/views/pdf-designs/business.html @@ -219,7 +219,7 @@ padding-right: 1rem; } - [data-ref="total_table-public_notes"] { + [data-ref="total_table-footer"] { padding-left: 1rem } diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html index b599c2181c41..f679ff30a325 100644 --- a/resources/views/pdf-designs/clean.html +++ b/resources/views/pdf-designs/clean.html @@ -187,7 +187,7 @@ padding-right: 1rem; } - [data-ref="total_table-public_notes"] { + [data-ref="total_table-footer"] { padding-left: 1rem } diff --git a/resources/views/pdf-designs/creative.html b/resources/views/pdf-designs/creative.html index 22ad3504abc9..04a9e46538a7 100644 --- a/resources/views/pdf-designs/creative.html +++ b/resources/views/pdf-designs/creative.html @@ -179,7 +179,7 @@ padding-right: 1rem; } - [data-ref="total_table-public_notes"] { + [data-ref="total_table-footer"] { padding-left: 1rem } diff --git a/resources/views/pdf-designs/elegant.html b/resources/views/pdf-designs/elegant.html index 98e2cdc10701..52129952f287 100644 --- a/resources/views/pdf-designs/elegant.html +++ b/resources/views/pdf-designs/elegant.html @@ -173,7 +173,7 @@ padding-right: 0.5rem; } - [data-ref="total_table-public_notes"] { + [data-ref="total_table-footer"] { padding-left: 1rem } diff --git a/resources/views/pdf-designs/modern.html b/resources/views/pdf-designs/modern.html index 107567d8f72e..59c6fbd85994 100644 --- a/resources/views/pdf-designs/modern.html +++ b/resources/views/pdf-designs/modern.html @@ -223,7 +223,7 @@ padding: 1rem; } - [data-ref="total_table-public_notes"] { + [data-ref="total_table-footer"] { margin-top: 2rem; margin-bottom: 2rem } diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html index 9d49108d12be..7f45caa81fc3 100644 --- a/resources/views/pdf-designs/plain.html +++ b/resources/views/pdf-designs/plain.html @@ -151,7 +151,7 @@ padding-right: 1rem; } - [data-ref="total_table-public_notes"] { + [data-ref="total_table-footer"] { padding-left: 1rem } diff --git a/resources/views/pdf-designs/playful.html b/resources/views/pdf-designs/playful.html index e5aa09b0c348..70a055872a49 100644 --- a/resources/views/pdf-designs/playful.html +++ b/resources/views/pdf-designs/playful.html @@ -222,7 +222,7 @@ padding: 10px; } - [data-ref="total_table-public_notes"] { + [data-ref="total_table-footer"] { text-align: left; padding-left: 3rem; padding-right: 3rem; From e7b67801a6cb41ddbd10af71d0a6aa5339fdf18f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Sun, 25 Apr 2021 15:23:03 +0200 Subject: [PATCH 4/4] Update designs migration --- ...19_update_designs.php => 2021_04_25_115919_update_designs.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename database/migrations/{2021_04_08_115919_update_designs.php => 2021_04_25_115919_update_designs.php} (100%) diff --git a/database/migrations/2021_04_08_115919_update_designs.php b/database/migrations/2021_04_25_115919_update_designs.php similarity index 100% rename from database/migrations/2021_04_08_115919_update_designs.php rename to database/migrations/2021_04_25_115919_update_designs.php