diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index 6c0cb23fc113..f39912640a79 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -370,6 +370,9 @@ class HtmlEngine //$data['$entity_footer'] = ['value' => $this->client->getSetting("{$this->entity_string}_footer"), 'label' => '']; $data['$entity_footer'] = ['value' => $this->entity->footer, 'label' => '']; + $data['$page_size'] = ['value' => $this->settings->page_size, 'label' => '']; + $data['$page_layout'] = ['value' => $this->settings->page_layout, 'label' => '']; + $arrKeysLength = array_map('strlen', array_keys($data)); array_multisort($arrKeysLength, SORT_DESC, $data); diff --git a/database/migrations/2021_03_18_115919_update_designs.php b/database/migrations/2021_04_08_115919_update_designs.php similarity index 100% rename from database/migrations/2021_03_18_115919_update_designs.php rename to database/migrations/2021_04_08_115919_update_designs.php diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html index c45aed83da0c..0dfb07b61130 100644 --- a/resources/views/pdf-designs/bold.html +++ b/resources/views/pdf-designs/bold.html @@ -14,6 +14,7 @@ @page { margin: -0.25cm !important; + size: $page_size $page_layout; } p { diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html index d8407354df23..0f8eaa1fc657 100644 --- a/resources/views/pdf-designs/business.html +++ b/resources/views/pdf-designs/business.html @@ -14,6 +14,7 @@ @page { margin: $global_margin; + size: $page_size $page_layout; } p { diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html index da5106f2082e..1c35ed87167a 100644 --- a/resources/views/pdf-designs/clean.html +++ b/resources/views/pdf-designs/clean.html @@ -14,6 +14,7 @@ @page { margin: $global_margin; + size: $page_size $page_layout; } p { diff --git a/resources/views/pdf-designs/creative.html b/resources/views/pdf-designs/creative.html index 7a316f21467b..10454b16f5f2 100644 --- a/resources/views/pdf-designs/creative.html +++ b/resources/views/pdf-designs/creative.html @@ -14,6 +14,7 @@ @page { margin: $global_margin; + size: $page_size $page_layout; } p { diff --git a/resources/views/pdf-designs/elegant.html b/resources/views/pdf-designs/elegant.html index 1ac6a8b8e749..bdcfd88d1323 100644 --- a/resources/views/pdf-designs/elegant.html +++ b/resources/views/pdf-designs/elegant.html @@ -14,6 +14,7 @@ @page { margin: $global_margin; + size: $page_size $page_layout; } p { diff --git a/resources/views/pdf-designs/hipster.html b/resources/views/pdf-designs/hipster.html index 0c61a239bc49..95203018680e 100644 --- a/resources/views/pdf-designs/hipster.html +++ b/resources/views/pdf-designs/hipster.html @@ -14,6 +14,7 @@ @page { margin: $global_margin; + size: $page_size $page_layout; } p { diff --git a/resources/views/pdf-designs/modern.html b/resources/views/pdf-designs/modern.html index d4aace1f9f36..c30c02006896 100644 --- a/resources/views/pdf-designs/modern.html +++ b/resources/views/pdf-designs/modern.html @@ -16,6 +16,7 @@ @page { margin: -0.22cm; + size: $page_size $page_layout; } p { diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html index 9d6ae5c30a7c..edfaded7ed0c 100644 --- a/resources/views/pdf-designs/plain.html +++ b/resources/views/pdf-designs/plain.html @@ -14,6 +14,7 @@ @page { margin: $global_margin; + size: $page_size $page_layout; } p { diff --git a/resources/views/pdf-designs/playful.html b/resources/views/pdf-designs/playful.html index cf18653fb936..0081c1a5a828 100644 --- a/resources/views/pdf-designs/playful.html +++ b/resources/views/pdf-designs/playful.html @@ -14,6 +14,7 @@ @page { margin: -0.25cm !important; + size: $page_size $page_layout; } p {