Merge pull request #2304 from sevannerse/CU-1pbthq3_Make-Recurring-Easier-to-Find--Edit_Sevan-Nerse
Make recurring easier to find
This commit is contained in:
Cüneyt Şentürk
GitHub
@@ -20,4 +20,25 @@
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@if ($document->parent)
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<div class="alert alert-info fade show" role="alert">
|
||||
<div class="d-flex">
|
||||
@stack('recurring_parent_message_head_start')
|
||||
<h5 class="mt-0 text-white"><strong>{{ trans('recurring.recurring') }}</strong></h5>
|
||||
@stack('recurring_parent_message_head_end')
|
||||
</div>
|
||||
|
||||
@stack('recurring_parent_message_body_start')
|
||||
<p class="text-sm lh-160 mb-0">{!! trans('recurring.message_parent', [
|
||||
'type' => mb_strtolower(trans_choice($textRecurringType, 1)),
|
||||
'link' => '<a href="' . route(mb_strtolower(trans_choice($textRecurringType, 2)) . '.show', $document->parent->id) . '"><u>' . $document->parent->document_number . '</u></a>'
|
||||
]) !!}
|
||||
</p>
|
||||
@stack('recurring_parent_message_body_end')
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@stack('recurring_message_end')
|
||||
|
||||
@@ -22,6 +22,16 @@
|
||||
@endif
|
||||
@stack('content_header_end')
|
||||
|
||||
@stack('recurring_message_start')
|
||||
@if (!$hideRecurringMessage)
|
||||
<x-transactions.show.recurring-message
|
||||
type="{{ $type }}"
|
||||
:transaction="$transaction"
|
||||
text-recurring-type="{{ $textRecurringType }}"
|
||||
/>
|
||||
@endif
|
||||
@stack('recurring_message_end')
|
||||
|
||||
@stack('transaction_start')
|
||||
<x-transactions.show.transaction
|
||||
type="{{ $type }}"
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
@stack('recurring_message_start')
|
||||
@if (($recurring = $transaction->recurring) && ($next = $recurring->getNextRecurring()))
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<div class="alert alert-info fade show" role="alert">
|
||||
<div class="d-flex">
|
||||
@stack('recurring_message_head_start')
|
||||
<h5 class="mt-0 text-white"><strong>{{ trans('recurring.recurring') }}</strong></h5>
|
||||
@stack('recurring_message_head_end')
|
||||
</div>
|
||||
|
||||
@stack('recurring_message_body_start')
|
||||
<p class="text-sm lh-160 mb-0">{{ trans('recurring.message', [
|
||||
'type' => mb_strtolower(trans_choice($textRecurringType, 1)),
|
||||
'date' => $next->format($date_format)
|
||||
]) }}
|
||||
</p>
|
||||
@stack('recurring_message_body_end')
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@if ($transaction->parent)
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<div class="alert alert-info fade show" role="alert">
|
||||
<div class="d-flex">
|
||||
@stack('recurring_parent_message_head_start')
|
||||
<h5 class="mt-0 text-white"><strong>{{ trans('recurring.recurring') }}</strong></h5>
|
||||
@stack('recurring_parent_message_head_end')
|
||||
</div>
|
||||
|
||||
@stack('recurring_parent_message_body_start')
|
||||
<p class="text-sm lh-160 mb-0">{!! trans('recurring.message_parent', [
|
||||
'type' => mb_strtolower(trans_choice($textRecurringType, 1)),
|
||||
'link' => '<a href="' . route(mb_strtolower(trans_choice($textRecurringType, 2)) . '.show', $transaction->parent->id) . '"><u>' . trans_choice($textRecurringType, 1) . '#' . $transaction->parent->id . '</u></a>'
|
||||
]) !!}
|
||||
</p>
|
||||
@stack('recurring_parent_message_body_end')
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@stack('recurring_message_end')
|
||||
@@ -18,6 +18,10 @@
|
||||
<a href="{{ route($routeButtonShow , $item->id) }}">{{ $item->document_number }}</a>
|
||||
@endif
|
||||
|
||||
@if ($item->recurring)
|
||||
<i class="fas fa-redo-alt fa-xs" title="{{ trans('recurring.recurring') }}"></i>
|
||||
@endif
|
||||
|
||||
@stack('document_number_td_inside_end')
|
||||
</td>
|
||||
@endif
|
||||
|
||||
@@ -17,6 +17,10 @@
|
||||
<akaunting-recurring
|
||||
:form-classes="[{'has-error': form.errors.get('recurring_frequency')}, '{{ $col }}']"
|
||||
title="{{ trans('recurring.recurring') }}"
|
||||
title-interval="{{ trans('recurring.interval') }}"
|
||||
title-frequency="{{ trans('recurring.frequency') }}"
|
||||
title-count="{{ trans('recurring.count') }}"
|
||||
tooltip="{{ trans('recurring.tooltip') }}"
|
||||
placeholder="{{ trans('general.form.select.field', ['field' => trans('recurring.recurring')]) }}"
|
||||
|
||||
:frequency-options="{{ json_encode($recurring_frequencies) }}"
|
||||
|
||||
@@ -46,11 +46,16 @@
|
||||
@foreach($payments as $item)
|
||||
<tr class="row align-items-center border-top-1">
|
||||
<td class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->contact->name) }}</td>
|
||||
@if ($item->reconciled)
|
||||
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1"><a class="col-aka" href="#">@date($item->paid_at)</a></td>
|
||||
@else
|
||||
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1"><a class="col-aka" href="{{ route('payments.show', $item->id) }}">@date($item->paid_at)</a></td>
|
||||
@endif
|
||||
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1">
|
||||
@if ($item->reconciled)
|
||||
<a class="col-aka" href="#">@date($item->paid_at)</a>
|
||||
@else
|
||||
<a class="col-aka" href="{{ route('revenues.show', $item->id) }}">@date($item->paid_at)</a>
|
||||
@endif
|
||||
@if ($item->recurring)
|
||||
<i class="fas fa-redo-alt fa-xs" title="{{ trans('recurring.recurring') }}"></i>
|
||||
@endif
|
||||
</td>
|
||||
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-2 text-right">@money($item->amount, $item->currency_code, true)</td>
|
||||
<td class="col-md-2 col-lg-3 col-xl-3 d-none d-md-block text-left">
|
||||
{{ $item->contact->name }}
|
||||
|
||||
@@ -46,11 +46,16 @@
|
||||
@foreach($revenues as $item)
|
||||
<tr class="row align-items-center border-top-1">
|
||||
<td class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->contact->name) }}</td>
|
||||
@if ($item->reconciled)
|
||||
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1"><a class="col-aka" href="#">@date($item->paid_at)</a></td>
|
||||
@else
|
||||
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1"><a class="col-aka" href="{{ route('revenues.show', $item->id) }}">@date($item->paid_at)</a></td>
|
||||
@endif
|
||||
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-1 col-xl-1">
|
||||
@if ($item->reconciled)
|
||||
<a class="col-aka" href="#">@date($item->paid_at)</a>
|
||||
@else
|
||||
<a class="col-aka" href="{{ route('revenues.show', $item->id) }}">@date($item->paid_at)</a>
|
||||
@endif
|
||||
@if ($item->recurring)
|
||||
<i class="fas fa-redo-alt fa-xs" title="{{ trans('recurring.recurring') }}"></i>
|
||||
@endif
|
||||
</td>
|
||||
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-2 text-right">@money($item->amount, $item->currency_code, true)</td>
|
||||
<td class="col-md-2 col-lg-3 col-xl-3 d-none d-md-block text-left">
|
||||
{{ $item->contact->name }}
|
||||
|
||||
Reference in New Issue
Block a user