Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity

Fixes for tests (#3389)

Browse Source 
* Fixes for tests

* payment
This commit is contained in:
David Bomba 2020-02-27 17:29:40 +11:00 committed by GitHub
parent c15f17186d
commit 9ac66661ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Notifications/NewAccountCreated.php
View File

@ -59,7 +59,8 @@ class NewAccountCreated extends Notification implements ShouldQueue
'message' => ctrans('texts.new_signup_text', ['user' => $user_name, 'email' => $email, 'ip' => $ip]),
'url' => config('ninja.web_url'),
'button' => ctrans('texts.account_login'),
'signature' => '',
'signature' => $this->company->settings->email_signature,
'logo' => $this->company->present()->logo(),
];

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

@ -45,6 +45,7 @@ class MarkPaid extends AbstractService
$payment = PaymentFactory::create($this->invoice->company_id, $this->invoice->user_id);
$payment->amount = $this->invoice->balance;
$payment->applied = $this->invoice->balance;
$payment->number = $this->getNextPaymentNumber($this->invoice->client);
$payment->status_id = Payment::STATUS_COMPLETED;
$payment->client_id = $this->invoice->client_id;

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

@ -1,19 +1,19 @@
@component('email.components.layout')
@component('email.template.master', ['design' => 'light'])
@slot('header')
@component('email.components.header', ['p' => ''])
<img src="{{ $logo }}" alt="Company Logo" style="display: block">
@component('email.components.header', ['p' => '', 'logo' => $url])
@lang('texts.download')
@endcomponent
@endslot
@slot('greeting')
@endslot
@lang('texts.download_timeframe')
@component('email.components.button', ['url' => $url])
@lang('texts.download')
@endcomponent
@slot('signature')
InvoiceNinja
InvoiceNinja (contact@invoiceninja.com)
@endslot
@slot('footer')

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

@ -1,19 +1,20 @@
@component('email.components.layout')
@component('email.template.master', ['design' => 'light'])
@slot('header')
@component('email.components.header', ['p' => ''])
@lang($title)
@component('email.components.header', ['p' => $title, 'logo' => $logo])
@endcomponent
@endslot
@lang($message)
@slot('greeting')
@lang($message)
@endslot
@component('email.components.button', ['url' => $url])
@lang($button)
@endcomponent
@slot('signature')
{{ $signature }}
{{ $signature }}
@endslot
@slot('footer')