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:
Marko
2023-04-05 18:22:39 +02:00
committed by GitHub
parent febf0031e7 8df1003837
commit e0452ddc7f
13 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/views/components/tabs/index.blade.php
View File

@ -8,7 +8,14 @@
}
@endphp
<div data-swiper="{{ $slides }}" x-data="{ active: window.location.hash.split('#')[1] == undefined ? '{{ $active }}' : window.location.hash.split('#')[1] }">
<div
data-swiper="{{ $slides }}"
@if(! $attributes->has('ignore-hash'))
x-data="{ active: window.location.hash.split('#')[1] == undefined ? '{{ $active }}' : window.location.hash.split('#')[1] }"
@else
x-data="{ active: '{{ $active }}' }"
@endif
>
<div data-tabs-swiper>
<ul data-tabs-swiper-wrapper {{ ((! $attributes->has('override')) || ($attributes->has('override') && ! in_array('class', explode(',', $attributes->get('override'))))) ? $attributes->merge(['class' => 'inline-flex overflow-x-scroll large-overflow-unset']) : $attributes }}>
{!! $navs !!}

14
resources/views/settings/categories/edit.blade.php
View File

@ -17,21 +17,23 @@
<x-form.group.color name="color" label="{{ trans('general.color') }}" />
@if ($type_disabled)
<x-form.group.select name="type" label="{{ trans_choice('general.types', 1) }}" :options="$types" disabled />
<x-form.group.select name="type" label="{{ trans_choice('general.types', 1) }}" :options="$types" v-disabled="true" />
<input type="hidden" name="type" value="{{ $category->type }}" />
@else
<x-form.group.select name="type" label="{{ trans_choice('general.types', 1) }}" :options="$types" change="updateParentCategories" />
<x-form.group.select name="parent_id" label="{{ trans('general.parent') . ' ' . trans_choice('general.categories', 1) }}" :options="$parent_categories" not-required dynamicOptions="categoriesBasedTypes" sort-options="false" />
<x-form.input.hidden name="parent_category_id" value="{{ $category->parent_id }}" />
<x-form.input.hidden name="categories" value="{{ json_encode($categories) }}" />
@endif
<x-form.group.select name="parent_id" label="{{ trans('general.parent') . ' ' . trans_choice('general.categories', 1) }}" :options="$parent_categories" not-required dynamicOptions="categoriesBasedTypes" sort-options="false" />
<x-form.input.hidden name="parent_category_id" value="{{ $category->parent_id }}" />
<x-form.input.hidden name="categories" value="{{ json_encode($categories) }}" />
</x-slot>
</x-form.section>
@if (! $type_disabled)
<x-form.group.switch name="enabled" label="{{ trans('general.enabled') }}" />
@endif
@can('update-settings-categories')
<x-form.section>

6
resources/views/settings/categories/index.blade.php
View File

@ -67,7 +67,11 @@
@foreach($categories as $item)
<x-table.tr href="{{ route('categories.edit', $item->id) }}">
<x-table.td kind="bulkaction">
<x-index.bulkaction.single id="{{ $item->id }}" name="{{ $item->name }}" />
<x-index.bulkaction.single
id="{{ $item->id }}"
name="{{ $item->name }}"
:disabled="($item->isTransferCategory()) ? true : false"
/>
</x-table.td>
<x-table.td class="w-5/12">

8
resources/views/settings/default/edit.blade.php
View File

@ -10,7 +10,13 @@
</x-slot>
<x-slot name="body">
<x-form.group.account name="account" not-required without-change />
<x-form.group.select
name="account"
label="{{ trans_choice('general.accounts', 1) }}"
:options="$accounts"
:selected="setting('default.account')"
not-required
/>
<x-form.group.currency name="currency" not-required />