Merge branch 'master' of https://github.com/brkcvn/akaunting into form-elements
This commit is contained in:
21
resources/views/components/button/loading.blade.php
Normal file
21
resources/views/components/button/loading.blade.php
Normal file
@ -0,0 +1,21 @@
|
||||
@props(['action'])
|
||||
@php
|
||||
if (empty($action)) {
|
||||
$action = 'form.loading';
|
||||
}
|
||||
@endphp
|
||||
|
||||
<i
|
||||
@class([
|
||||
'animate-submit delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-3.5 m-auto',
|
||||
'before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit before:delay-[0.14s]',
|
||||
'after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit before:-left-3.5 after:-right-3.5 after:delay-[0.42s]'
|
||||
])
|
||||
{{ $attributes }}
|
||||
v-if="{{ $action }}"
|
||||
>
|
||||
</i>
|
||||
|
||||
<span :class="[{'opacity-0': {{ $action }}}]">
|
||||
{!! $slot !!}
|
||||
</span>
|
@ -295,6 +295,27 @@
|
||||
:dynamic-options="dynamic_taxes"
|
||||
:disabled-options="form.items[index].tax_ids"
|
||||
:value="row_tax.id"
|
||||
:add-new="{{ json_encode([
|
||||
'status' => true,
|
||||
'text' => trans('general.title.new', ['type' => trans_choice('general.taxes', 1)]),
|
||||
'path' => route('modals.taxes.create'),
|
||||
'type' => 'modal',
|
||||
'field' => [
|
||||
'key' => 'id',
|
||||
'value' => 'title'
|
||||
],
|
||||
'new_text' => trans('modules.new'),
|
||||
'buttons' => [
|
||||
'cancel' => [
|
||||
'text' => trans('general.cancel'),
|
||||
'class' => 'btn-outline-secondary'
|
||||
],
|
||||
'confirm' => [
|
||||
'text' => trans('general.save'),
|
||||
'class' => 'disabled:bg-green-100'
|
||||
]
|
||||
]
|
||||
])}}"
|
||||
@interface="row_tax.id = $event"
|
||||
@change="onCalculateTotal()"
|
||||
@new="dynamic_taxes.push($event)"
|
||||
|
@ -182,6 +182,13 @@
|
||||
selected="{{ $currency->code }}"
|
||||
change="onChangeCurrency"
|
||||
model="form.currency_code"
|
||||
add-new
|
||||
add-new-text="{!! trans('general.title.new', ['type' => trans_choice('general.currencies', 1)]) !!}"
|
||||
:path="route('modals.currencies.create')"
|
||||
:field="[
|
||||
'key' => 'code',
|
||||
'value' => 'name'
|
||||
]"
|
||||
form-group-class="h-8 -mt-2"
|
||||
/>
|
||||
|
||||
|
@ -17,10 +17,9 @@
|
||||
::disabled="form.loading"
|
||||
override="class"
|
||||
>
|
||||
<i v-if="form.loading" class="animate-submit delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-3.5 m-auto before:absolute before:w-2 before:h-2 before:-left-3.5 before:rounded-full before:animate-submit before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:-right-3.5 after:rounded-full after:animate-submit after:delay-[0.42s]"></i>
|
||||
<span :class="[{'opacity-0': form.loading}]">
|
||||
<x-button.loading>
|
||||
{{ trans('general.save') }}
|
||||
</span>
|
||||
</x-button.loading>
|
||||
</x-button>
|
||||
</div>
|
||||
@stack('save_buttons_end')
|
||||
|
@ -70,7 +70,7 @@
|
||||
@if (! empty($addNew))
|
||||
:add-new="{{ json_encode([
|
||||
'status' => true,
|
||||
'text' => trans('general.title.new', ['type' => $label ?? '']),
|
||||
'text' => isset($attributes['add-new-text']) ? $attributes['add-new-text'] : trans('general.title.new', ['type' => $label ?? '']),
|
||||
'path' => isset($attributes['path']) ? $attributes['path']: false,
|
||||
'type' => isset($attributes['type']) ? $attributes['type'] : 'modal',
|
||||
'field' => [
|
||||
|
@ -19,12 +19,11 @@
|
||||
id="releases-load-more"
|
||||
:disabled="loadMoreLoading"
|
||||
@click="onModuleLoadMore('releases')"
|
||||
class="w-48 bg-green m-auto block whitespace-nowrap px-4 py-2 border border-transparent rounded-md shadow-sm text-base font-medium text-white text-center js-learn-more js-button-modal-submit hover:bg-green-700 disabled:bg-green-300"
|
||||
class="relative w-48 bg-green m-auto block whitespace-nowrap px-4 py-2 border border-transparent rounded-md shadow-sm text-base font-medium text-white text-center js-learn-more js-button-modal-submit hover:bg-green-700 disabled:bg-green-300"
|
||||
>
|
||||
<i v-if="loadMoreLoading" class="animate-submit delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-3.5 m-auto before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit before:-left-3.5 after:-right-3.5 after:delay-[0.42s]"></i>
|
||||
<span :class="[{'opacity-0': loadMoreLoading}]">
|
||||
<x-button.loading action="loadMoreLoading">
|
||||
{{ trans('modules.see_more') }}
|
||||
</span>
|
||||
</x-button.loading>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
|
@ -19,12 +19,11 @@
|
||||
id="review-load-more"
|
||||
:disabled="loadMoreLoading"
|
||||
@click="onModuleLoadMore('reviews')"
|
||||
class="w-48 bg-green m-auto block whitespace-nowrap px-4 py-2 border border-transparent rounded-md shadow-sm text-base font-medium text-white text-center js-learn-more js-button-modal-submit hover:bg-green-700 disabled:bg-green-300"
|
||||
class="relative w-48 bg-green m-auto block whitespace-nowrap px-4 py-2 border border-transparent rounded-md shadow-sm text-base font-medium text-white text-center js-learn-more js-button-modal-submit hover:bg-green-700 disabled:bg-green-300"
|
||||
>
|
||||
<i v-if="loadMoreLoading" class="animate-submit delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-3.5 m-auto before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit before:-left-3.5 after:-right-3.5 after:delay-[0.42s]"></i>
|
||||
<span :class="[{'opacity-0': loadMoreLoading}]">
|
||||
<x-button.loading action="loadMoreLoading">
|
||||
{{ trans('modules.see_more') }}
|
||||
</span>
|
||||
</x-button.loading>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
|
@ -30,14 +30,16 @@
|
||||
|
||||
@if ($seeMore)
|
||||
<div class="flex items-center mt-10">
|
||||
<button type="button" id="button-pre-load" @click="onloadMore"
|
||||
<button
|
||||
type="button"
|
||||
id="button-pre-load"
|
||||
@click="onloadMore"
|
||||
:disabled="loadMoreLoading"
|
||||
class="w-48 m-auto 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 js-learn-more js-button-modal-submit"
|
||||
class="relative w-48 m-auto 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 js-learn-more js-button-modal-submit"
|
||||
>
|
||||
<i v-if="loadMoreLoading" class="animate-submit delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-3.5 m-auto before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit before:-left-3.5 after:-right-3.5 after:delay-[0.42s]"></i>
|
||||
<span :class="[{'opacity-0': loadMoreLoading}]">
|
||||
<x-button.loading action="loadMoreLoading">
|
||||
{{ trans('modules.see_more') }}
|
||||
</span>
|
||||
</x-button.loading>
|
||||
</button>
|
||||
|
||||
<x-form.input.hidden name="see_more_path" value="{{ route('apps.load-more', ['type' => $type]) }}" />
|
||||
|
@ -12,7 +12,9 @@
|
||||
|
||||
<x-dropdown id="dropdown-widget-{{ $class->model->id }}">
|
||||
<x-slot name="trigger" class="flex" override="class">
|
||||
<span id="dashboard-widget-more-actions" class="material-icons cursor-pointer text-purple hover:bg-gray-100 hover:rounded-lg hover:shadow-md">more_vert</span>
|
||||
<span id="dashboard-widget-more-actions" class="w-8 h-8 flex items-center justify-center px-2 py-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>
|
||||
|
||||
@can('update-common-widgets')
|
||||
|
Reference in New Issue
Block a user