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 code-clean

Browse Source
This commit is contained in:
Burak Civan
2022-09-07 09:56:41 +03:00
parent ccc566ccc7 513f4516fe
commit f7694c24a8
76 changed files with 1024 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/common/companies/index.blade.php
View File

@@ -11,7 +11,7 @@
<x-slot name="buttons">
@can('create-common-companies')
<x-link href="{{ route('companies.create') }}" kind="primary">
<x-link href="{{ route('companies.create') }}" kind="primary" id="index-more-actions-new-company">
{{ trans('general.title.new', ['type' => trans_choice('general.companies', 1)]) }}
</x-link>
@endcan

2
resources/views/common/dashboards/index.blade.php
View File

@@ -3,7 +3,7 @@
<x-slot name="buttons">
@can('create-common-dashboards')
<x-link href="{{ route('dashboards.create') }}" kind="primary">
<x-link href="{{ route('dashboards.create') }}" kind="primary" id="index-more-actions-new-dasboard">
{{ trans('general.title.new', ['type' => trans_choice('general.dashboards', 1)]) }}
</x-link>
@endcan

14
resources/views/common/dashboards/show.blade.php
View File

@@ -6,7 +6,7 @@
<x-slot name="title">
@if ($user_dashboards->count() > 1)
<div class="flex items-center relative cursor-pointer">
<x-dropdown id="dashboard-list">
<x-dropdown id="show-dashboard-list">
<x-slot name="trigger" class="flex items-center" override="class">
<span class="text-2xl xl:text-5xl text-black font-light truncate">
<x-button.hover color="to-black-700">
@@ -20,7 +20,7 @@
</x-slot>
@foreach ($user_dashboards as $user_dashboard)
<x-dropdown.link href="{{ route('dashboards.switch', $user_dashboard->id) }}">
<x-dropdown.link href="{{ route('dashboards.switch', $user_dashboard->id) }}" id="show-dashboard-switch-{{ $user_dashboard->id }}">
{{ $user_dashboard->name }}
</x-dropdown.link>
@endforeach
@@ -100,9 +100,9 @@
@section('dashboard_action')
@canany(['create-common-widgets', 'read-common-dashboards'])
<div class="dashboard-action">
<x-dropdown id="dropdown-dashboard-company">
<x-dropdown id="show-more-actions-dashboard">
<x-slot name="trigger" class="flex" override="class">
<span id="dashboard-more-actions" class="w-8 h-8 flex items-center justify-center px-2 py-2 ltr:ml-2 rtl:mr-2 hover:bg-gray-100 rounded-xl text-purple text-sm font-medium leading-6">
<span class="w-8 h-8 flex items-center justify-center px-2 py-2 ltr:ml-2 rtl:mr-2 hover:bg-gray-100 rounded-xl text-purple text-sm font-medium leading-6">
<span class="material-icons">more_vert</span>
</span>
</x-slot>
@@ -110,7 +110,7 @@
@can('create-common-widgets')
<x-button
type="button"
id="dashboard-add-widget"
id="show-more-actions-add-widget"
class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap"
override="class"
title="{{ trans('general.title.add', ['type' => trans_choice('general.widgets', 1)]) }}"
@@ -126,12 +126,12 @@
@can('update-common-dashboards')
@can('create-common-dashboards')
<x-dropdown.link href="{{ route('dashboards.create') }}">
<x-dropdown.link href="{{ route('dashboards.create') }}" id="show-more-actions-new-dashboard">
{{ trans('general.title.create', ['type' => trans_choice('general.dashboards', 1)]) }}
</x-dropdown.link>
@endcan
<x-dropdown.link href="{{ route('dashboards.index') }}">
<x-dropdown.link href="{{ route('dashboards.index') }}" id="show-more-actions-manage-dashboards">
{{ trans('general.title.manage', ['type' => trans_choice('general.dashboards', 2)]) }}
</x-dropdown.link>
@endcan

6
resources/views/common/items/index.blade.php
View File

@@ -9,7 +9,7 @@
<x-slot name="buttons">
@can('create-common-items')
<x-link href="{{ route('items.create') }}" kind="primary">
<x-link href="{{ route('items.create') }}" kind="primary" id="index-more-actions-new-item">
{{ trans('general.title.new', ['type' => trans_choice('general.items', 1)]) }}
</x-link>
@endcan
@@ -22,12 +22,12 @@
</x-slot>
@can('create-common-items')
<x-dropdown.link href="{{ route('import.create', ['common', 'items']) }}">
<x-dropdown.link href="{{ route('import.create', ['common', 'items']) }}" id="index-more-actions-import-item">
{{ trans('import.import') }}
</x-dropdown.link>
@endcan
<x-dropdown.link href="{{ route('items.export', request()->input()) }}">
<x-dropdown.link href="{{ route('items.export', request()->input()) }}" id="index-more-actions-export-item">
{{ trans('general.export') }}
</x-dropdown.link>
</x-dropdown>

8
resources/views/common/reports/index.blade.php
View File

@@ -55,10 +55,10 @@
</div>
<div class="flex items-start ltr:space-x-2 rtl:space-x-reverse">
<livewire:report.pin :categories="$categories" :report-id="$report->id" />
<livewire:report.pin :categories="$categories" :report="$report" />
@canany(['create-common-reports', 'update-common-reports', 'delete-common-reports'])
<x-dropdown id="widget-{{ $category_id }}-{{ $report->id }}">
<x-dropdown id="index-line-actions-report-{{ $category_id }}-{{ $report->id }}">
<x-slot name="trigger" class="flex" override="class">
<span class="w-8 h-8 flex items-center justify-center px-2 py-2 rtl:mr-4 hover:bg-gray-100 rounded-xl text-purple text-sm font-medium leading-6">
<span class="material-icons">more_vert</span>
@@ -66,13 +66,13 @@
</x-slot>
@can('update-common-reports')
<x-dropdown.link href="{{ route('reports.edit', $report->id) }}">
<x-dropdown.link href="{{ route('reports.edit', $report->id) }}" id="index-line-actions-edit-report-{{ $report->id }}">
{{ trans('general.edit') }}
</x-dropdown.link>
@endcan
@can('create-common-reports')
<x-dropdown.link href="{{ route('reports.duplicate', $report->id) }}">
<x-dropdown.link href="{{ route('reports.duplicate', $report->id) }}" id="index-line-actions-duplicate-report-{{ $report->id }}">
{{ trans('general.duplicate') }}
</x-dropdown.link>
@endcan