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

Merge branch 'master' into user-works

Browse Source
This commit is contained in:
Sevan Nerse
2022-06-29 22:40:55 +03:00
parent cf26bc5998 c27c236d31
commit a63b9938da
16 changed files with 99 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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/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>

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>

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>