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 into form-elements

Browse Source
This commit is contained in:
Burak Civan
2022-06-30 11:29:25 +03:00
parent ac83ca5999 7903145f9a
commit 1d3c53b8ba
34 changed files with 1003 additions and 12230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@
<x-index.container>
<x-index.search
search-string="App\Models\Auth\User"
bulk-action="App\BulkActions\Auth\User"
bulk-action="App\BulkActions\Auth\Users"
/>
<x-table>

2
resources/views/banking/reconciliations/create.blade.php
View File

@@ -247,7 +247,7 @@
</div>
</div>
<div class="relative__footer mt-6">
<div class="mt-6">
@if ($transactions->count())
<div class="sm:col-span-6 flex items-center justify-end">
<x-link

2
resources/views/banking/reconciliations/edit.blade.php
View File

@@ -186,7 +186,7 @@
</div>
@can('update-banking-reconciliations')
<div class="relative__footer mt-6">
<div class="mt-6">
@if ($transactions->count())
<div class="sm:col-span-6 flex items-center justify-end">
<x-link

2
resources/views/banking/transfers/print_default.blade.php
View File

@@ -4,6 +4,6 @@
</x-slot>
<x-slot name="content">
<x-transfers.template.default :model="$transfer" />
<x-transfers.template.ddefault :model="$transfer" />
</x-slot>
</x-layouts.print>

2
resources/views/common/import/create.blade.php
View File

@@ -29,7 +29,7 @@
<x-form.group.file name="import" dropzone-class="form-file" singleWidthClasses :options="['acceptedFiles' => '.xls,.xlsx']" form-group-class="mt-8" />
</div>
<div class="relative__footer mt-8">
<div class="mt-8">
<div class="sm:col-span-6 flex items-center justify-end">
@if (! empty($route))
<a href="{{ route(\Str::replaceFirst('.import', '.index', $route)) }}" class="px-6 py-1.5 mr-2 hover:bg-gray-200 rounded-lg">

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

@@ -21,8 +21,6 @@
@endif
@if (! empty($foot) && $foot->isNotEmpty())
<div class="relative__footer">
{!! $foot !!}
</div>
@endif
</div>

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

@@ -10,8 +10,6 @@
@endif
@if (! empty($foot) && $foot->isNotEmpty())
<div class="relative__footer">
{!! $foot !!}
</div>
@endif
</div>

8
resources/views/components/layouts/portal/finish/content.blade.php
View File

@@ -2,10 +2,6 @@
<div class="flex">
<div class="w-full text-center">
<div class="my-10">
<img src="https://assets.akaunting.com/software/portal/finish.gif" alt="Get Started" />
</div>
<div class="my-10">
{{ trans('portal.create_your_invoice') }}
</div>
@@ -15,5 +11,9 @@
{{ trans('portal.get_started') }}
</a>
</div>
<div class="my-10">
<img src="https://assets.akaunting.com/software/portal/finish.gif" class="inline" alt="Get Started" />
</div>
</div>
</div>

2
resources/views/components/media/file.blade.php
View File

@@ -10,7 +10,7 @@
<span class="text-xs mb-0">{{ $file->readableSize() }}</span>
</div>
</div>
<div class="gap-x-1">
<div class="flex flex-row lg:flex-col gap-x-1">
@can('delete-common-uploads')
<a href="javascript:void();" id="remove-{{ $column_name }}" @click="onDeleteFile('{{ $file->id }}', '{{ route('uploads.destroy', $file->id) }}', '{{ trans('general.title.delete', ['type' => $column_name]) }}', '{{ trans('general.delete_confirm', ['name' => $file->basename, 'type' => $column_name]) }} ', '{{ trans('general.cancel') }}', '{{ trans('general.delete') }}')" type="button" class="group">
<span class="material-icons text-base text-red px-1.5 py-1 rounded-lg group-hover:bg-gray-100">delete</span>

4
resources/views/components/show/accordion/index.blade.php
View File

@@ -21,8 +21,6 @@
@endif
@if (! empty($foot) && $foot->isNotEmpty())
<div class="relative__footer">
{!! $foot !!}
</div>
!! $foot !!}
@endif
</div>

9
resources/views/components/transactions/show/content.blade.php
View File

@@ -55,6 +55,15 @@
@endif
@stack('children_end')
@stack('transfer_start')
@if (! $hideTransfer)
<x-transactions.show.transfer
type="{{ $type }}"
:transaction="$transaction"
/>
@endif
@stack('transfer_end')
@stack('attachment_start')
@if (! $hideAttachment)
<x-transactions.show.attachment

37
resources/views/components/transactions/show/transfer.blade.php Normal file
View File

@@ -0,0 +1,37 @@
@if ($transaction->hasTransferRelation)
@php
$from_account = '<span class="font-medium">' . $transaction->transfer->expense_account->title . '</span>';
$to_account = '<span class="font-medium">' . $transaction->transfer->income_account->title . '</span>';
@endphp
<div class="border-b pb-4" x-data="{ transfer : null }">
<button class="relative w-full text-left cursor-pointer group"
x-on:click="transfer !== 1 ? transfer = 1 : transfer = null"
>
<span class="font-medium border-b border-transparent transition-all group-hover:border-black">
{{ trans_choice('general.transfers', 1) }}
</span>
<div class="text-black-400 text-sm">
{!! trans('transactions.slider.transfer_headline', ['from_account' => $from_account, 'to_account' => $to_account]) !!}
</div>
<span class="material-icons absolute right-0 top-0 transition-all transform"
x-bind:class="transfer === 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="transfer === 1 ? 'h-auto' : 'scale-y-0 h-0'"
>
@php
$date = '<a href="' . route('transfers.show', $transaction->transfer->id) . '" class="text-purple">' . company_date($transaction->paid_at) . '</a>';
@endphp
<div class="my-2">
{!! trans('transactions.slider.transfer_desc', ['date' => $date]) !!}
</div>
</div>
</div>
@endif

2
resources/views/components/transfers/show/content.blade.php
View File

@@ -2,6 +2,8 @@
<div class="w-full lg:w-5/12 space-y-12">
<x-transfers.show.create :model="$transfer" />
<x-transfers.show.transactions :model="$transfer" />
<x-transfers.show.attachment :model="$transfer" />
</div>

33
resources/views/components/transfers/show/transactions.blade.php Normal file
View File

@@ -0,0 +1,33 @@
<div class="border-b pb-4" x-data="{ transactions : null }">
<button class="relative w-full text-left group" x-on:click="transactions !== 1 ? transactions = 1 : transactions = null">
<span class="font-medium border-b border-transparent transition-all group-hover:border-black">
{{ trans_choice('general.transactions', 2) }}
</span>
<div class="text-black-400 text-sm">
{!! trans('transfers.slider.transactions', ['user' => $transfer->owner->name]) !!}
</div>
<span class="material-icons absolute right-0 top-0 transition-all transform" x-bind:class="transactions === 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="transactions === 1 ? 'h-auto' : 'scale-y-0 h-0'"
>
<div class="my-2">
@php
$number = '<a href="' . route('transactions.show', $transfer->expense_transaction->id) . '" class="text-purple">' . $transfer->expense_transaction->number . '</a>';
@endphp
{!! trans('transfers.slider.from_desc', ['number' => $number, 'account' => $transfer->expense_account->title]) !!}
</div>
<div class="my-2">
@php
$number = '<a href="' . route('transactions.show', $transfer->income_transaction->id) . '" class="text-purple">' . $transfer->income_transaction->number . '</a>';
@endphp
{!! trans('transfers.slider.from_desc', ['number' => $number, 'account' => $transfer->income_account->title]) !!}
</div>
</div>
</div>

20
resources/views/components/transfers/template/default.blade.php
View File

@@ -14,7 +14,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->name }}
{{ $transfer->expense_account->name }}
</td>
</tr>
</table>
@@ -26,7 +26,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->number }}
{{ $transfer->expense_account->number }}
</td>
</tr>
</table>
@@ -38,7 +38,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_name }}
{{ $transfer->expense_account->bank_name }}
</td>
</tr>
</table>
@@ -50,7 +50,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_phone }}
{{ $transfer->expense_account->bank_phone }}
</td>
</tr>
</table>
@@ -62,7 +62,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_address }}
{{ $transfer->expense_account->bank_address }}
</td>
</tr>
</table>
@@ -86,7 +86,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->name }}
{{ $transfer->income_account->name }}
</td>
</tr>
</table>
@@ -98,7 +98,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->number }}
{{ $transfer->income_account->number }}
</td>
</tr>
</table>
@@ -110,7 +110,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_name }}
{{ $transfer->income_account->bank_name }}
</td>
</tr>
</table>
@@ -122,7 +122,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_phone }}
{{ $transfer->income_account->bank_phone }}
</td>
</tr>
</table>
@@ -134,7 +134,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_address }}
{{ $transfer->income_account->bank_address }}
</td>
</tr>
</table>

20
resources/views/components/transfers/template/second.blade.php
View File

@@ -70,7 +70,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->name }}
{{ $transfer->expense_account->name }}
</td>
</tr>
</table>
@@ -82,7 +82,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->number}}
{{ $transfer->expense_account->number}}
</td>
</tr>
</table>
@@ -94,7 +94,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_name }}
{{ $transfer->expense_account->bank_name }}
</td>
</tr>
</table>
@@ -106,7 +106,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_phone }}
{{ $transfer->expense_account->bank_phone }}
</td>
</tr>
</table>
@@ -118,7 +118,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_address }}
{{ $transfer->expense_account->bank_address }}
</td>
</tr>
</table>
@@ -142,7 +142,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->name }}
{{ $transfer->income_account->name }}
</td>
</tr>
</table>
@@ -154,7 +154,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->number }}
{{ $transfer->income_account->number }}
</td>
</tr>
</table>
@@ -166,7 +166,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_name }}
{{ $transfer->income_account->bank_name }}
</td>
</tr>
</table>
@@ -178,7 +178,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_phone }}
{{ $transfer->income_account->bank_phone }}
</td>
</tr>
</table>
@@ -190,7 +190,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_address }}
{{ $transfer->income_account->bank_address }}
</td>
</tr>
</table>

20
resources/views/components/transfers/template/third.blade.php
View File

@@ -18,7 +18,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->name }}
{{ $transfer->expense_account->name }}
</td>
</tr>
</table>
@@ -30,7 +30,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->number}}
{{ $transfer->expense_account->number}}
</td>
</tr>
</table>
@@ -42,7 +42,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_name }}
{{ $transfer->expense_account->bank_name }}
</td>
</tr>
</table>
@@ -54,7 +54,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_phone }}
{{ $transfer->expense_account->bank_phone }}
</td>
</tr>
</table>
@@ -66,7 +66,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->expense_transaction->account->bank_address }}
{{ $transfer->expense_account->bank_address }}
</td>
</tr>
</table>
@@ -92,7 +92,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->name }}
{{ $transfer->income_account->name }}
</td>
</tr>
</table>
@@ -104,7 +104,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->number }}
{{ $transfer->income_account->number }}
</td>
</tr>
</table>
@@ -116,7 +116,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_name }}
{{ $transfer->income_account->bank_name }}
</td>
</tr>
</table>
@@ -128,7 +128,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_phone }}
{{ $transfer->income_account->bank_phone }}
</td>
</tr>
</table>
@@ -140,7 +140,7 @@
</td>
<td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
{{ $transfer->income_transaction->account->bank_address }}
{{ $transfer->income_account->bank_address }}
</td>
</tr>
</table>

46
resources/views/portal/invoices/index.blade.php
View File

@@ -151,27 +151,31 @@
<x-pagination :items="$invoices" />
</x-index.container>
@else
<x-empty-page
group="sales"
page="invoices"
hide-button-import
:buttons="[
[
'url' => route('transactions.create', ['type' => 'income']),
'permission' => 'create-sales-invoices',
'text' => trans('general.title.new', ['type' => trans_choice('general.incomes', 1)]),
'description' => trans('general.empty.actions.new', ['type' => trans_choice('general.incomes', 1)]),
'active_badge' => false
],
[
'url' => 'https://akaunting.com/premium-cloud',
'permission' => 'create-sales-invoices',
'text' => trans('import.title', ['type' => trans_choice('general.bank_transactions', 2)]),
'description' => '',
'active_badge' => false
]
]"
/>
<div class="flex">
<div class="w-full text-center">
<div class="my-10">
{{ trans('portal.create_your_invoice') }}
</div>
<div class="my-10">
<a href="https://akaunting.com/lp/accounting-software?utm_source=invoice_index&utm_medium=software&utm_campaign=plg" class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700">
{{ trans('portal.get_started') }}
</a>
</div>
<div class="my-10">
<img src="https://assets.akaunting.com/software/portal/invoice.gif" class="inline" alt="Get Started" />
</div>
</div>
</div>
@push('css')
<style>
.hide-empty-page {
display: none;
}
</style>
@endpush
@endif
</x-slot>

53
resources/views/portal/payments/index.blade.php
View File

@@ -59,34 +59,31 @@
<x-pagination :items="$payments" />
</x-index.container>
@else
<x-empty-page
group="banking"
page="transactions"
hide-button-import
:buttons="[
[
'url' => route('transactions.create', ['type' => 'income']),
'permission' => 'create-banking-transactions',
'text' => trans('general.title.new', ['type' => trans_choice('general.incomes', 1)]),
'description' => trans('general.empty.actions.new', ['type' => trans_choice('general.incomes', 1)]),
'active_badge' => false
],
[
'url' => route('transactions.create', ['type' => 'expense']),
'permission' => 'create-banking-transactions',
'text' => trans('general.title.new', ['type' => trans_choice('general.expenses', 1)]),
'description' => trans('general.empty.actions.new', ['type' => trans_choice('general.expenses', 1)]),
'active_badge' => false
],
[
'url' => 'https://akaunting.com/premium-cloud',
'permission' => 'create-banking-transactions',
'text' => trans('import.title', ['type' => trans_choice('general.bank_transactions', 2)]),
'description' => '',
'active_badge' => false
]
]"
/>
<div class="flex">
<div class="w-full text-center">
<div class="my-10">
{{ trans('portal.create_your_invoice') }}
</div>
<div class="my-10">
<a href="https://akaunting.com/lp/accounting-software?utm_source=payment_index&utm_medium=software&utm_campaign=plg" class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700">
{{ trans('portal.get_started') }}
</a>
</div>
<div class="my-10">
<img src="https://assets.akaunting.com/software/portal/payment.gif" class="inline" alt="Get Started" />
</div>
</div>
</div>
@push('css')
<style>
.hide-empty-page {
display: none;
}
</style>
@endpush
@endif
</x-slot>