mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-20 16:31:33 +02:00
Merge Zapier and trans_choice fixes
This commit is contained in:
parent
bb38aaccb5
commit
1a4458567c
@ -17,7 +17,11 @@ class InvoiceRequest extends EntityRequest
|
||||
$invoice = Invoice::scope()
|
||||
->whereInvoiceNumber($this->invoice_number)
|
||||
->withTrashed()
|
||||
->firstOrFail();
|
||||
->first();
|
||||
|
||||
if (! $invoice) {
|
||||
abort(404);
|
||||
}
|
||||
}
|
||||
|
||||
// eager load the invoice items
|
||||
|
@ -349,7 +349,11 @@
|
||||
<i class="glyphicon glyphicon-exclamation-sign"></i> {{ trans('texts.activity') }}
|
||||
@if ($invoicesSent)
|
||||
<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>
|
||||
@endif
|
||||
</h3>
|
||||
|
Loading…
Reference in New Issue
Block a user