Merge branch 'master' of https://github.com/brkcvn/akaunting into code-clean
This commit is contained in:
commit
e6f766e0a6
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -12,6 +12,7 @@
|
|||||||
# Denote all files that are truly binary and should not be modified.
|
# Denote all files that are truly binary and should not be modified.
|
||||||
*.png binary
|
*.png binary
|
||||||
*.jpg binary
|
*.jpg binary
|
||||||
|
*.gif binary
|
||||||
*.otf binary
|
*.otf binary
|
||||||
*.eot binary
|
*.eot binary
|
||||||
*.svg binary
|
*.svg binary
|
||||||
|
356076
public/css/app.css
vendored
356076
public/css/app.css
vendored
File diff suppressed because it is too large
Load Diff
27
public/css/print.css
vendored
27
public/css/print.css
vendored
@ -25,10 +25,14 @@ th, td
|
|||||||
margin-bottom: 9px;
|
margin-bottom: 9px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.right-column {
|
html[dir='ltr'] .right-column {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
html[dir='rtl'] .right-column {
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
.small-text {
|
.small-text {
|
||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
}
|
}
|
||||||
@ -239,16 +243,26 @@ html[dir='rtl'] .border-radius-last {
|
|||||||
border-radius: 10px 0px 0px 10px;
|
border-radius: 10px 0px 0px 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.float-left
|
html[dir='ltr'] .float-left
|
||||||
{
|
{
|
||||||
float: left !important;
|
float: left !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.float-right
|
html[dir='rtl'] .float-left
|
||||||
{
|
{
|
||||||
float: right !important;
|
float: right !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
html[dir='ltr'] .float-right
|
||||||
|
{
|
||||||
|
float: right !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[dir='rtl'] .float-right
|
||||||
|
{
|
||||||
|
float: left !important;
|
||||||
|
}
|
||||||
|
|
||||||
.font-size-unset
|
.font-size-unset
|
||||||
{
|
{
|
||||||
font-size: unset;
|
font-size: unset;
|
||||||
@ -291,11 +305,16 @@ html[dir='rtl'] .text-alignment-right {
|
|||||||
text-align: left !important;
|
text-align: left !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.text-right
|
html[dir='ltr'] .text-right
|
||||||
{
|
{
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
html[dir='rtl'] .text-right
|
||||||
|
{
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
.text-center
|
.text-center
|
||||||
{
|
{
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 102 KiB After Width: | Height: | Size: 102 KiB |
5
resources/assets/js/mixins/global.js
vendored
5
resources/assets/js/mixins/global.js
vendored
@ -87,7 +87,6 @@ export default {
|
|||||||
"thousands_separator":",",
|
"thousands_separator":",",
|
||||||
},
|
},
|
||||||
all_currencies: [],
|
all_currencies: [],
|
||||||
content_loading: true,
|
|
||||||
connect: {
|
connect: {
|
||||||
show: false,
|
show: false,
|
||||||
currency: {},
|
currency: {},
|
||||||
@ -111,10 +110,6 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
mounted() {
|
mounted() {
|
||||||
setTimeout(() => {
|
|
||||||
this.content_loading = false;
|
|
||||||
}, 1500);
|
|
||||||
|
|
||||||
this.checkNotify();
|
this.checkNotify();
|
||||||
|
|
||||||
GLightbox({
|
GLightbox({
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
<div data-absolute-loading-content v-if="content_loading" class="absolute w-full lg:flex items-start justify-center bg-body top-0 bottom-0 left-0 right-0 z-50">
|
<div data-absolute-loading-content class="absolute w-full lg:flex items-start justify-center bg-body top-0 bottom-0 left-0 right-0 z-50">
|
||||||
<img src="{{ asset('public/img/akaunting-loading.gif') }}" class="w-28 h-28" alt="Akaunting" />
|
<img src="{{ asset('public/img/akaunting-loading.gif') }}" class="w-28 h-28" alt="Akaunting" />
|
||||||
</div>
|
</div>
|
||||||
<!--data attr added because for none vue.js pages-->
|
<!--data attr added because for none vue.js pages-->
|
@ -1,4 +1,4 @@
|
|||||||
<div data-loading-content v-if="content_loading" class="fixed w-full lg:w-4/5 h-screen flex items-center justify-center bg-body top-0 bottom-0 ltr:right-0 rtl:left-0 -mx-1 z-50">
|
<div data-loading-content class="fixed w-full lg:w-4/5 h-screen flex items-center justify-center bg-body top-0 bottom-0 ltr:right-0 rtl:left-0 -mx-1 z-50">
|
||||||
<img src="{{ asset('public/img/akaunting-loading.gif') }}" class="w-28 h-28 lg:-mt-16" alt="Akaunting" />
|
<img src="{{ asset('public/img/akaunting-loading.gif') }}" class="w-28 h-28 lg:-mt-16" alt="Akaunting" />
|
||||||
</div>
|
</div>
|
||||||
<!--data attr added because for none vue.js pages-->
|
<!--data attr added because for none vue.js pages-->
|
||||||
|
@ -86,7 +86,7 @@
|
|||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
loading_menu_html[0].remove();
|
loading_menu_html[0].remove();
|
||||||
menu_html.classList.remove('hidden');
|
menu_html.classList.remove('hidden');
|
||||||
}, 800);
|
}, timer);
|
||||||
|
|
||||||
if (loading_html.length) {
|
if (loading_html.length) {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
@else
|
@else
|
||||||
<span class="material-icons text-base">attach_file</span>
|
<span class="material-icons text-base">attach_file</span>
|
||||||
@endif
|
@endif
|
||||||
<div class="flex flex-col text-gray-500 ml-3 gap-y-1">
|
<div class="flex flex-col text-gray-500 ltr:ml-3 rtl:mr-3 gap-y-1">
|
||||||
<span class="w-64 text-sm truncate">{{ $file->basename }}</span>
|
<span class="w-64 text-sm truncate">{{ $file->basename }}</span>
|
||||||
<span class="text-xs mb-0">{{ $file->readableSize() }}</span>
|
<span class="text-xs mb-0">{{ $file->readableSize() }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
<div>
|
<div class="ltr:text-left rtl:text-right">
|
||||||
<h2 class="lg:text-lg font-medium text-black">
|
<h2 class="lg:text-lg font-medium text-black">
|
||||||
<x-button.hover group-hover>
|
<x-button.hover group-hover>
|
||||||
{{ $title }}
|
{{ $title }}
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<div class="relative w-full text-left cursor-pointer group" x-on:click="{{ $type }} !== 'open' ? {{ $type }} = 'open' : {{ $type }} = 'close'">
|
<div class="relative w-full text-left cursor-pointer group" x-on:click="{{ $type }} !== 'open' ? {{ $type }} = 'open' : {{ $type }} = 'close'">
|
||||||
{!! $head !!}
|
{!! $head !!}
|
||||||
|
|
||||||
<x-icon filled class="absolute right-0 top-0 transition-all transform" :icon="$icon" x-bind:class="{{ $type }} === 'open' ? 'rotate-180' : ''" />
|
<x-icon filled class="absolute ltr:right-0 rtl:left-0 top-0 transition-all transform" :icon="$icon" x-bind:class="{{ $type }} === 'open' ? 'rotate-180' : ''" />
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<div class="border-b border-gray-200 pb-4"
|
<div class="border-b border-gray-200 pb-4"
|
||||||
x-data="{ attachment : null }"
|
x-data="{ attachment : null }"
|
||||||
>
|
>
|
||||||
<div class="relative w-full text-left cursor-pointer group"
|
<div class="relative w-full ltr:text-left rtl:text-right cursor-pointer group"
|
||||||
x-on:click="attachment !== 1 ? attachment = 1 : attachment = null"
|
x-on:click="attachment !== 1 ? attachment = 1 : attachment = null"
|
||||||
>
|
>
|
||||||
<span class="font-medium">
|
<span class="font-medium">
|
||||||
@ -15,7 +15,7 @@
|
|||||||
{{ trans('transactions.slider.attachments') }}
|
{{ trans('transactions.slider.attachments') }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<span class="material-icons absolute right-0 top-0 transition-all transform" x-bind:class="attachment === 1 ? 'rotate-180' : ''">expand_more</span>
|
<span class="material-icons absolute ltr:right-0 rtl:left-0 top-0 transition-all transform" x-bind:class="attachment === 1 ? 'rotate-180' : ''">expand_more</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="overflow-hidden transition-transform origin-top-left ease-linear duration-100"
|
<div class="overflow-hidden transition-transform origin-top-left ease-linear duration-100"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<div class="border-b pb-4" x-data="{ children : null }">
|
<div class="border-b pb-4" x-data="{ children : null }">
|
||||||
<button class="relative w-full text-left cursor-pointer group"
|
<button class="relative w-full ltr:text-left rtl:text-right cursor-pointer group"
|
||||||
x-on:click="children !== 1 ? children = 1 : children = null"
|
x-on:click="children !== 1 ? children = 1 : children = null"
|
||||||
>
|
>
|
||||||
<span class="font-medium">
|
<span class="font-medium">
|
||||||
@ -12,7 +12,7 @@
|
|||||||
{!! trans('transactions.slider.children', ['count' => $transaction->children()->count()]) !!}
|
{!! trans('transactions.slider.children', ['count' => $transaction->children()->count()]) !!}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<span class="material-icons absolute right-0 top-0 transition-all transform"
|
<span class="material-icons absolute ltr:right-0 rtl:left-0 top-0 transition-all transform"
|
||||||
x-bind:class="children === 1 ? 'rotate-180' : ''"
|
x-bind:class="children === 1 ? 'rotate-180' : ''"
|
||||||
>expand_more</span>
|
>expand_more</span>
|
||||||
</button>
|
</button>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
@php $created_date = '<span class="font-medium">' . company_date($transaction->created_at) . '</span>' @endphp
|
@php $created_date = '<span class="font-medium">' . company_date($transaction->created_at) . '</span>' @endphp
|
||||||
|
|
||||||
<div class="border-b pb-4" x-data="{ create : null }">
|
<div class="border-b pb-4" x-data="{ create : null }">
|
||||||
<button class="relative w-full text-left group"
|
<button class="relative w-full ltr:text-left rtl:text-right group"
|
||||||
x-on:click="create !== 1 ? create = 1 : create = null"
|
x-on:click="create !== 1 ? create = 1 : create = null"
|
||||||
>
|
>
|
||||||
<span class="font-medium">
|
<span class="font-medium">
|
||||||
@ -18,21 +18,23 @@
|
|||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<span class="material-icons absolute right-0 top-0 transition-all transform" x-bind:class="create === 1 ? 'rotate-180' : ''">expand_more</span>
|
<span class="material-icons absolute ltr:right-0 rtl:left-0 top-0 transition-all transform" x-bind:class="create === 1 ? 'rotate-180' : ''">expand_more</span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<div class="overflow-hidden transition-transform origin-top-left ease-linear duration-100"
|
<div class="overflow-hidden transition-transform origin-top-left ease-linear duration-100"
|
||||||
x-ref="container1"
|
x-ref="container1"
|
||||||
x-bind:class="create == 1 ? 'h-auto ' : 'scale-y-0 h-0'"
|
x-bind:class="create == 1 ? 'h-auto ' : 'scale-y-0 h-0'"
|
||||||
>
|
>
|
||||||
<div class="flex my-3 space-x-2 rtl:space-x-reverse">
|
@if ($transaction->isNotTransferTransaction())
|
||||||
<x-link
|
<div class="flex my-3 space-x-2 rtl:space-x-reverse">
|
||||||
href="{{ route($routeButtonEdit, [$transaction->id, 'type' => $transaction->type]) }}"
|
<x-link
|
||||||
class="px-3 py-1.5 mb-3 sm:mb-0 bg-gray-100 hover:bg-gray-200 rounded-xl text-purple text-xs font-bold leading-6"
|
href="{{ route($routeButtonEdit, [$transaction->id, 'type' => $transaction->type]) }}"
|
||||||
override="class"
|
class="px-3 py-1.5 mb-3 sm:mb-0 bg-gray-100 hover:bg-gray-200 rounded-xl text-purple text-xs font-bold leading-6"
|
||||||
>
|
override="class"
|
||||||
{{ trans('general.edit') }}
|
>
|
||||||
</x-link>
|
{{ trans('general.edit') }}
|
||||||
</div>
|
</x-link>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
@endphp
|
@endphp
|
||||||
|
|
||||||
<div class="border-b pb-4" x-data="{ schedule : null }">
|
<div class="border-b pb-4" x-data="{ schedule : null }">
|
||||||
<button class="relative w-full text-left cursor-pointer group"
|
<button class="relative w-full ltr:text-left rtl:text-right cursor-pointer group"
|
||||||
x-on:click="schedule !== 1 ? schedule = 1 : schedule = null"
|
x-on:click="schedule !== 1 ? schedule = 1 : schedule = null"
|
||||||
>
|
>
|
||||||
<span class="font-medium">
|
<span class="font-medium">
|
||||||
@ -17,7 +17,7 @@
|
|||||||
{!! trans('transactions.slider.schedule', ['frequency' => $frequency, 'interval' => $transaction->recurring->interval, 'date' => $started_date]) !!}
|
{!! trans('transactions.slider.schedule', ['frequency' => $frequency, 'interval' => $transaction->recurring->interval, 'date' => $started_date]) !!}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<span class="material-icons absolute right-0 top-0 transition-all transform" x-bind:class="schedule === 1 ? 'rotate-180' : ''">expand_more</span>
|
<span class="material-icons absolute ltr:right-0 rtl:left-0 top-0 transition-all transform" x-bind:class="schedule === 1 ? 'rotate-180' : ''">expand_more</span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<div class="overflow-hidden transition-transform origin-top-left ease-linear duration-100"
|
<div class="overflow-hidden transition-transform origin-top-left ease-linear duration-100"
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
@endif
|
@endif
|
||||||
|
|
||||||
<div class="border-b pb-4" x-data="{ transfer : 1 }">
|
<div class="border-b pb-4" x-data="{ transfer : 1 }">
|
||||||
<button class="relative w-full text-left cursor-pointer group"
|
<button class="relative w-full ltr:text-left rtl:text-right cursor-pointer group"
|
||||||
x-on:click="transfer !== 1 ? transfer = 1 : transfer = null"
|
x-on:click="transfer !== 1 ? transfer = 1 : transfer = null"
|
||||||
>
|
>
|
||||||
<span class="font-medium border-b border-transparent transition-all group-hover:border-black">
|
<span class="font-medium border-b border-transparent transition-all group-hover:border-black">
|
||||||
@ -23,7 +23,7 @@
|
|||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
<span class="material-icons absolute right-0 top-0 transition-all transform"
|
<span class="material-icons absolute ltr:right-0 rtl:left-0 top-0 transition-all transform"
|
||||||
x-bind:class="transfer === 1 ? 'rotate-180' : ''"
|
x-bind:class="transfer === 1 ? 'rotate-180' : ''"
|
||||||
>expand_more</span>
|
>expand_more</span>
|
||||||
</button>
|
</button>
|
||||||
@ -38,7 +38,7 @@
|
|||||||
</div>
|
</div>
|
||||||
@else
|
@else
|
||||||
<div class="mt-2">
|
<div class="mt-2">
|
||||||
<div class="alert alert-notify p-4 text-black font-bold rounded-lg bg-orange-100 text-orange-600">
|
<div class="alert alert-notify p-4 font-bold rounded-lg bg-orange-100 text-orange-600">
|
||||||
<span class="alert-text">
|
<span class="alert-text">
|
||||||
<span>{{ trans('messages.warning.missing_transfer') }}</span>
|
<span>{{ trans('messages.warning.missing_transfer') }}</span>
|
||||||
</span>
|
</span>
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
<div role="tablist" class="flex flex-wrap">
|
<div role="tablist" class="flex flex-wrap">
|
||||||
@php $is_active = true; @endphp
|
@php $is_active = true; @endphp
|
||||||
|
|
||||||
<div class="swiper swiper-links">
|
<div class="swiper swiper-links w-full">
|
||||||
<div class="swiper-wrapper">
|
<div class="swiper-wrapper">
|
||||||
@foreach ($payment_methods as $key => $name)
|
@foreach ($payment_methods as $key => $name)
|
||||||
@stack('invoice_{{ $key }}_tab_start')
|
@stack('invoice_{{ $key }}_tab_start')
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
<div role="tablist" class="flex flex-wrap gap-y-4">
|
<div role="tablist" class="flex flex-wrap gap-y-4">
|
||||||
@php $is_active = true; @endphp
|
@php $is_active = true; @endphp
|
||||||
|
|
||||||
<div class="swiper swiper-links">
|
<div class="swiper swiper-links w-full">
|
||||||
<div class="swiper-wrapper">
|
<div class="swiper-wrapper">
|
||||||
@foreach ($payment_methods as $key => $name)
|
@foreach ($payment_methods as $key => $name)
|
||||||
@stack('invoice_{{ $key }}_tab_start')
|
@stack('invoice_{{ $key }}_tab_start')
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
<div role="tablist" class="flex flex-wrap">
|
<div role="tablist" class="flex flex-wrap">
|
||||||
@php $is_active = true; @endphp
|
@php $is_active = true; @endphp
|
||||||
|
|
||||||
<div class="swiper swiper-links">
|
<div class="swiper swiper-links w-full">
|
||||||
<div class="swiper-wrapper">
|
<div class="swiper-wrapper">
|
||||||
@foreach ($payment_methods as $key => $name)
|
@foreach ($payment_methods as $key => $name)
|
||||||
@stack('invoice_{{ $key }}_tab_start')
|
@stack('invoice_{{ $key }}_tab_start')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user