From 8d2e564c18bea31f04b870c5e9fcca7fb4396164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Thu, 20 May 2021 14:55:32 +0200 Subject: [PATCH 01/11] Improve paddings & margins: Plain --- resources/views/pdf-designs/plain.html | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html index 53577cf89b9b..2ca23038e1a6 100644 --- a/resources/views/pdf-designs/plain.html +++ b/resources/views/pdf-designs/plain.html @@ -117,6 +117,7 @@ } #table-totals { + margin-top: 1rem; display: grid; grid-template-columns: 2fr 1fr; padding-top: .5rem; @@ -154,6 +155,10 @@ [data-ref="total_table-footer"] { padding-left: 1rem } + + #footer { + margin-top: 30px; + } @@ -179,11 +184,22 @@
-
-
+ +
From 020c767360fec94ddf8d621c061df482b741bd19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Thu, 20 May 2021 14:56:01 +0200 Subject: [PATCH 02/11] Improve paddings & margins: Clean --- resources/views/pdf-designs/clean.html | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html index 218bb503a556..589b6f232416 100644 --- a/resources/views/pdf-designs/clean.html +++ b/resources/views/pdf-designs/clean.html @@ -148,6 +148,7 @@ } #table-totals { + margin-top: 1rem; display: grid; grid-template-columns: 2fr 1fr; padding-top: .5rem; @@ -187,8 +188,8 @@ padding-right: 1rem; } - [data-ref="total_table-footer"] { - padding-left: 1rem + #footer { + margin-top: 30px; } @@ -217,11 +218,22 @@
-
-
+ +
From cd2ce9ffe282446cb70f07281b9bc2b5f0d798e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Thu, 20 May 2021 14:56:21 +0200 Subject: [PATCH 03/11] Improve paddings & margins: Bold --- resources/views/pdf-designs/bold.html | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html index 3e3852ff00af..2059b0e9b235 100644 --- a/resources/views/pdf-designs/bold.html +++ b/resources/views/pdf-designs/bold.html @@ -141,6 +141,7 @@ } #table-totals { + margin-top: 1rem; display: grid; grid-template-columns: 2fr 1fr; padding-top: .5rem; @@ -241,6 +242,17 @@ From 54a480360ee02c808ef899e7a9e7893fdb14af16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Thu, 20 May 2021 15:02:00 +0200 Subject: [PATCH 07/11] Improve paddings & margins: Elegant --- resources/views/pdf-designs/elegant.html | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/resources/views/pdf-designs/elegant.html b/resources/views/pdf-designs/elegant.html index 18b1d9378d37..1b707c746c96 100644 --- a/resources/views/pdf-designs/elegant.html +++ b/resources/views/pdf-designs/elegant.html @@ -137,6 +137,7 @@ } #table-totals { + margin-top: 1rem; display: grid; grid-template-columns: 2fr 1fr; padding-top: 0.5rem; @@ -180,6 +181,10 @@ [data-ref="total_table-footer"] { padding-left: 1rem } + + #footer { + margin-top: 30px; + } @@ -219,12 +224,23 @@
-
-
+ +
From c5de2f6e65fc77e9a0e90e99e90f7bbece62027a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Thu, 20 May 2021 15:02:44 +0200 Subject: [PATCH 08/11] Improve paddings & margins: Hipster --- resources/views/pdf-designs/hipster.html | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/resources/views/pdf-designs/hipster.html b/resources/views/pdf-designs/hipster.html index 9fc25df7321e..6858e4bd681a 100644 --- a/resources/views/pdf-designs/hipster.html +++ b/resources/views/pdf-designs/hipster.html @@ -153,6 +153,7 @@ } #table-totals { + margin-top: 1rem; display: grid; grid-template-columns: 2fr 1fr; padding-top: 0.5rem; @@ -191,6 +192,10 @@ text-align: right; padding-right: 1rem; } + + #footer { + margin-top: 30px; + } @@ -251,11 +256,22 @@
-
-
+ +
From 89f634bc346a2df8352b3e2ace9c7574ef8b2633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Thu, 20 May 2021 15:03:54 +0200 Subject: [PATCH 09/11] Improve paddings & margins: Playful --- resources/views/pdf-designs/playful.html | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/resources/views/pdf-designs/playful.html b/resources/views/pdf-designs/playful.html index 39a4e01d55c1..0fa90fa45841 100644 --- a/resources/views/pdf-designs/playful.html +++ b/resources/views/pdf-designs/playful.html @@ -169,6 +169,7 @@ } #table-totals { + margin-top: 1rem; display: grid; grid-template-columns: 2fr 1fr; gap: 80px; @@ -227,6 +228,10 @@ padding-left: 3rem; padding-right: 3rem; } + + #footer { + margin-top: 1rem; + } @@ -275,12 +280,23 @@
-
-
+ +
From 9d7089b5b5ba47d7008d1314e9d84a710dc5f860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Thu, 20 May 2021 15:04:24 +0200 Subject: [PATCH 10/11] Change shared elements with delivery_note table --- app/Services/PdfMaker/Design.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php index 7a2272012794..f24aebd1d148 100644 --- a/app/Services/PdfMaker/Design.php +++ b/app/Services/PdfMaker/Design.php @@ -432,10 +432,6 @@ class Design extends BaseDesign ? $this->context['variables'] : ['values' => ['$entity.public_notes' => $this->entity->public_notes, '$entity.terms' => $this->entity->terms, '$entity_footer' => $this->entity->footer], 'labels' => []]; - if ($this->type == 'delivery_note') { - return []; - } - $variables = $this->context['pdf_variables']['total_columns']; $elements = [ @@ -453,6 +449,10 @@ class Design extends BaseDesign ['element' => 'div', 'properties' => ['class' => 'totals-table-right-side'], 'elements' => []], ]; + if ($this->type == 'delivery_note') { + return $elements; + } + foreach (['discount'] as $property) { $variable = sprintf('%s%s', '$', $property); From b19561f8c4a1a0b8fdb3bf754d3e1968a042d7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Thu, 20 May 2021 15:04:53 +0200 Subject: [PATCH 11/11] Update migration --- ...19_update_designs.php => 2021_05_20_115919_update_designs.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename database/migrations/{2021_05_19_115919_update_designs.php => 2021_05_20_115919_update_designs.php} (100%) diff --git a/database/migrations/2021_05_19_115919_update_designs.php b/database/migrations/2021_05_20_115919_update_designs.php similarity index 100% rename from database/migrations/2021_05_19_115919_update_designs.php rename to database/migrations/2021_05_20_115919_update_designs.php