Merge branch 'master' of https://github.com/brkcvn/akaunting into responsive-control
This commit is contained in:
Burak Civan
@@ -32,21 +32,23 @@
|
||||
</x-slot>
|
||||
</x-form.section>
|
||||
|
||||
<x-form.section>
|
||||
<x-slot name="head">
|
||||
<x-form.section.head title="{{ trans('general.assign') }}" description="{!! trans('auth.form_description.assign', ['url' => $roles_url]) !!}" />
|
||||
</x-slot>
|
||||
@if (user()->can('read-common-companies') || user()->hasRole(['admin', 'manager']))
|
||||
<x-form.section>
|
||||
<x-slot name="head">
|
||||
<x-form.section.head title="{{ trans('general.assign') }}" description="{!! trans('auth.form_description.assign', ['url' => $roles_url]) !!}" />
|
||||
</x-slot>
|
||||
|
||||
<x-slot name="body">
|
||||
@can('read-common-companies')
|
||||
<x-form.group.select multiple remote name="companies" label="{{ trans_choice('general.companies', 2) }}" :options="$companies" remote_action="{{ route('companies.index') }}" form-group-class="sm:col-span-6" />
|
||||
@endcan
|
||||
<x-slot name="body">
|
||||
@can('read-common-companies')
|
||||
<x-form.group.select multiple remote name="companies" label="{{ trans_choice('general.companies', 2) }}" :options="$companies" remote_action="{{ route('companies.index') }}" form-group-class="sm:col-span-6" />
|
||||
@endcan
|
||||
|
||||
@role('admin|manager')
|
||||
<x-form.group.select name="roles" label="{{ trans_choice('general.roles', 1) }}" :options="$roles" />
|
||||
@endrole
|
||||
</x-slot>
|
||||
</x-form.section>
|
||||
@role('admin|manager')
|
||||
<x-form.group.select name="roles" label="{{ trans_choice('general.roles', 1) }}" :options="$roles" />
|
||||
@endrole
|
||||
</x-slot>
|
||||
</x-form.section>
|
||||
@endif
|
||||
|
||||
<x-form.section>
|
||||
<x-slot name="head">
|
||||
|
||||
@@ -38,21 +38,23 @@
|
||||
</x-slot>
|
||||
</x-form.section>
|
||||
|
||||
<x-form.section>
|
||||
<x-slot name="head">
|
||||
<x-form.section.head title="{{ trans('general.assign') }}" description="{!! trans('auth.form_description.assign', ['url' => $roles_url]) !!}" />
|
||||
</x-slot>
|
||||
@if (user()->can('read-common-companies') || user()->hasRole(['admin', 'manager']))
|
||||
<x-form.section>
|
||||
<x-slot name="head">
|
||||
<x-form.section.head title="{{ trans('general.assign') }}" description="{!! trans('auth.form_description.assign', ['url' => $roles_url]) !!}" />
|
||||
</x-slot>
|
||||
|
||||
<x-slot name="body">
|
||||
@can('read-common-companies')
|
||||
<x-form.group.select multiple remote name="companies" label="{{ trans_choice('general.companies', 2) }}" :options="$companies" selected-key="company_ids" :remote_action="route('companies.index')" form-group-class="sm:col-span-6" />
|
||||
@endcan
|
||||
<x-slot name="body">
|
||||
@can('read-common-companies')
|
||||
<x-form.group.select multiple remote name="companies" label="{{ trans_choice('general.companies', 2) }}" :options="$companies" selected-key="company_ids" :remote_action="route('companies.index')" form-group-class="sm:col-span-6" />
|
||||
@endcan
|
||||
|
||||
@role('admin|manager')
|
||||
<x-form.group.select name="roles" label="{{ trans_choice('general.roles', 1) }}" :options="$roles" selected-key="roles.id" />
|
||||
@endrole
|
||||
</x-slot>
|
||||
</x-form.section>
|
||||
@role('admin|manager')
|
||||
<x-form.group.select name="roles" label="{{ trans_choice('general.roles', 1) }}" :options="$roles" selected-key="roles.id" />
|
||||
@endrole
|
||||
</x-slot>
|
||||
</x-form.section>
|
||||
@endif
|
||||
|
||||
<x-form.section>
|
||||
<x-slot name="head">
|
||||
@@ -69,15 +71,15 @@
|
||||
<x-form.group.switch name="enabled" label="{{ trans('general.enabled') }}" />
|
||||
|
||||
@canany(['update-auth-users', 'update-auth-profile'])
|
||||
<x-form.section>
|
||||
<x-slot name="foot">
|
||||
@if (user()->can('read-auth-users'))
|
||||
<x-form.buttons cancel-route="users.index" />
|
||||
@else
|
||||
<x-form.buttons cancel-route="dashboard" />
|
||||
@endif
|
||||
</x-slot>
|
||||
</x-form.section>
|
||||
<x-form.section>
|
||||
<x-slot name="foot">
|
||||
@if (user()->can('read-auth-users'))
|
||||
<x-form.buttons cancel-route="users.index" />
|
||||
@else
|
||||
<x-form.buttons cancel-route="dashboard" />
|
||||
@endif
|
||||
</x-slot>
|
||||
</x-form.section>
|
||||
@endcanany
|
||||
</x-form>
|
||||
</x-form.container>
|
||||
|
||||
@@ -44,22 +44,24 @@
|
||||
@endif
|
||||
@endforeach
|
||||
|
||||
@if (! empty($suggestion))
|
||||
<li class="border-b p-2 hover:bg-gray-100">
|
||||
<x-link href="{{ url($suggestion->action_url) . '?' . http_build_query((array) $suggestion->action_parameters) }}" class="flex items-center justify-between text-xs" override="class">
|
||||
<div class="truncate">
|
||||
<h2>
|
||||
{{ $suggestion->name }}
|
||||
</h2>
|
||||
@if (! empty($suggestions))
|
||||
@foreach ($suggestions as $suggestion)
|
||||
<li class="border-b p-2 hover:bg-gray-100">
|
||||
<x-link href="{{ url($suggestion->action_url) . '?' . http_build_query((array) $suggestion->action_parameters) }}" class="flex items-center justify-between text-xs" override="class">
|
||||
<div class="truncate">
|
||||
<h2>
|
||||
{{ $suggestion->name }}
|
||||
</h2>
|
||||
|
||||
<div class="h-4 overflow-hidden text-black-400 truncate">
|
||||
{{ $suggestion->description ?? '' }}
|
||||
<div class="h-4 overflow-hidden text-black-400 truncate">
|
||||
{{ $suggestion->description ?? '' }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<span class="material-icons text-gray-500">chevron_right</span>
|
||||
</x-link>
|
||||
</li>
|
||||
<span class="material-icons text-gray-500">chevron_right</span>
|
||||
</x-link>
|
||||
</li>
|
||||
@endforeach
|
||||
@endif
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<div>
|
||||
<div class="d-none">
|
||||
<div class="hidden">
|
||||
@if (!empty($setting['name']))
|
||||
<h2>{{ $setting['name'] }}</h2>
|
||||
@endif
|
||||
|
||||
@if (!empty($setting['description']))
|
||||
<div class="well well-sm">{{ $setting['description'] }}</div>
|
||||
<div>{{ $setting['description'] }}</div>
|
||||
@endif
|
||||
</div>
|
||||
<br>
|
||||
@@ -13,8 +13,10 @@
|
||||
<div class="buttons">
|
||||
<div class="pull-right">
|
||||
<x-form id="redirect-form" :url="$confirm_url">
|
||||
<button @click="onRedirectConfirm" type="button" id="button-confirm" class="btn disabled:bg-green-100">
|
||||
{{ trans('general.confirm') }}
|
||||
<button @click="onRedirectConfirm" type="button" id="button-confirm" class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100">
|
||||
<span>
|
||||
{{ trans('general.confirm') }}
|
||||
</span>
|
||||
</button>
|
||||
</x-form>
|
||||
</div>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
$more_actions = [];
|
||||
@endphp
|
||||
|
||||
<div class="absolute ltr:right-12 rtl:left-12 -top-4 hidden items-center group-hover/actions:flex">
|
||||
<div class="absolute ltr:right-12 rtl:left-12 -top-4 hidden items-center group-hover:flex">
|
||||
@foreach ($actions as $action)
|
||||
@if (! empty($action['permission']))
|
||||
@can($action['permission'])
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
{{ $item->title }}
|
||||
</h2>
|
||||
|
||||
<p class="text-sm mb-2">
|
||||
<div class="text-sm mb-2">
|
||||
{!! $item->description !!}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<x-link href="{{ $item->action }}" class="font-light text-sm" override="class" target="_blank">
|
||||
<x-link.hover>
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
{{ $item->title }}
|
||||
</h2>
|
||||
|
||||
<p class="text-sm mb-2">
|
||||
<div class="text-sm mb-2">
|
||||
{!! $item->description !!}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<x-link href="{{ $item->action }}" class="font-light text-sm" override="class" target="_blank">
|
||||
<x-link.hover>
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
</x-table.td>
|
||||
|
||||
<x-table.td kind="right" class="w-6/12" kind="cursor-none">
|
||||
<x-slot name="first" class="text-right" override="class">
|
||||
<x-slot name="first" class="flex justify-end" override="class">
|
||||
<x-link href="{{ route('updates.run', ['alias' => 'core', 'version' => $core]) }}" class="px-3 py-1.5 rounded-xl text-sm font-medium leading-6 ltr:mr-2 rtl:ml-2 bg-green text-white hover:bg-green-700 disabled:bg-green-100" override="class">
|
||||
{{ trans('updates.update', ['version' => $core]) }}
|
||||
</x-link>
|
||||
@@ -109,7 +109,7 @@
|
||||
</x-index.container>
|
||||
|
||||
<akaunting-modal v-if="changelog.show"
|
||||
modal-dialog-class="max-w-screen-2xl"
|
||||
modal-dialog-class="max-w-screen-xl change-log-modal"
|
||||
:show="changelog.show"
|
||||
:title="'{{ trans('updates.changelog') }}'"
|
||||
@cancel="changelog.show = false"
|
||||
|
||||
@@ -28,33 +28,23 @@
|
||||
@php $is_active = true; @endphp
|
||||
|
||||
<x-slot name="navs">
|
||||
<div class="swiper swiper-links w-full">
|
||||
<div class="swiper-wrapper">
|
||||
@foreach ($payment_methods as $key => $name)
|
||||
@stack('invoice_{{ $key }}_tab_start')
|
||||
<div class="swiper-slide">
|
||||
<div data-tabs-swiper class="w-full flex">
|
||||
@foreach ($payment_methods as $key => $name)
|
||||
@stack('invoice_{{ $key }}_tab_start')
|
||||
<div data-tabs-slide>
|
||||
<x-tabs.nav
|
||||
id="{{ $name }}"
|
||||
@click="onChangePaymentMethodSigned('{{ $key }}')"
|
||||
>
|
||||
<div class="w-24 truncate">
|
||||
<div>
|
||||
{{ $name }}
|
||||
</div>
|
||||
</x-tabs.nav>
|
||||
</div>
|
||||
@stack('invoice_{{ $key }}_tab_end')
|
||||
@stack('invoice_{{ $key }}_tab_end')
|
||||
|
||||
@php $is_active = false; @endphp
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
<div class="swiper-button-next top-3 right-0">
|
||||
<span class="material-icons">chevron_right</span>
|
||||
</div>
|
||||
|
||||
<div class="swiper-button-prev top-3 left-0">
|
||||
<span class="material-icons">chevron_left</span>
|
||||
</div>
|
||||
@php $is_active = false; @endphp
|
||||
@endforeach
|
||||
</div>
|
||||
</x-slot>
|
||||
</div>
|
||||
|
||||
@@ -26,33 +26,23 @@
|
||||
@php $is_active = true; @endphp
|
||||
|
||||
<x-slot name="navs">
|
||||
<div class="swiper swiper-links w-full">
|
||||
<div class="swiper-wrapper">
|
||||
@foreach ($payment_methods as $key => $name)
|
||||
@stack('invoice_{{ $key }}_tab_start')
|
||||
<div class="swiper-slide">
|
||||
<x-tabs.nav
|
||||
id="{{ $name }}"
|
||||
@click="onChangePaymentMethod('{{ $key }}')"
|
||||
>
|
||||
<div class="w-24 truncate">
|
||||
{{ $name }}
|
||||
</div>
|
||||
</x-tabs.nav>
|
||||
</div>
|
||||
@stack('invoice_{{ $key }}_tab_end')
|
||||
<div data-tabs-swiper class="w-full flex">
|
||||
@foreach ($payment_methods as $key => $name)
|
||||
@stack('invoice_{{ $key }}_tab_start')
|
||||
<div data-tabs-slide>
|
||||
<x-tabs.nav
|
||||
id="{{ $name }}"
|
||||
@click="onChangePaymentMethod('{{ $key }}')"
|
||||
>
|
||||
<div>
|
||||
{{ $name }}
|
||||
</div>
|
||||
</x-tabs.nav>
|
||||
</div>
|
||||
@stack('invoice_{{ $key }}_tab_end')
|
||||
|
||||
@php $is_active = false; @endphp
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
<div class="swiper-button-next top-3 right-0">
|
||||
<span class="material-icons">chevron_right</span>
|
||||
</div>
|
||||
|
||||
<div class="swiper-button-prev top-3 left-0">
|
||||
<span class="material-icons">chevron_left</span>
|
||||
</div>
|
||||
@php $is_active = false; @endphp
|
||||
@endforeach
|
||||
</div>
|
||||
</x-slot>
|
||||
</div>
|
||||
|
||||
@@ -35,16 +35,15 @@
|
||||
@php $is_active = true; @endphp
|
||||
|
||||
<x-slot name="navs">
|
||||
<div class="swiper swiper-links w-full">
|
||||
<div class="swiper-wrapper">
|
||||
<div data-tabs-swiper class="w-full flex">
|
||||
@foreach ($payment_methods as $key => $name)
|
||||
@stack('invoice_{{ $key }}_tab_start')
|
||||
<div class="swiper-slide">
|
||||
<div data-tabs-slide>
|
||||
<x-tabs.nav
|
||||
id="{{ $name }}"
|
||||
@click="onChangePaymentMethodSigned('{{ $key }}')"
|
||||
>
|
||||
<div class="w-24 truncate">
|
||||
<div>
|
||||
{{ $name }}
|
||||
</div>
|
||||
</x-tabs.nav>
|
||||
@@ -53,15 +52,6 @@
|
||||
|
||||
@php $is_active = false; @endphp
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
<div class="swiper-button-next top-3 right-0">
|
||||
<span class="material-icons">chevron_right</span>
|
||||
</div>
|
||||
|
||||
<div class="swiper-button-prev top-3 left-0">
|
||||
<span class="material-icons">chevron_left</span>
|
||||
</div>
|
||||
</div>
|
||||
</x-slot>
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<div class="overflow-x-scroll large-overflow-unset my-8">
|
||||
<table class="small-table-width rp-border-collapse">
|
||||
<div class="overflow-x-visible my-8">
|
||||
<table class="w-full rp-border-collapse">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="{{ $class->column_name_width }} w-24 print-alignment"> </th>
|
||||
|
||||
Reference in New Issue
Block a user