Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make recurring invoice editable again #1840

Browse Source
This commit is contained in:
Hillel Coren 2018-02-15 10:43:07 +02:00
parent 746c3fe69a
commit 6c105d5978
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/Invoice.php
View File

@ -1642,6 +1642,14 @@ class Invoice extends EntityModel implements BalanceAffecting
return false; return false;
} }
public function isLocked()
{
if (! config('ninja.lock_sent_invoices')) {
return false;
}
return $this->isSent() && ! $this->is_recurring;
}
} }
Invoice::creating(function ($invoice) { Invoice::creating(function ($invoice) {

2
app/Ninja/Repositories/InvoiceRepository.php
View File

@ -403,7 +403,7 @@ class InvoiceRepository extends BaseRepository
if ($invoice->is_deleted) { if ($invoice->is_deleted) {
return $invoice; return $invoice;
} elseif ($invoice->isSent() && config('ninja.lock_sent_invoices')) { } elseif ($invoice->isLocked()) {
return $invoice; return $invoice;
} }

2
resources/views/invoices/edit.blade.php
View File

@ -533,7 +533,7 @@
@if (Auth::user()->canCreateOrEdit(ENTITY_INVOICE, $invoice)) @if (Auth::user()->canCreateOrEdit(ENTITY_INVOICE, $invoice))
@if ($invoice->isClientTrashed()) @if ($invoice->isClientTrashed())
<!-- do nothing --> <!-- do nothing -->
@elseif ($invoice->isSent() && config('ninja.lock_sent_invoices')) @elseif ($invoice->isLocked())
@if (! $invoice->trashed()) @if (! $invoice->trashed())
{!! Button::info(trans("texts.email_{$entityType}"))->withAttributes(array('id' => 'emailButton', 'onclick' => 'onEmailClick()'))->appendIcon(Icon::create('send')) !!} {!! Button::info(trans("texts.email_{$entityType}"))->withAttributes(array('id' => 'emailButton', 'onclick' => 'onEmailClick()'))->appendIcon(Icon::create('send')) !!}
{!! DropdownButton::normal(trans('texts.more_actions'))->withContents($invoice->present()->moreActions())->dropup() !!} {!! DropdownButton::normal(trans('texts.more_actions'))->withContents($invoice->present()->moreActions())->dropup() !!}