diff --git a/app/DataMapper/EmailTemplateDefaults.php b/app/DataMapper/EmailTemplateDefaults.php index ef42c513e612..8b9a9f7660c5 100644 --- a/app/DataMapper/EmailTemplateDefaults.php +++ b/app/DataMapper/EmailTemplateDefaults.php @@ -128,6 +128,13 @@ class EmailTemplateDefaults return $invoice_message; } + public static function emailInvoiceReminderTemplate() + { + $invoice_message = '

$client

'.self::transformText('reminder_message').'

$view_button
'; + + return $invoice_message; + } + public static function emailQuoteSubject() { return ctrans('texts.quote_subject', ['number'=>'$number', 'account'=>'$company.name']); diff --git a/app/Mail/Company/CompanyDeleted.php b/app/Mail/Company/CompanyDeleted.php index 7ec9d169c05e..99e197d97b03 100644 --- a/app/Mail/Company/CompanyDeleted.php +++ b/app/Mail/Company/CompanyDeleted.php @@ -50,7 +50,7 @@ class CompanyDeleted extends Mailable public function build() { App::forgetInstance('translator'); - App::setLocale($this->company->getLocale()); + App::setLocale($this->account->default_company->getLocale()); $t = app('translator'); $t->replace(Ninja::transformTranslations($this->settings)); diff --git a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php index f2f61cc68240..5ef3916b2e99 100644 --- a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php +++ b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php @@ -379,7 +379,7 @@ document.addEventListener('DOMContentLoaded', function() { 'allow_unsafe_links' => false, ]); - return $converter->convertToHtml($markdown); + return $converter->convert($markdown); } // public function processMarkdownOnLineItems(array &$items): void diff --git a/app/Services/PdfMaker/PdfMakerUtilities.php b/app/Services/PdfMaker/PdfMakerUtilities.php index 06817df0e949..bc0ffa4626fa 100644 --- a/app/Services/PdfMaker/PdfMakerUtilities.php +++ b/app/Services/PdfMaker/PdfMakerUtilities.php @@ -95,7 +95,7 @@ trait PdfMakerUtilities if (array_key_exists('process_markdown', $this->data) && array_key_exists('content', $child) && $this->data['process_markdown']) { $child['content'] = str_replace("
", "\r", $child['content']); - $child['content'] = $this->commonmark->convertToHtml($child['content'] ?? ''); + $child['content'] = $this->commonmark->convert($child['content'] ?? ''); } } diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php index 71245bc6b563..97a47fb68826 100644 --- a/app/Utils/TemplateEngine.php +++ b/app/Utils/TemplateEngine.php @@ -90,7 +90,6 @@ class TemplateEngine if (strlen($this->entity) > 1 && strlen($this->entity_id) > 1) { $class = 'App\Models\\'.ucfirst($this->entity); $this->entity_obj = $class::withTrashed()->where('id', $this->decodePrimaryKey($this->entity_id))->company()->first(); - nlog("the entity id = ".$this->entity_obj->id); } else { $this->mockEntity(); } @@ -168,7 +167,7 @@ class TemplateEngine 'allow_unsafe_links' => false, ]); - $this->body = $converter->convertToHtml($this->body); + $this->body = $converter->convert($this->body); } private function entityValues($contact) diff --git a/app/Utils/Traits/PaymentEmailBuilder.php b/app/Utils/Traits/PaymentEmailBuilder.php index 15b8f5fa73d5..0545b6dfc322 100644 --- a/app/Utils/Traits/PaymentEmailBuilder.php +++ b/app/Utils/Traits/PaymentEmailBuilder.php @@ -81,7 +81,7 @@ trait PaymentEmailBuilder 'allow_unsafe_links' => false, ]); - $data = $converter->convertToHtml($data); + $data = $converter->convert($data); } return $data; diff --git a/app/Utils/Traits/QuoteEmailBuilder.php b/app/Utils/Traits/QuoteEmailBuilder.php index 46d5f5c2e8f7..f6b98e193835 100644 --- a/app/Utils/Traits/QuoteEmailBuilder.php +++ b/app/Utils/Traits/QuoteEmailBuilder.php @@ -89,7 +89,7 @@ trait QuoteEmailBuilder 'allow_unsafe_links' => true, ]); - $data = $converter->convertToHtml($data); + $data = $converter->convert($data); } return $data; diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index b591ae905d23..74f196d27007 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -4569,7 +4569,7 @@ $LANG = array( 'quotes_backup_subject' => 'Your quotes are ready for download', 'credits_backup_subject' => 'Your credits are ready for download', 'document_download_subject' => 'Your documents are ready for download', - + 'reminder_message' => 'Reminder for invoice :number for :balance', ); return $LANG; diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html index 1b38a97e76b7..d38b6e4d0e23 100644 --- a/resources/views/pdf-designs/bold.html +++ b/resources/views/pdf-designs/bold.html @@ -53,7 +53,7 @@ #header, #header-spacer { height: 160px; padding: 3rem; - margin-bottom: 3rem; + margin-bottom: 1rem; } .company-logo { height: 100%; @@ -232,7 +232,7 @@ #footer, #footer-spacer { height: 160px; padding: 1rem 3rem; - margin-top: 3rem; + margin-top: 1rem; } [data-ref="total_table-footer"] { diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html index 86b92c656c22..d38fda65e721 100644 --- a/resources/views/pdf-designs/business.html +++ b/resources/views/pdf-designs/business.html @@ -16,7 +16,10 @@ } @page { - margin: $global_margin; + margin-left: $global_margin; + margin-right: $global_margin; + margin-top: 0; + margin-bottom: 0; size: $page_size $page_layout; } @@ -96,7 +99,7 @@ } [data-ref="table"] { - margin-top: 3.5rem; + margin-top: 0.5rem; /* margin-bottom: 200px; */ min-width: 100%; table-layout: fixed; @@ -153,10 +156,6 @@ font-weight: bold !important; } - #table-totals { - page-break-inside: avoid; - } - #table-totals > *:last-child { border-bottom-left-radius: 1rem; border-bottom-right-radius: 1rem; @@ -171,6 +170,8 @@ padding-top: 0.5rem; padding-bottom: 0.8rem; margin-right: .5rem; + page-break-inside:auto; + overflow: visible !important; } #table-totals .totals-table-right-side>* { @@ -349,7 +350,7 @@ $entity_images -