Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for spaces in designs

Browse Source
This commit is contained in:
David Bomba 2022-03-16 18:50:34 +11:00
parent 29ed09db5d
commit 1440a1291a
14 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/DataMapper/EmailTemplateDefaults.php
View File

@ -128,6 +128,13 @@ class EmailTemplateDefaults
return $invoice_message; return $invoice_message;
} }
public static function emailInvoiceReminderTemplate()
{
$invoice_message = '<p>$client<br><br>'.self::transformText('reminder_message').'</p><div class="center">$view_button</div>';
return $invoice_message;
}
public static function emailQuoteSubject() public static function emailQuoteSubject()
{ {
return ctrans('texts.quote_subject', ['number'=>'$number', 'account'=>'$company.name']); return ctrans('texts.quote_subject', ['number'=>'$number', 'account'=>'$company.name']);

2
app/Mail/Company/CompanyDeleted.php
View File

@ -50,7 +50,7 @@ class CompanyDeleted extends Mailable
public function build() public function build()
{ {
App::forgetInstance('translator'); App::forgetInstance('translator');
App::setLocale($this->company->getLocale()); App::setLocale($this->account->default_company->getLocale());
$t = app('translator'); $t = app('translator');
$t->replace(Ninja::transformTranslations($this->settings)); $t->replace(Ninja::transformTranslations($this->settings));

2
app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
View File

@ -379,7 +379,7 @@ document.addEventListener('DOMContentLoaded', function() {
'allow_unsafe_links' => false, 'allow_unsafe_links' => false,
]); ]);
return $converter->convertToHtml($markdown); return $converter->convert($markdown);
} }
// public function processMarkdownOnLineItems(array &$items): void // public function processMarkdownOnLineItems(array &$items): void

2
app/Services/PdfMaker/PdfMakerUtilities.php
View File

@ -95,7 +95,7 @@ trait PdfMakerUtilities
if (array_key_exists('process_markdown', $this->data) && array_key_exists('content', $child) && $this->data['process_markdown']) { if (array_key_exists('process_markdown', $this->data) && array_key_exists('content', $child) && $this->data['process_markdown']) {
$child['content'] = str_replace("<br>", "\r", $child['content']); $child['content'] = str_replace("<br>", "\r", $child['content']);
$child['content'] = $this->commonmark->convertToHtml($child['content'] ?? ''); $child['content'] = $this->commonmark->convert($child['content'] ?? '');
} }
} }

3
app/Utils/TemplateEngine.php
View File

@ -90,7 +90,6 @@ class TemplateEngine
if (strlen($this->entity) > 1 && strlen($this->entity_id) > 1) { if (strlen($this->entity) > 1 && strlen($this->entity_id) > 1) {
$class = 'App\Models\\'.ucfirst($this->entity); $class = 'App\Models\\'.ucfirst($this->entity);
$this->entity_obj = $class::withTrashed()->where('id', $this->decodePrimaryKey($this->entity_id))->company()->first(); $this->entity_obj = $class::withTrashed()->where('id', $this->decodePrimaryKey($this->entity_id))->company()->first();
nlog("the entity id = ".$this->entity_obj->id);
} else { } else {
$this->mockEntity(); $this->mockEntity();
} }
@ -168,7 +167,7 @@ class TemplateEngine
'allow_unsafe_links' => false, 'allow_unsafe_links' => false,
]); ]);
$this->body = $converter->convertToHtml($this->body); $this->body = $converter->convert($this->body);
} }
private function entityValues($contact) private function entityValues($contact)

2
app/Utils/Traits/PaymentEmailBuilder.php
View File

@ -81,7 +81,7 @@ trait PaymentEmailBuilder
'allow_unsafe_links' => false, 'allow_unsafe_links' => false,
]); ]);
$data = $converter->convertToHtml($data); $data = $converter->convert($data);
} }
return $data; return $data;

2
app/Utils/Traits/QuoteEmailBuilder.php
View File

@ -89,7 +89,7 @@ trait QuoteEmailBuilder
'allow_unsafe_links' => true, 'allow_unsafe_links' => true,
]); ]);
$data = $converter->convertToHtml($data); $data = $converter->convert($data);
} }
return $data; return $data;

2
resources/lang/en/texts.php
View File

@ -4569,7 +4569,7 @@ $LANG = array(
'quotes_backup_subject' => 'Your quotes are ready for download', 'quotes_backup_subject' => 'Your quotes are ready for download',
'credits_backup_subject' => 'Your credits are ready for download', 'credits_backup_subject' => 'Your credits are ready for download',
'document_download_subject' => 'Your documents are ready for download', 'document_download_subject' => 'Your documents are ready for download',
'reminder_message' => 'Reminder for invoice :number for :balance',
); );
return $LANG; return $LANG;

4
resources/views/pdf-designs/bold.html
View File

@ -53,7 +53,7 @@
#header, #header-spacer { #header, #header-spacer {
height: 160px; height: 160px;
padding: 3rem; padding: 3rem;
margin-bottom: 3rem; margin-bottom: 1rem;
} }
.company-logo { .company-logo {
height: 100%; height: 100%;
@ -232,7 +232,7 @@
#footer, #footer-spacer { #footer, #footer-spacer {
height: 160px; height: 160px;
padding: 1rem 3rem; padding: 1rem 3rem;
margin-top: 3rem; margin-top: 1rem;
} }
[data-ref="total_table-footer"] { [data-ref="total_table-footer"] {

15
resources/views/pdf-designs/business.html
View File

@ -16,7 +16,10 @@
} }
@page { @page {
margin: $global_margin; margin-left: $global_margin;
margin-right: $global_margin;
margin-top: 0;
margin-bottom: 0;
size: $page_size $page_layout; size: $page_size $page_layout;
} }
@ -96,7 +99,7 @@
} }
[data-ref="table"] { [data-ref="table"] {
margin-top: 3.5rem; margin-top: 0.5rem;
/* margin-bottom: 200px; */ /* margin-bottom: 200px; */
min-width: 100%; min-width: 100%;
table-layout: fixed; table-layout: fixed;
@ -153,10 +156,6 @@
font-weight: bold !important; font-weight: bold !important;
} }
#table-totals {
page-break-inside: avoid;
}
#table-totals > *:last-child { #table-totals > *:last-child {
border-bottom-left-radius: 1rem; border-bottom-left-radius: 1rem;
border-bottom-right-radius: 1rem; border-bottom-right-radius: 1rem;
@ -171,6 +170,8 @@
padding-top: 0.5rem; padding-top: 0.5rem;
padding-bottom: 0.8rem; padding-bottom: 0.8rem;
margin-right: .5rem; margin-right: .5rem;
page-break-inside:auto;
overflow: visible !important;
} }
#table-totals .totals-table-right-side>* { #table-totals .totals-table-right-side>* {
@ -349,7 +350,7 @@
$entity_images $entity_images
<div class="repeating-footer" id="footer"> <div class="repeating-footerx" id="footer">
<p data-ref="total_table-footer">$entity_footer</p> <p data-ref="total_table-footer">$entity_footer</p>

17
resources/views/pdf-designs/creative.html
View File

@ -16,7 +16,10 @@
} }
@page { @page {
margin: $global_margin; margin-left: $global_margin;
margin-right: $global_margin;
margin-top: 0;
margin-bottom: 0;
size: $page_size $page_layout; size: $page_size $page_layout;
} }
@ -61,7 +64,7 @@
.entity-label-wrapper { .entity-label-wrapper {
display: grid; display: grid;
grid-template-columns: 2fr 1fr; grid-template-columns: 2fr 1fr;
margin-top: 3rem; margin-top: 1rem;
} }
.entity-label-wrapper .entity-label > * { .entity-label-wrapper .entity-label > * {
@ -130,16 +133,14 @@
} }
#table-totals { #table-totals {
page-break-inside: avoid; margin-top: 0rem;
}
#table-totals {
margin-top: 1rem;
display: grid; display: grid;
grid-template-columns: 2fr 1fr; grid-template-columns: 2fr 1fr;
padding-top: 1rem; padding-top: 1rem;
margin-right: .75rem; margin-right: .75rem;
gap: 80px; gap: 80px;
page-break-inside:auto;
overflow: visible !important;
} }
#table-totals .totals-table-right-side>* { #table-totals .totals-table-right-side>* {
@ -306,7 +307,7 @@
$entity_images $entity_images
<div class="repeating-footer" id="footer"> <div class="repeating-footerx" id="footer">
<p data-ref="total_table-footer">$entity_footer</p> <p data-ref="total_table-footer">$entity_footer</p>

12
resources/views/pdf-designs/elegant.html
View File

@ -43,7 +43,7 @@
.client-entity-wrapper { .client-entity-wrapper {
display: flex; display: flex;
margin-top: 3rem; margin-top: 1rem;
gap: 20px; gap: 20px;
margin-left: 10px; margin-left: 10px;
line-height: var(--line-height); line-height: var(--line-height);
@ -133,17 +133,15 @@
} }
#table-totals { #table-totals {
page-break-inside: avoid; margin-top: 0.5rem;
}
#table-totals {
margin-top: 1rem;
display: grid; display: grid;
grid-template-columns: 2fr 1fr; grid-template-columns: 2fr 1fr;
padding-top: 0.5rem; padding-top: 0.5rem;
padding-left: 1rem; padding-left: 1rem;
margin-right: .75rem; margin-right: .75rem;
gap: 80px; gap: 80px;
page-break-inside:auto;
overflow: visible !important;
} }
#table-totals .totals-table-right-side>* { #table-totals .totals-table-right-side>* {
@ -316,7 +314,7 @@
$entity_images $entity_images
<div class="repeating-footer" id="footer"> <div class="repeating-footerx" id="footer">
<p data-ref="total_table-footer">$entity_footer</p> <p data-ref="total_table-footer">$entity_footer</p>
<script> <script>

10
resources/views/pdf-designs/hipster.html
View File

@ -140,10 +140,6 @@
text-align: right; text-align: right;
} }
#table-totals {
page-break-inside: avoid;
}
#table-totals { #table-totals {
margin-top: 1rem; margin-top: 1rem;
display: grid; display: grid;
@ -151,6 +147,8 @@
padding-top: 0.5rem; padding-top: 0.5rem;
margin-right: .75rem; margin-right: .75rem;
gap: 80px; gap: 80px;
page-break-inside:auto;
overflow: visible !important;
} }
#table-totals .totals-table-right-side>* { #table-totals .totals-table-right-side>* {
@ -231,7 +229,7 @@
.repeating-header-space, **/ .repeating-header-space, **/
.repeating-footer, .repeating-footer,
.repeating-footer-space { .repeating-footer-space {
height: 160px; height: 0;
} }
.repeating-header { .repeating-header {
position: fixed; position: fixed;
@ -357,7 +355,7 @@
$entity_images $entity_images
<div class="repeating-footer" id="footer"> <div class="repeating-footerx" id="footer">
<p data-ref="total_table-footer">$entity_footer</p> <p data-ref="total_table-footer">$entity_footer</p>
<script> <script>

10
resources/views/pdf-designs/playful.html
View File

@ -11,7 +11,7 @@
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
font-family: $font_name, Helvetica, sans-serif; font-family: $font_name, Helvetica, sans-serif;
font-size: $font_size; font-size: "$font_size";
zoom: 80%; zoom: 80%;
} }
@ -102,7 +102,7 @@
[data-ref="table"] { [data-ref="table"] {
padding-left: 3rem; padding-left: 3rem;
padding-right: 3rem; padding-right: 3rem;
margin-top: 3rem; margin-top: 1rem;
/* margin-bottom: 200px; */ /* margin-bottom: 200px; */
min-width: 100%; min-width: 100%;
table-layout: fixed; table-layout: fixed;
@ -154,10 +154,6 @@
text-align: right; text-align: right;
} }
#table-totals {
page-break-inside: avoid;
}
#table-totals { #table-totals {
margin-top: 1rem; margin-top: 1rem;
display: grid; display: grid;
@ -166,6 +162,8 @@
padding-left: 3rem; padding-left: 3rem;
padding-right: 3rem; padding-right: 3rem;
margin-right: .75rem; margin-right: .75rem;
page-break-inside:auto;
overflow: visible !important;
} }
#table-totals .totals-table-right-side>* { #table-totals .totals-table-right-side>* {