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

Merge branch 'akaunting:master' into button-loading

Browse Source
This commit is contained in:
Burak Civan
2022-06-16 18:35:14 +03:00
committed by GitHub
parent 9b0cb3da35 93be1cc132
commit 9d424800c2
128 changed files with 4246 additions and 14911 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resources/views/banking/accounts/show.blade.php
View File

@ -291,11 +291,17 @@
<x-slot name="first">
{{ $item->contact->name }}
</x-slot>
<x-slot name="second">
<x-slot name="second" class="w-20 font-normal group">
@if ($item->document)
<div data-tooltip-target="tooltip-information-{{ $item->document_id }}" data-tooltip-placement="left" override="class">
<a href="{{ route($item->route_name, $item->route_id) }}" class="font-normal truncate border-b border-black border-dashed">
{{ $item->document->document_number }}
</a>
<div class="w-28 absolute h-10 -ml-12 -mt-6"></div>
<x-documents.index.information :document="$item->document" />
</div>
@else
<x-empty-data />
@endif
@ -444,6 +450,16 @@
</x-show.content.right>
</x-show.content>
</x-show.container>
<akaunting-connect-transactions
:show="connect.show"
:transaction="connect.transaction"
:currency="connect.currency"
:documents="connect.documents"
:translations="{{ json_encode($transactions) }}"
modal-dialog-class="max-w-screen-lg"
v-on:close-modal="connect.show = false"
></akaunting-connect-transactions>
</x-slot>
<x-script folder="banking" file="accounts" />

4
resources/views/banking/recurring_transactions/show.blade.php
View File

@ -8,7 +8,7 @@
</x-slot>
<x-slot name="buttons">
<x-transactions.show.buttons type="{{ $recurring_transaction->type }}" :transaction="$recurring_transaction" />
<x-transactions.show.buttons type="{{ $recurring_transaction->type }}" :transaction="$recurring_transaction" hide-divider4 hide-button-delete />
</x-slot>
<x-slot name="moreButtons">
@ -21,8 +21,8 @@
hide-button-share
hide-button-email
hide-divider-2
hide-button-delete
hide-divider-4
hide-button-delete
/>
</x-slot>

16
resources/views/banking/transactions/index.blade.php
View File

@ -59,6 +59,7 @@
<x-slot name="third"
amount="{{ money($totals['profit'], setting('default.currency'), true) }}"
title="{{ trans_choice('general.profits', 1) }}"
class="cursor-default"
></x-slot>
</x-index.summary>
@ -162,15 +163,18 @@
<x-slot name="first">
{{ $item->contact->name }}
</x-slot>
<x-slot name="second" class="w-20 font-normal group" data-tooltip-target="tooltip-information-{{ $item->id }}" data-tooltip-placement="left" override="class">
<x-slot name="second" class="w-20 font-normal group">
@if ($item->document)
<a href="{{ route($item->route_name, $item->route_id) }}" class="font-normal truncate border-b border-black border-dashed">
{{ $item->document->document_number }}
</a>
<div data-tooltip-target="tooltip-information-{{ $item->document_id }}" data-tooltip-placement="left" override="class">
<a href="{{ route($item->route_name, $item->route_id) }}" class="font-normal truncate border-b border-black border-dashed">
{{ $item->document->document_number }}
</a>
<div class="w-28 absolute h-10 -ml-12 -mt-6"></div>
<div class="w-28 absolute h-10 -ml-12 -mt-6">
</div>
<x-documents.index.information :document="$item->document" />
<x-documents.index.information :document="$item->document" />
</div>
@else
<x-empty-data />
@endif