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

Merge Zapier and trans_choice fixes

Browse Source
This commit is contained in:
Hillel Coren 2017-03-20 13:55:38 +02:00
parent bb38aaccb5
commit 1a4458567c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Requests/InvoiceRequest.php
View File

@ -17,7 +17,11 @@ class InvoiceRequest extends EntityRequest
$invoice = Invoice::scope() $invoice = Invoice::scope()
->whereInvoiceNumber($this->invoice_number) ->whereInvoiceNumber($this->invoice_number)
->withTrashed() ->withTrashed()
->firstOrFail(); ->first();
if (! $invoice) {
abort(404);
}
} }
// eager load the invoice items // eager load the invoice items

6
resources/views/dashboard.blade.php
View File

@ -349,7 +349,11 @@
<i class="glyphicon glyphicon-exclamation-sign"></i> {{ trans('texts.activity') }} <i class="glyphicon glyphicon-exclamation-sign"></i> {{ trans('texts.activity') }}
@if ($invoicesSent) @if ($invoicesSent)
<div class="pull-right" style="font-size:14px;padding-top:4px"> <div class="pull-right" style="font-size:14px;padding-top:4px">
{{ trans_choice('texts.invoices_sent', $invoicesSent) }} @if (in_array(App::getLocale(), ['pl', 'cs', 'hr', 'lt']))
<!-- https://github.com/invoiceninja/invoiceninja/issues/613 -->
@else
{{ trans_choice('texts.invoices_sent', $invoicesSent) }}
@endif
</div> </div>
@endif @endif
</h3> </h3>