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

close #2975 Fixed: Recurring Invoice Custom Interval

Browse Source
This commit is contained in:
Cüneyt Şentürk
2023-08-28 15:40:55 +03:00
parent a83d446141
commit 8387830ecd
9 changed files with 73 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/views/components/documents/form/recurring.blade.php
View File

@ -10,6 +10,7 @@
<x-form.group.recurring
:type="$type"
@started="onChangeRecurringDate()"
:interval="$document ? $document->recurring->interval : null"
:frequency="$document ? $document->recurring->frequency : null"
:custom-frequency="$document ? $document->recurring->custom_frequency : null"
:limit="$document ? $document->recurring->limit_by : null"

15
resources/views/components/documents/index/recurring_templates.blade.php
View File

@ -81,7 +81,20 @@
<x-table.td class="w-2/12" hidden-mobile>
<x-slot name="first">
{{ trans('recurring.' . $item->recurring->frequency) }}
@if ($item->recurring->interval > 1)
<x-tooltip
id="tooltip-frequency-{{ $item->recurring->id }}"
placement="top"
message="{{ trans('recurring.custom_frequency_desc', [
'interval' => $item->recurring->interval,
'frequency' => str()->lower(trans('recurring.' . str_replace(['daily', 'ly'], ['days', 's'], $item->recurring->frequency)))
]) }}"
>
{{ trans('recurring.custom') }}
</x-tooltip>
@else
{{ trans('recurring.' . $item->recurring->frequency) }}
@endif
</x-slot>
<x-slot name="second">
@if ($item->recurring->limit_by == 'count')

2
resources/views/components/form/group/recurring.blade.php
View File

@ -21,6 +21,8 @@
:custom-frequencies="{{ json_encode($customFrequencies) }}"
custom-frequency-value="{{ $customFrequency }}"
:custom-frequency-error="form.errors.get('recurring_custom_frequency')"
interval-value="{{ $interval }}"
@if ($attributes->has('@interval'))
@interval="form.recurring_interval = $event;{{ $attributes['@interval'] }}"
@else