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

Minor fixes for email template

Browse Source
This commit is contained in:
David Bomba 2020-10-27 08:54:59 +11:00
parent fe46bba383
commit 4561ed41f2
5 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Console/Commands/CreateSingleAccount.php
View File

@ -112,7 +112,6 @@ class CreateSingleAccount extends Command
$company = Company::factory()->create([ $company = Company::factory()->create([
'account_id' => $account->id, 'account_id' => $account->id,
'slack_webhook_url' => config('ninja.notification.slack'), 'slack_webhook_url' => config('ninja.notification.slack'),
'use_credits_payment' => 'always',
]); ]);
$account->default_company_id = $company->id; $account->default_company_id = $company->id;

20
app/DataMapper/EmailTemplateDefaults.php
View File

@ -124,11 +124,6 @@ class EmailTemplateDefaults
public static function emailInvoiceTemplate() public static function emailInvoiceTemplate()
{ {
$converter = new CommonMarkConverter([
'html_input' => 'strip',
'allow_unsafe_links' => false,
]);
$invoice_message = '<p>'.self::transformText('invoice_message').'</p><br><br><p>$view_link</p>'; $invoice_message = '<p>'.self::transformText('invoice_message').'</p><br><br><p>$view_link</p>';
return $invoice_message; return $invoice_message;
@ -141,12 +136,9 @@ class EmailTemplateDefaults
public static function emailQuoteTemplate() public static function emailQuoteTemplate()
{ {
$converter = new CommonMarkConverter([ $quote_message = '<p>'.self::transformText('quote_message').'</p><br><br><p>$view_link</p>';
'html_input' => 'strip',
'allow_unsafe_links' => false,
]);
return $converter->convertToHtml(self::transformText('quote_message')); return $quote_message;
} }
public static function emailPaymentSubject() public static function emailPaymentSubject()
@ -167,13 +159,9 @@ class EmailTemplateDefaults
public static function emailCreditTemplate() public static function emailCreditTemplate()
{ {
$converter = new CommonMarkConverter([ $credit_message = '<p>'.self::transformText('credit_message').'</p><br><br><p>$view_link</p>';
'html_input' => 'strip',
'allow_unsafe_links' => false,
]);
return $converter->convertToHtml(self::transformText('credit_message'));
return $credit_message;
} }
public static function emailPaymentPartialTemplate() public static function emailPaymentPartialTemplate()

1
app/Services/Invoice/InvoiceService.php
View File

@ -222,7 +222,6 @@ class InvoiceService
public function updateStatus() public function updateStatus()
{ {
info("invoice balance = {$this->invoice->balance}");
if((int)$this->invoice->balance == 0) if((int)$this->invoice->balance == 0)
$this->setStatus(Invoice::STATUS_PAID); $this->setStatus(Invoice::STATUS_PAID);

1
app/Transformers/CompanyTransformer.php
View File

@ -154,6 +154,7 @@ class CompanyTransformer extends EntityTransformer
'invoice_task_timelog' => (bool) $company->invoice_task_timelog, 'invoice_task_timelog' => (bool) $company->invoice_task_timelog,
'auto_start_tasks' => (bool) $company->auto_start_tasks, 'auto_start_tasks' => (bool) $company->auto_start_tasks,
'invoice_task_documents' => (bool) $company->invoice_task_documents, 'invoice_task_documents' => (bool) $company->invoice_task_documents,
'use_credits_payment' => 'always', //todo remove
]; ];
} }

12
app/Transformers/TaskTransformer.php
View File

@ -48,15 +48,15 @@ class TaskTransformer extends EntityTransformer
'assigned_user_id' => (string) $this->encodePrimaryKey($task->assigned_user_id), 'assigned_user_id' => (string) $this->encodePrimaryKey($task->assigned_user_id),
'number' => (string) $task->number ?: '', 'number' => (string) $task->number ?: '',
'start_time' => (int) $task->start_time, 'start_time' => (int) $task->start_time,
'description' => $task->description ?: '', 'description' => (string) $task->description ?: '',
'duration' => 0, 'duration' => (int) $task->duration ?: 0,
'rate' => (float) $task->rate ?: 0, 'rate' => (float) $task->rate ?: 0,
'created_at' => (int) $task->created_at, 'created_at' => (int) $task->created_at,
'updated_at' => (int) $task->updated_at, 'updated_at' => (int) $task->updated_at,
'archived_at' => (int) $task->deleted_at, 'archived_at' => (int) $task->deleted_at,
'invoice_id' => $this->encodePrimaryKey($task->invoice_id), 'invoice_id' => $this->encodePrimaryKey($task->invoice_id) ?: '',
'client_id' => $this->encodePrimaryKey($task->client_id), 'client_id' => $this->encodePrimaryKey($task->client_id) ?: '',
'project_id' => $this->encodePrimaryKey($task->project_id), 'project_id' => $this->encodePrimaryKey($task->project_id) ?: '',
'is_deleted' => (bool) $task->is_deleted, 'is_deleted' => (bool) $task->is_deleted,
'time_log' => $task->time_log ?: '', 'time_log' => $task->time_log ?: '',
'is_running' => (bool) $task->is_running, 'is_running' => (bool) $task->is_running,
@ -64,7 +64,7 @@ class TaskTransformer extends EntityTransformer
'custom_value2' => $task->custom_value2 ?: '', 'custom_value2' => $task->custom_value2 ?: '',
'custom_value3' => $task->custom_value3 ?: '', 'custom_value3' => $task->custom_value3 ?: '',
'custom_value4' => $task->custom_value4 ?: '', 'custom_value4' => $task->custom_value4 ?: '',
'status_id' => $this->encodePrimaryKey($task->status_id), 'status_id' => $this->encodePrimaryKey($task->status_id) ?: '',
'status_sort_order' => (int) $task->status_sort_order, 'status_sort_order' => (int) $task->status_sort_order,
]; ];
} }