Merge branch 'master' of https://github.com/brkcvn/akaunting into code-clean

This commit is contained in:
Burak Civan
2022-09-07 09:56:41 +03:00
76 changed files with 1024 additions and 705 deletions

View File

@@ -2,7 +2,7 @@
@if (! $hideButtonAddNew)
@can($permissionCreate)
<x-link href="{{ route($routeButtonAddNew, ['type' => $type]) }}" kind="primary">
<x-link href="{{ route($routeButtonAddNew, ['type' => $type]) }}" kind="primary" id="show-more-actions-new-{{ $transaction->type }}">
{{ trans($textButtonAddNew) }}
</x-link>
@endcan
@@ -13,7 +13,7 @@
@if (! $transaction->reconciled && $transaction->isNotTransferTransaction())
@if (! $hideButtonEdit)
@can($permissionUpdate)
<x-link href="{{ route($routeButtonEdit, [$transaction->id, 'type' => $type]) }}">
<x-link href="{{ route($routeButtonEdit, [$transaction->id, 'type' => $type]) }}" id="show-more-actions-edit-{{ $transaction->type }}">
{{ trans('general.edit') }}
</x-link>
@endcan

View File

@@ -15,14 +15,16 @@
</div>
</x-slot>
<x-slot name="body">
<span class="material-icons absolute ltr:right-0 rtl:left-0 top-0 transition-all transform" x-bind:class="create === 1 ? 'rotate-180' : ''">expand_more</span>
</button>
<div class="overflow-hidden transition-transform origin-top-left ease-linear duration-100"
x-ref="container1"
x-bind:class="create == 1 ? 'h-auto ' : 'scale-y-0 h-0'"
>
@if ($transaction->isNotTransferTransaction())
<div class="flex my-3 space-x-2 rtl:space-x-reverse">
<x-link
href="{{ route($routeButtonEdit, [$transaction->id, 'type' => $transaction->type]) }}"
class="px-3 py-1.5 mb-3 sm:mb-0 bg-gray-100 hover:bg-gray-200 rounded-xl text-purple text-xs font-bold leading-6"
override="class"
>
<x-link href="{{ route($routeButtonEdit, [$transaction->id, 'type' => $transaction->type]) }}" id="show-slider-actions-edit-{{ $transaction->type }}" class="px-3 py-1.5 mb-3 sm:mb-0 bg-gray-100 hover:bg-gray-200 rounded-xl text-purple text-xs font-bold leading-6">
{{ trans('general.edit') }}
</x-link>
</div>

View File

@@ -1,7 +1,7 @@
@stack('button_group_start')
@if (! $hideButtonMoreActions)
<x-dropdown id="dropdown-more-actions">
<x-dropdown id="show-more-actions-{{ $transaction->type }}">
<x-slot name="trigger">
<span class="material-icons">more_horiz</span>
</x-slot>
@@ -11,7 +11,7 @@
@if (empty($transaction->document_id) && $transaction->isNotTransferTransaction())
@if (! $hideButtonDuplicate)
@can($permissionCreate)
<x-dropdown.link href="{{ route($routeButtonDuplicate, [$transaction->id, 'type' => $type]) }}">
<x-dropdown.link href="{{ route($routeButtonDuplicate, [$transaction->id, 'type' => $type]) }}" id="show-more-actions-duplicate-{{ $transaction->type }}">
{{ trans('general.duplicate') }}
</x-dropdown.link>
@endcan
@@ -27,6 +27,7 @@
@can($permissionCreate)
<button
type="button"
id="show-more-actions-connect-{{ $transaction->type }}"
class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap"
title="{{ trans('general.connect') }}"
@click="onConnectTransactions('{{ route('transactions.dial', $transaction->id) }}')">
@@ -38,14 +39,14 @@
@stack('connect_button_end')
@if (! $hideDivider1 && $transaction->isNotTransferTransaction())
@if (! $hideDivider1 && $transaction->isNotDocumentTransaction() && $transaction->isNotTransferTransaction())
<x-dropdown.divider />
@endif
@stack('button_print_start')
@if (! $hideButtonPrint)
<x-dropdown.link href="{{ route($routeButtonPrint, $transaction->id) }}" target="_blank">
<x-dropdown.link href="{{ route($routeButtonPrint, $transaction->id) }}" target="_blank" id="show-more-actions-print-{{ $transaction->type }}">
{{ trans('general.print') }}
</x-dropdown.link>
@endif
@@ -55,7 +56,7 @@
@stack('button_pdf_start')
@if (! $hideButtonPdf)
<x-dropdown.link href="{{ route($routeButtonPdf, $transaction->id) }}" class="">
<x-dropdown.link href="{{ route($routeButtonPdf, $transaction->id) }}" class="" id="show-more-actions-pdf-{{ $transaction->type }}">
{{ trans('general.download_pdf') }}
</x-dropdown.link>
@endif
@@ -70,7 +71,7 @@
@if ($transaction->isNotTransferTransaction())
@if (! $hideButtonShare)
<x-dropdown.button @click="onShareLink('{{ route($shareRoute, $transaction->id) }}')">
<x-dropdown.button id="show-more-actions-share-link-{{ $transaction->type }}" @click="onShareLink('{{ route($shareRoute, $transaction->id) }}')">
{{ trans('general.share_link') }}
</x-dropdown.button>
@endif
@@ -83,7 +84,7 @@
@if ($transaction->isNotTransferTransaction())
@if (! $hideButtonEmail)
@if (! empty($transaction->contact) && $transaction->contact->email)
<x-dropdown.button @click="onEmail('{{ route($routeButtonEmail, $transaction->id) }}')">
<x-dropdown.button id="show-more-actions-send-email-{{ $transaction->type }}" @click="onEmail('{{ route($routeButtonEmail, $transaction->id) }}')">
{{ trans('invoices.send_mail') }}
</x-dropdown.button>
@else
@@ -105,7 +106,7 @@
@stack('button_end_start')
@if (! $hideButtonEnd)
<x-dropdown.link href="{{ route($routeButtonEnd, $transaction->id) }}">
<x-dropdown.link href="{{ route($routeButtonEnd, $transaction->id) }}" id="show-more-actions-end-{{ $transaction->type }}">
{{ trans('recurring.end') }}
</x-dropdown.link>
@endif