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

Merge branch 'akaunting:master' into master

Browse Source
This commit is contained in:
Burak Civan
2022-07-26 09:11:44 +03:00
committed by GitHub
parent d47c2deb5f f6c91a2817
commit 2a96be1094
19 changed files with 143 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
{{ $account->name }}
</x-slot>
<x-slot name="status">
<x-slot name="info">
<div class="mt-3">
@if (! $account->enabled)
<x-index.disable text="{{ trans_choice('general.accounts', 1) }}" />

44
resources/views/components/contacts/show/content.blade.php
View File

@@ -162,7 +162,7 @@
<x-table>
<x-table.thead>
<x-table.tr class="flex items-center px-1">
<x-table.th class="w-4/12 table-title hidden sm:table-cell">
<x-table.th class="w-3/12 hidden sm:table-cell">
<x-slot name="first">
<x-sortablelink column="due_at" title="{{ trans('invoices.due_date') }}" />
</x-slot>
@@ -172,11 +172,11 @@
</x-slot>
</x-table.th>
<x-table.th class="w-3/12 table-title hidden sm:table-cell">
<x-table.th class="w-3/12 hidden sm:table-cell">
<x-sortablelink column="status" title="{{ trans_choice('general.statuses', 1) }}" />
</x-table.th>
<x-table.th class="w-6/12 sm:w-3/12 table-title'">
<x-table.th class="w-3/12 sm:table-cell'">
<x-slot name="first">
<x-sortablelink column="contact_name" title="{{ trans_choice('general.customers', 1) }}" />
</x-slot>
@@ -186,7 +186,7 @@
</x-slot>
</x-table.th>
<x-table.th class="w-6/12 sm:w-2/12 ltr:pl-6 rtl:pr-6 py-3 ltr:text-right rtl:text-left text-sm font-medium text-black tracking-wider" override="class">
<x-table.th class="w-3/12" kind="amount">
<x-sortablelink column="amount" title="{{ trans('general.amount') }}" />
</x-table.th>
</x-table.tr>
@@ -196,7 +196,7 @@
@foreach($documents as $item)
@php $paid = $item->paid; @endphp
<x-table.tr href="{{ route(config('type.document.' . $item->type . '.route.prefix', 'invoices') . '.show', $item->id) }}">
<x-table.td class="w-4/12 table-title hidden sm:table-cell">
<x-table.td class="w-3/12 hidden sm:table-cell">
<x-slot name="first" class="font-bold truncate" override="class">
{{ \Date::parse($item->due_at)->diffForHumans() }}
</x-slot>
@@ -206,11 +206,11 @@
</x-slot>
</x-table.td>
<x-table.td class="w-3/12 table-title hidden sm:table-cell">
<x-table.td class="w-3/12 hidden sm:table-cell">
<x-show.status status="{{ $item->status }}" background-color="bg-{{ $item->status_label }}" text-color="text-text-{{ $item->status_label }}" />
</x-table.td>
<x-table.td class="w-6/12 sm:w-3/12 table-title'">
<x-table.td class="w-3/12 sm:table-cell">
<x-slot name="first">
{{ $item->contact_name }}
</x-slot>
@@ -226,7 +226,7 @@
</x-slot>
</x-table.td>
<x-table.td class="w-6/12 sm:w-2/12 ltr:pl-6 rtl:pr-6 py-3 ltr:text-right rtl:text-left text-sm font-medium text-black tracking-wider" override="class">
<x-table.td class="w-3/12 relative" kind="amount">
<x-money :amount="$item->amount" :currency="$item->currency_code" convert />
</x-table.td>
@@ -251,7 +251,7 @@
<x-table>
<x-table.thead>
<x-table.tr class="flex items-center px-1">
<x-table.th class="w-4/12 sm:w-3/12">
<x-table.th class="w-3/12 hidden sm:table-cell">
<x-slot name="first">
<x-sortablelink column="paid_at" title="{{ trans('general.date') }}" />
</x-slot>
@@ -260,7 +260,7 @@
</x-slot>
</x-table.th>
<x-table.th class="w-2/12 hidden sm:table-cell">
<x-table.th class="w-3/12">
<x-slot name="first">
<x-sortablelink column="type" title="{{ trans_choice('general.types', 1) }}" />
</x-slot>
@@ -269,20 +269,16 @@
</x-slot>
</x-table.th>
<x-table.th class="w-4/12 sm:w-3/12">
<x-sortablelink column="account.name" title="{{ trans_choice('general.accounts', 1) }}" />
</x-table.th>
<x-table.th class="w-2/12 hidden sm:table-cell">
<x-table.th class="w-3/12 hidden sm:table-cell">
<x-slot name="first">
<x-sortablelink column="contact.name" title="{{ trans_choice('general.contacts', 1) }}" />
<x-sortablelink column="account.name" title="{{ trans_choice('general.accounts', 1) }}" />
</x-slot>
<x-slot name="second">
<x-sortablelink column="document.document_number" title="{{ trans_choice('general.documents', 1) }}" />
</x-slot>
</x-table.th>
<x-table.th class="w-4/12 sm:w-2/12 ltr:pl-6 rtl:pr-6 py-3 ltr:text-right rtl:text-left text-xs font-medium text-black tracking-wider" override="class">
<x-table.th class="w-3/12" kind="amount">
<x-sortablelink column="amount" title="{{ trans('general.amount') }}" />
</x-table.th>
</x-table.tr>
@@ -291,7 +287,7 @@
<x-table.tbody>
@foreach($transactions as $item)
<x-table.tr href="{{ route('transactions.show', $item->id) }}">
<x-table.td class="w-4/12 sm:w-3/12">
<x-table.td class="w-3/12 hidden sm:table-cell">
<x-slot name="first" class="font-bold truncate" override="class">
<x-date date="{{ $item->paid_at }}" />
</x-slot>
@@ -300,7 +296,7 @@
</x-slot>
</x-table.td>
<x-table.td class="w-2/12 hidden sm:table-cell">
<x-table.td class="w-3/12">
<x-slot name="first">
{{ $item->type_title }}
</x-slot>
@@ -309,13 +305,9 @@
</x-slot>
</x-table.td>
<x-table.td class="w-4/12 sm:w-3/12">
{{ $item->account->name }}
</x-table.td>
<x-table.td class="w-2/12 hidden sm:table-cell">
<x-table.td class="w-3/12 hidden sm:table-cell">
<x-slot name="first">
{{ $item->contact->name }}
{{ $item->account->name }}
</x-slot>
<x-slot name="second">
@if ($item->document)
@@ -328,7 +320,7 @@
</x-slot>
</x-table.td>
<x-table.td class="relative w-4/12 sm:w-2/12 ltr:pl-6 rtl:pr-6 py-3 ltr:text-right rtl:text-left text-sm font-normal text-black tracking-wider" override="class">
<x-table.td class="w-3/12 relative" kind="amount">
<x-money :amount="$item->amount" :currency="$item->currency_code" convert />
</x-table.td>

6
resources/views/components/documents/index/document.blade.php
View File

@@ -121,9 +121,7 @@
@if (!$hideStatus)
<x-table.td class="{{ $classStatus }}">
@stack('status_td_inside_start')
<span class="px-2.5 py-1 text-xs font-medium rounded-xl bg-{{ $item->status_label }} text-text-{{ $item->status_label }}">
{{ trans($textDocumentStatus . $item->status) }}
</span>
<x-show.status status="{{ $item->status }}" background-color="bg-{{ $item->status_label }}" text-color="text-text-{{ $item->status_label }}" />
@stack('status_td_inside_end')
</x-table.td>
@endif
@@ -179,4 +177,4 @@
</x-table.tbody>
</x-table>
<x-pagination :items="$documents" />
<x-pagination :items="$documents" />

16
resources/views/components/layouts/admin.blade.php
View File

@@ -27,19 +27,25 @@
<div class="container">
<x-layouts.admin.header>
<x-slot name="title">
{!! !empty($title->attributes->has('title')) ? $title->attributes->get('title') : $title !!}
{!! ! empty($title->attributes->has('title')) ? $title->attributes->get('title') : $title !!}
</x-slot>
@if (!empty($status))
@if (! empty($status))
<x-slot name="status">
{!! $status ?? '' !!}
{!! $status !!}
</x-slot>
@endif
@if (!empty($favorite) || (!empty($favorite) && $favorite->attributes->has('title')))
@if (! empty($info))
<x-slot name="info">
{!! $info !!}
</x-slot>
@endif
@if (! empty($favorite) || (! empty($favorite) && $favorite->attributes->has('title')))
@if (! $favorite->attributes->has('title'))
<x-slot name="favorite">
{!! $favorite ?? '' !!}
{!! $favorite !!}
</x-slot>
@else
@php

8
resources/views/components/layouts/admin/header.blade.php
View File

@@ -10,7 +10,13 @@
@yield('dashboard_action')
</h1>
{!! $status ?? '' !!}
@if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4">
{!! $status !!}
</div>
@endif
{!! $info ?? '' !!}
{!! $favorite ?? '' !!}
</div>

16
resources/views/components/layouts/portal.blade.php
View File

@@ -21,19 +21,25 @@
<div class="container">
<x-layouts.portal.header>
<x-slot name="title">
{!! !empty($title->attributes->has('title')) ? $title->attributes->get('title') : $title !!}
{!! ! empty($title->attributes->has('title')) ? $title->attributes->get('title') : $title !!}
</x-slot>
@if (!empty($status))
@if (! empty($status))
<x-slot name="status">
{!! $status ?? '' !!}
{!! $status !!}
</x-slot>
@endif
@if (!empty($favorite) || (!empty($favorite) && $favorite->attributes->has('title')))
@if (! empty($info))
<x-slot name="info">
{!! $info !!}
</x-slot>
@endif
@if (! empty($favorite) || (! empty($favorite) && $favorite->attributes->has('title')))
@if (! $favorite->attributes->has('title'))
<x-slot name="favorite">
{!! $favorite ?? '' !!}
{!! $favorite !!}
</x-slot>
@else
@php

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

@@ -10,7 +10,13 @@
@yield('dashboard_action')
</h1>
{!! $status ?? '' !!}
@if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4">
{!! $status !!}
</div>
@endif
{!! $info ?? '' !!}
{!! $favorite ?? '' !!}
</div>

16
resources/views/components/layouts/preview.blade.php
View File

@@ -32,19 +32,25 @@
<div class="w-full lg:max-w-6xl m-auto">
<x-layouts.preview.header>
<x-slot name="title">
{!! !empty($title->attributes->has('title')) ? $title->attributes->get('title') : $title !!}
{!! ! empty($title->attributes->has('title')) ? $title->attributes->get('title') : $title !!}
</x-slot>
@if (!empty($status))
@if (! empty($status))
<x-slot name="status">
{!! $status ?? '' !!}
{!! $status !!}
</x-slot>
@endif
@if (!empty($favorite) || (!empty($favorite) && $favorite->attributes->has('title')))
@if (! empty($info))
<x-slot name="info">
{!! $info !!}
</x-slot>
@endif
@if (! empty($favorite) || (! empty($favorite) && $favorite->attributes->has('title')))
@if (! $favorite->attributes->has('title'))
<x-slot name="favorite">
{!! $favorite ?? '' !!}
{!! $favorite !!}
</x-slot>
@else
@php

8
resources/views/components/layouts/preview/header.blade.php
View File

@@ -10,7 +10,13 @@
@yield('dashboard_action')
</h1>
{!! $status ?? '' !!}
@if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4">
{!! $status !!}
</div>
@endif
{!! $info ?? '' !!}
{!! $favorite ?? '' !!}
</div>

16
resources/views/components/layouts/signed.blade.php
View File

@@ -12,19 +12,25 @@
<div class="container-fluid content-layout mt-4">
<x-layouts.signed.header>
<x-slot name="title">
{!! !empty($title->attributes->has('title')) ? $title->attributes->get('title') : $title !!}
{!! ! empty($title->attributes->has('title')) ? $title->attributes->get('title') : $title !!}
</x-slot>
@if (!empty($status))
@if (! empty($status))
<x-slot name="status">
{!! $status ?? '' !!}
{!! $status !!}
</x-slot>
@endif
@if (!empty($favorite) || (!empty($favorite) && $favorite->attributes->has('title')))
@if (! empty($info))
<x-slot name="info">
{!! $info !!}
</x-slot>
@endif
@if (! empty($favorite) || (! empty($favorite) && $favorite->attributes->has('title')))
@if (! $favorite->attributes->has('title'))
<x-slot name="favorite">
{!! $favorite ?? '' !!}
{!! $favorite !!}
</x-slot>
@else
@php

8
resources/views/components/layouts/signed/header.blade.php
View File

@@ -10,7 +10,13 @@
@yield('dashboard_action')
</h1>
{!! $status ?? '' !!}
@if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4">
{!! $status !!}
</div>
@endif
{!! $info ?? '' !!}
{!! $favorite ?? '' !!}
</div>

2
resources/views/components/show/status.blade.php
View File

@@ -1,5 +1,5 @@
<span @class([
'px-2.5 py-1 ltr:ml-2 rtl:mr-2 text-xs font-medium rounded-xl',
'px-2.5 py-1 text-xs font-medium rounded-xl',
$backgroundColor,
$textColor,
])

2
resources/views/purchases/vendors/show.blade.php vendored
View File

@@ -3,7 +3,7 @@
{{ $vendor->name }}
</x-slot>
<x-slot name="status">
<x-slot name="info">
@if (! $vendor->enabled)
<x-index.disable text="{{ trans_choice('general.vendors', 1) }}" />
@endif

2
resources/views/sales/customers/show.blade.php
View File

@@ -3,7 +3,7 @@
{{ $customer->name }}
</x-slot>
<x-slot name="status">
<x-slot name="info">
@if (! $customer->enabled)
<x-index.disable text="{{ trans_choice('general.customers', 1) }}" />
@endif