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

Merge branch 'master' of https://github.com/brkcvn/akaunting

Browse Source
This commit is contained in:
Burak Civan 2022-08-15 14:59:37 +03:00
commit 1157ea41cd
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Listeners/Menu/ShowInNotifications.php
View File

@ -32,7 +32,12 @@ class ShowInNotifications
foreach ($updates as $key => $update) { foreach ($updates as $key => $update) {
$prefix = ($key == 'core') ? 'core' : 'module'; $prefix = ($key == 'core') ? 'core' : 'module';
$name = ($prefix == 'core') ? 'Akaunting' : module($key)->getName();
if ($prefix == 'module' && ! module($key)) {
continue;
}
$name = ($prefix == 'core') ? 'Akaunting' : module($key)?->getName();
$new = new DatabaseNotification(); $new = new DatabaseNotification();
$new->id = $key; $new->id = $key;

2
resources/views/auth/users/edit.blade.php
View File

@ -16,7 +16,7 @@
<x-form.group.email name="email" label="{{ trans('general.email') }}" ::disabled="{{ $user->hasPendingInvitation() ? 'true' : 'false' }}" /> <x-form.group.email name="email" label="{{ trans('general.email') }}" ::disabled="{{ $user->hasPendingInvitation() ? 'true' : 'false' }}" />
@if (user()->id == $user->id) @if (user()->id == $user->id)
<x-form.group.checkbox name="change_password" :options="['1' => trans('auth.change_password')]" form-group-class="sm:col-span-3" @input="onChangePassword($event)" /> <x-form.group.checkbox name="change_password" :options="['1' => trans('auth.change_password')]" form-group-class="sm:col-span-3" checkbox-class="sm:col-span-6" @input="onChangePassword($event)" />
<x-form.group.password name="password" :label="trans('auth.password.new')" v-show="show_password" /> <x-form.group.password name="password" :label="trans('auth.password.new')" v-show="show_password" />
@endif @endif

2
resources/views/components/form/accordion/head.blade.php
View File

@ -4,7 +4,7 @@
</h2> </h2>
@if (! empty($description)) @if (! empty($description))
<span class="text-sm font-light text-black flex gap-x-1 mt-1"> <span class="text-sm font-light text-black block gap-x-1 mt-1">
{!! $description !!} {!! $description !!}
</span> </span>
@endif @endif

2
resources/views/components/form/section/head.blade.php
View File

@ -4,7 +4,7 @@
</h2> </h2>
@if (!empty($description)) @if (!empty($description))
<span class="text-sm font-light text-black flex gap-x-1 mt-1"> <span class="text-sm font-light text-black block gap-x-1 mt-1">
{!! $description !!} {!! $description !!}
</span> </span>
@endif @endif

2
resources/views/components/show/accordion/head.blade.php
View File

@ -6,7 +6,7 @@
</h2> </h2>
@if (! empty($description)) @if (! empty($description))
<span class="text-sm font-light text-black flex gap-x-1 mt-1"> <span class="text-sm font-light text-black block gap-x-1 mt-1">
{!! $description !!} {!! $description !!}
</span> </span>
@endif @endif