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 text-hover

Browse Source
This commit is contained in:
Burak Civan
2022-06-24 10:04:10 +03:00
parent e985a057e2 08bd469057
commit 8ca2a931ec
11 changed files with 160 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/components/AkauntingSearch.vue
View File

@ -582,6 +582,8 @@ export default {
if (this.filter_index == 0) {
this.onChangeSearchAndFilterText(this.defaultPlaceholder, true);
} else {
this.show_icon = false;
}
this.filter_last_step = 'options';

5
resources/lang/en-GB/notifications.php
View File

@ -6,9 +6,10 @@ return [
'hello' => 'Hello!',
'salutation' => 'Regards,<br> :company_name',
'subcopy' => 'If you’re having trouble clicking the ":text" button, copy and paste the URL below into your web browser: [:url](:url)',
'mark_read' => 'Mark Read',
'mark_read_all' => 'Mark Read All',
'mark_read' => 'Mark as Read',
'mark_read_all' => 'Mark as All Read',
'empty' => 'Woohoo, notification zero!',
'new_apps' => ':app is available. <a href=":url">Check it out now</a>!',
'update' => [

17
resources/views/livewire/menu/notifications.blade.php
View File

@ -9,7 +9,7 @@
@if ($notifications)
<div class="flex justify-end mt-1 mb-3">
<x-tooltip id="notification-all" placement="top" message="Mark as All Read">
<x-tooltip id="notification-all" placement="top" message="{{ trans('notifications.mark_read_all') }}">
<button type="button" wire:click="markReadAll()">
<span id="menu-notification-read-all" class="material-icons text-lg text-purple">done_all</span>
</button>
@ -26,15 +26,18 @@
<div class="flex items-start justify-between font-medium text-sm text-purple mb-1">
<div class="flex flex-col">
{!! $notification->data['title'] !!}
<span class="text-gray-500" style="font-size: 10px;">{{ \Carbon\Carbon::createFromTimeStamp(strtotime($notification->created_at))->diffForHumans() }}</span>
<span class="text-gray-500" style="font-size: 10px;">
{{ \Carbon\Carbon::createFromTimeStamp(strtotime($notification->created_at))->diffForHumans() }}
</span>
</div>
@if ($notification->type != 'updates')
<x-tooltip id="notification-{{ $notification->id }}" placement="top" message="Clear Notification">
<button type="button" wire:click="markRead('{{ $notification->type }}', '{{ $notification->id }}')">
<span id="menu-notification-mark-read" class="material-icons text-lg text-purple">check_circle_outline</span>
</button>
</x-tooltip>
<x-tooltip id="notification-{{ $notification->id }}" placement="top" message="{{ trans('notifications.mark_read') }}">
<button type="button" wire:click="markRead('{{ $notification->type }}', '{{ $notification->id }}')">
<span id="menu-notification-mark-read" class="material-icons text-lg text-purple">check_circle_outline</span>
</button>
</x-tooltip>
@endif
</div>

7
resources/views/widgets/account_balance.blade.php
View File

@ -4,8 +4,11 @@
<ul class="text-sm space-y-3 my-3">
@foreach($accounts as $item)
<li class="flex justify-between">
{{ $item->name }}
<span class="font-medium">{{ $item->balance_formatted }}</span>
{{ $item->title }}
<span class="font-medium">
{{ $item->balance_formatted }}
</span>
</li>
@endforeach
</ul>

8
resources/views/widgets/cash_flow.blade.php
View File

@ -12,7 +12,9 @@
{{ $totals['incoming'] }}
</div>
<span class="text-green text-xs">{{ trans('general.incoming') }}</span>
<span class="text-green text-xs">
{{ trans('general.incoming') }}
</span>
<span class="material-icons mt-2">remove</span>
</div>
@ -22,7 +24,9 @@
{{ $totals['outgoing'] }}
</div>
<span class="text-rose text-xs">{{ trans('general.outgoing') }}</span>
<span class="text-rose text-xs">
{{ trans('general.outgoing') }}
</span>
<span class="material-icons mt-2">drag_handle</span>
</div>

5
resources/views/widgets/currencies.blade.php
View File

@ -5,7 +5,10 @@
@foreach($currencies as $item)
<li class="flex justify-between">
{{ $item->name }}
<span class="font-medium">{{ $item->rate }}</span>
<span class="font-medium">
{{ $item->rate }}
</span>
</li>
@endforeach
</ul>

11
resources/views/widgets/receivables_payables.blade.php
View File

@ -34,11 +34,16 @@
<span class="material-icons-round cursor-pointer">arrow_drop_down</span>
<div id="widgets-list-{{ $class->model->id }}" class="absolute right-0 mt-3 py-2 bg-white rounded-md border border-gray-200 shadow-xl z-20 hidden" style="left: auto; min-width: 10rem;">
@foreach($periods as $name => $amount)
@foreach ($periods as $name => $amount)
<div id="dashboard-widget-{{ strtolower(class_basename($class)) }}-{{ str_replace('_', '-', $name) }}" class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap cursor-auto">
<div class="w-full h-full flex items-center justify-between rounded-md px-2 text-sm hover:bg-lilac-100">
<div class="font-normal text-sm">{{ trans('widgets.periods.' . $name) }}</div>
<div class="pl-12 text-sm">{{ $amount }}</div>
<div class="font-normal text-sm">
{{ trans('widgets.periods.' . $name) }}
</div>
<div class="pl-12 text-sm">
{{ $amount }}
</div>
</div>
</div>
@endforeach