Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 16:31:33 +02:00
Code Issues Releases Activity

Fixes for passing settings object into all mail templates

Browse Source
This commit is contained in:
David Bomba 2020-09-19 15:02:34 +10:00
parent 83be13c049
commit 8dd8b83fd3
9 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/ValidationRules/Payment/ValidInvoicesRules.php
View File

@ -54,7 +54,8 @@ class ValidInvoicesRules implements Rule
}
$unique_array = [];
//todo optimize this into a single query
foreach ($this->input['invoices'] as $invoice) {
$unique_array[] = $invoice['invoice_id'];

2
app/Repositories/PaymentRepository.php
View File

@ -114,6 +114,7 @@ class PaymentRepository extends BaseRepository
$payment->invoices()->saveMany($invoices);
//todo optimize this into a single query
foreach ($data['invoices'] as $paid_invoice) {
$invoice = Invoice::whereId($paid_invoice['invoice_id'])->first();
@ -133,6 +134,7 @@ class PaymentRepository extends BaseRepository
$credits = Credit::whereIn('id', $this->transformKeys(array_column($data['credits'], 'credit_id')))->get();
$payment->credits()->saveMany($credits);
//todo optimize into a single query
foreach ($data['credits'] as $paid_credit) {
$credit = Credit::find($this->decodePrimaryKey($paid_credit['credit_id']));

2
resources/views/email/admin/download_files.blade.php
View File

@ -1,4 +1,4 @@
@component('email.template.master', ['design' => 'light'])
@component('email.template.master', ['design' => 'light', 'settings' =>$settings])
@slot('header')
@component('email.components.header', ['p' => '', 'logo' => $url])

2
resources/views/email/admin/generic.blade.php
View File

@ -1,4 +1,4 @@
@component('email.template.master', ['design' => 'light'])
@component('email.template.master', ['design' => 'light', 'settings' =>$settings])
@slot('header')
@component('email.components.header', ['p' => $title, 'logo' => $logo])

2
resources/views/email/admin/generic_email.blade.php
View File

@ -1,4 +1,4 @@
@component('email.template.master', ['design' => 'light'])
@component('email.template.master', ['design' => 'light', 'settings' =>$settings])
@slot('header')
@component('email.components.header', ['p' => $title, 'logo' => $logo])

2
resources/views/email/invoices/paid.blade.php
View File

@ -1,4 +1,4 @@
@component('email.template.master', ['design' => 'light'])
@component('email.template.master', ['design' => 'light', 'settings' =>$settings])
@slot('header')
@component('email.components.header', ['p' => 'Payment for your invoice has been completed!', 'logo' => 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])

2
resources/views/email/migration/completed.blade.php
View File

@ -1,4 +1,4 @@
@component('email.template.master', ['design' => 'light'])
@component('email.template.master', ['design' => 'light', 'settings' =>$settings])
@slot('header')
@component('email.components.header')

2
resources/views/email/migration/existing.blade.php
View File

@ -1,4 +1,4 @@
@component('email.template.master', ['design' => 'light'])
@component('email.template.master', ['design' => 'light', 'settings' =>$settings])
@slot('header')
@component('email.components.header')

2
resources/views/email/quotes/approved.blade.php
View File

@ -1,4 +1,4 @@
@component('email.template.master', ['design' => 'light'])
@component('email.template.master', ['design' => 'light', 'settings' =>$settings])
@slot('header')
@component('email.components.header', ['p' => 'Your quote was approved!', 'logo' => 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])