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

show custom messages in cp

Browse Source
This commit is contained in:
Benjamin Beganović 2020-11-16 15:37:09 +01:00
parent 49e4e77290
commit 8080dffa85
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/DataMapper/CompanySettings.php
View File

@ -58,9 +58,9 @@ class CompanySettings extends BaseSettings
public $send_reminders = false; //@TODO public $send_reminders = false; //@TODO
public $custom_message_dashboard = ''; // @TODO There currently is no dashboard so this is pending public $custom_message_dashboard = ''; // @TODO There currently is no dashboard so this is pending
public $custom_message_unpaid_invoice = ''; //@ben to implement public $custom_message_unpaid_invoice = '';
public $custom_message_paid_invoice = ''; //@ben to implement public $custom_message_paid_invoice = '';
public $custom_message_unapproved_quote = ''; //@ben to implement public $custom_message_unapproved_quote = '';
public $auto_archive_quote = false; //@implemented public $auto_archive_quote = false; //@implemented
public $auto_convert_quote = true; //@implemented public $auto_convert_quote = true; //@implemented
public $auto_email_invoice = true; //@only used for Recurring Invoices, if set to false, we never send? public $auto_email_invoice = true; //@only used for Recurring Invoices, if set to false, we never send?

14
resources/views/portal/ninja2020/invoices/show.blade.php
View File

@ -8,21 +8,15 @@
@section('body') @section('body')
@if($invoice->isPayable() && !empty($client->getSetting('custom_message_unpaid_invoice'))) @if(!$invoice->isApproved() && $client->getSetting('custom_message_unapproved_quote'))
@component('portal.ninja2020.components.message') @component('portal.ninja2020.components.message')
{!! CustomMessage::client($client) {{ $client->getSetting('custom_message_unapproved_quote') }}
->company($client->company)
->entity($invoice)
->message($client->getSetting('custom_message_unpaid_invoice')) !!}
@endcomponent @endcomponent
@endif @endif
@if(!$invoice->isPayable() && !empty($client->getSetting('custom_message_paid_invoice'))) @if(!$invoice->isPayable() && $client->getSetting('custom_message_paid_invoice'))
@component('portal.ninja2020.components.message') @component('portal.ninja2020.components.message')
{!! CustomMessage::client($client) {{ $client->getSetting('custom_message_paid_invoice') }}
->company($client->company)
->entity($invoice)
->message($client->getSetting('custom_message_paid_invoice')) !!}
@endcomponent @endcomponent
@endif @endif

7
resources/views/portal/ninja2020/quotes/show.blade.php
View File

@ -8,12 +8,9 @@
@section('body') @section('body')
@if(!$quote->isApproved() && !empty($client->getSetting('custom_message_unapproved_quote'))) @if(!$quote->isApproved() && $client->getSetting('custom_message_unpaid_invoice'))
@component('portal.ninja2020.components.message') @component('portal.ninja2020.components.message')
{!! CustomMessage::client($client) {{ $client->getSetting('custom_message_unpaid_invoice') }}
->company($client->company)
->entity($quote)
->message($client->getSetting('custom_message_unapproved_quote')) !!}
@endcomponent @endcomponent
@endif @endif