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

Merge branch 'akaunting:master' into master

Browse Source
This commit is contained in:
Burak Civan 2022-06-06 17:24:12 +03:00 committed by GitHub
commit 37f59eb310
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/View/Components/Contacts/Show/Content.php
View File

@ -34,7 +34,9 @@ class Content extends Component
$this->counts = [];
// Handle documents
$this->documents = $this->contact->documents()->with('transactions')->get();
$docs = $this->contact->isCustomer() ? 'invoices' : 'bills';
$this->documents = $this->contact->$docs()->with('transactions')->get();
$this->counts['documents'] = $this->documents->count();

4
app/View/Components/Form/Group/Category.php
View File

@ -37,6 +37,10 @@ class Category extends Form
$this->categories->put($model->category->id, $model->category->name);
}
if($model = $this->getParentData('model')) {
$this->selected = $model->category_id;
}
if (empty($this->selected) && (in_array($type, ['income', 'expense']))) {
$this->selected = setting('default.' . $type . '_category');
}

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

@ -4,15 +4,19 @@
</x-slot>
<x-slot name="body">
<x-form.group.recurring
:type="$type"
@started="onChangeRecurringDate"
:frequency="$document ? $document->recurring->frequency : null"
:custom-frequency="$document ? $document->recurring->custom_frequency : null"
:limit="$document ? $document->recurring->limit_by : null"
:started-value="$document ? $document->recurring->started_at : null"
:limit-count="$document ? $document->recurring->limit_count : null"
:limit-date-value="$document ? $document->recurring->limit_date : null"
/>
@if (empty($document))
<x-form.group.recurring :type="$type" @started="onChangeRecurringDate()" />
@else
<x-form.group.recurring
:type="$type"
@started="onChangeRecurringDate()"
:frequency="$document ? $document->recurring->frequency : null"
:custom-frequency="$document ? $document->recurring->custom_frequency : null"
:limit="$document ? $document->recurring->limit_by : null"
:started-value="$document ? $document->recurring->started_at : null"
:limit-count="$document ? $document->recurring->limit_count : null"
:limit-date-value="$document ? $document->recurring->limit_date : null"
/>
@endif
</x-slot>
</x-form.section>

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

@ -10,7 +10,7 @@
frequency-value="{{ $frequency }}"
:frequency-error="form.errors.get('recurring_frequency')"
@if ($attributes->has('@frequency'))
@frequency="form.recurring_frequency = $event; {{ $attributes['@frequency'] }}"
@frequency="form.recurring_frequency = $event;{{ $attributes['@frequency'] }}"
@else
@frequency="form.recurring_frequency = $event"
@endif
@ -19,20 +19,20 @@
custom-frequency-value="{{ $customFrequency }}"
:custom-frequency-error="form.errors.get('recurring_custom_frequency')"
@if ($attributes->has('@interval'))
@interval="form.recurring_interval = $event; {{ $attributes['@interval'] }}"
@interval="form.recurring_interval = $event;{{ $attributes['@interval'] }}"
@else
@interval="form.recurring_interval = $event"
@endif
@if ($attributes->has('@custom_frequency'))
@custom_frequency="form.recurring_custom_frequency = $event; {{ $attributes['@custom_frequency'] }}"
@custom_frequency="form.recurring_custom_frequency = $event;{{ $attributes['@custom_frequency'] }}"
@else
@custom_frequency="form.recurring_custom_frequency = $event"
@endif
started-value="{{ $startedValue }}"
@if ($attributes->has('@started'))
@started="form.recurring_started_at = $event; {{ $attributes['@started'] }}"
@started="form.recurring_started_at = $event;{{ $attributes['@started'] }}"
@else
@started="form.recurring_started_at = $event"
@endif
@ -41,21 +41,21 @@
limit-value="{{ $limit }}"
:limit-error="form.errors.get('recurring_limit')"
@if ($attributes->has('@limit'))
@limit="form.recurring_limit = $event; {{ $attributes['@limit'] }}"
@limit="form.recurring_limit = $event;{{ $attributes['@limit'] }}"
@else
@limit="form.recurring_limit = $event"
@endif
limit-count-value="{{ $limitCount }}"
@if ($attributes->has('@limit_count'))
@limit_count="form.recurring_limit_count = $event; {{ $attributes['@limit_count'] }}"
@limit_count="form.recurring_limit_count = $event;{{ $attributes['@limit_count'] }}"
@else
@limit_count="form.recurring_limit_count = $event"
@endif
limit-date-value="{{ $limitDateValue }}"
@if ($attributes->has('@limit_date'))
@limit_date="form.recurring_limit_date = $event; {{ $attributes['@limit_date'] }}"
@limit_date="form.recurring_limit_date = $event;{{ $attributes['@limit_date'] }}"
@else
@limit_date="form.recurring_limit_date = $event"
@endif