shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed all recurring issues #315

Browse Source
This commit is contained in:
denisdulici
2018-05-02 00:59:55 +03:00
parent 7e21634d77
commit c049b8ce73
7 changed files with 110 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/expenses/bills/show.blade.php
View File

@@ -3,13 +3,13 @@
@section('title', trans_choice('general.bills', 1) . ': ' . $bill->bill_number)
@section('content')
@if ($bill->recurring()->count())
@if (($recurring = $invoice->recurring) && ($next = $recurring->next()))
<div class="callout callout-info">
<h4>{{ trans('recurring.recurring') }}</h4>
<p>{{ trans('recurring.message', [
'type' => mb_strtolower(trans_choice('general.bills', 1)),
'date' => $bill->recurring->schedule()->next()->getStart()->format($date_format)
'date' => $next->format($date_format)
]) }}
</p>
</div>

4
resources/views/expenses/payments/edit.blade.php
View File

@@ -3,13 +3,13 @@
@section('title', trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]))
@section('content')
@if ($payment->recurring()->count())
@if (($recurring = $invoice->recurring) && ($next = $recurring->next()))
<div class="callout callout-info">
<h4>{{ trans('recurring.recurring') }}</h4>
<p>{{ trans('recurring.message', [
'type' => mb_strtolower(trans_choice('general.payments', 1)),
'date' => $payment->recurring->schedule()->next()->getStart()->format($date_format)
'date' => $next->format($date_format)
]) }}
</p>
</div>

4
resources/views/incomes/invoices/show.blade.php
View File

@@ -3,13 +3,13 @@
@section('title', trans_choice('general.invoices', 1) . ': ' . $invoice->invoice_number)
@section('content')
@if ($invoice->recurring()->count())
@if (($recurring = $invoice->recurring) && ($next = $recurring->next()))
<div class="callout callout-info">
<h4>{{ trans('recurring.recurring') }}</h4>
<p>{{ trans('recurring.message', [
'type' => mb_strtolower(trans_choice('general.invoices', 1)),
'date' => $invoice->recurring->schedule()->next()->getStart()->format($date_format)
'date' => $next->format($date_format)
]) }}
</p>
</div>

4
resources/views/incomes/revenues/edit.blade.php
View File

@@ -3,13 +3,13 @@
@section('title', trans('general.title.edit', ['type' => trans_choice('general.revenues', 1)]))
@section('content')
@if ($revenue->recurring()->count())
@if (($recurring = $invoice->recurring) && ($next = $recurring->next()))
<div class="callout callout-info">
<h4>{{ trans('recurring.recurring') }}</h4>
<p>{{ trans('recurring.message', [
'type' => mb_strtolower(trans_choice('general.revenues', 1)),
'date' => $revenue->recurring->schedule()->next()->getStart()->format($date_format)
'date' => $next->format($date_format)
]) }}
</p>
</div>