shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2748 from brkcvn/master

Browse Source 
Front-end developments
This commit is contained in:
Burak Civan
2022-11-17 12:27:27 +03:00
committed by GitHub
parent 270dfb42bd 239de33404
commit f7460773ee
11 changed files with 185 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/akaunting-js/generalAction.js vendored
View File

@ -29,6 +29,9 @@ document.querySelectorAll("[data-table-body]").forEach((table) => {
let td_item = td[i]; let td_item = td[i];
td_item.addEventListener("click", (event) => { td_item.addEventListener("click", (event) => {
if (document.body.clientWidth < 768 && event.target.closest('[overflow-x-hidden]')) {
return;
}
// click disabled when preview dialog is open // click disabled when preview dialog is open
if (event.target.closest('[data-tooltip-target]')) { if (event.target.closest('[data-tooltip-target]')) {
return; return;
@ -436,6 +439,7 @@ function marqueeAnimation(truncate) {
//there is overflow class for the animation does not overflow the width //there is overflow class for the animation does not overflow the width
truncate.parentElement.parentElement.classList.add('overflow-x-hidden'); truncate.parentElement.parentElement.classList.add('overflow-x-hidden');
truncate.parentElement.parentElement.setAttribute('overflow-x-hidden', true);
} }
} }

10
public/css/app.css vendored
View File

@ -53686,6 +53686,16 @@ table thead a:hover{
padding-right: 8px !important; padding-right: 8px !important;
} }
.el-select-dropdown__item .new-badge {
width: 45px !important;
margin-left: 8px;
z-index: 99;
}
.el-select-dropdown__item .new-badge:hover {
background-color: #6ea152;
}
.el-select-dropdown__item .material-icons { .el-select-dropdown__item .material-icons {
padding-right: 0 !important; padding-right: 0 !important;
padding-left: 0 !important; padding-left: 0 !important;

10
resources/assets/sass/app.css vendored
View File

@ -308,6 +308,16 @@
padding-right: 8px !important; padding-right: 8px !important;
} }
.el-select-dropdown__item .new-badge {
width: 45px !important;
margin-left: 8px;
z-index: 99;
}
.el-select-dropdown__item .new-badge:hover {
background-color: #6ea152;
}
.el-select-dropdown__item .material-icons { .el-select-dropdown__item .material-icons {
padding-right: 0 !important; padding-right: 0 !important;
padding-left: 0 !important; padding-left: 0 !important;

4
resources/views/banking/accounts/show.blade.php
View File

@ -4,7 +4,9 @@
</x-slot> </x-slot>
<x-slot name="info"> <x-slot name="info">
<div class="mt-3"> <div class="mt-4">
<x-index.default text="{{ trans('accounts.default_account') }}" />
@if (! $account->enabled) @if (! $account->enabled)
<x-index.disable text="{{ trans_choice('general.accounts', 1) }}" /> <x-index.disable text="{{ trans_choice('general.accounts', 1) }}" />
@endif @endif

2
resources/views/components/layouts/admin/header.blade.php
View File

@ -13,7 +13,7 @@
</h1> </h1>
@if (! empty($status)) @if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4"> <div class="ltr:ml-4 rtl:mr-4 mt-2">
{!! $status !!} {!! $status !!}
</div> </div>
@endif @endif

2
resources/views/components/layouts/portal/header.blade.php
View File

@ -13,7 +13,7 @@
</h1> </h1>
@if (! empty($status)) @if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4"> <div class="ltr:ml-4 rtl:mr-4 mt-2">
{!! $status !!} {!! $status !!}
</div> </div>
@endif @endif

2
resources/views/components/layouts/preview/header.blade.php
View File

@ -13,7 +13,7 @@
</h1> </h1>
@if (! empty($status)) @if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4"> <div class="ltr:ml-4 rtl:mr-4 mt-2">
{!! $status !!} {!! $status !!}
</div> </div>
@endif @endif

2
resources/views/components/layouts/signed/header.blade.php
View File

@ -13,7 +13,7 @@
</h1> </h1>
@if (! empty($status)) @if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4"> <div class="ltr:ml-4 rtl:mr-4 mt-2">
{!! $status !!} {!! $status !!}
</div> </div>
@endif @endif

105
resources/views/portal/invoices/preview.blade.php
View File

@ -23,72 +23,69 @@
<div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-12 lg:space-y-0"> <div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-12 lg:space-y-0">
<div class="w-full lg:w-5/12"> <div class="w-full lg:w-5/12">
@if (! empty($payment_methods) && ! in_array($invoice->status, ['paid', 'cancelled'])) @if (! empty($payment_methods) && ! in_array($invoice->status, ['paid', 'cancelled']))
<x-tabs active="{{ reset($payment_methods) }}"> <div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }">
<div role="tablist" class="flex flex-wrap"> <div role="tablist" class="flex flex-wrap">
@php $is_active = true; @endphp @php $is_active = true; @endphp
<x-slot name="navs"> <div class="{{ count($payment_methods) > 3 ? 'swiper swiper-links': 'w-full flex' }}">
<div class="w-full flex {{ count($payment_methods) > 3 ? 'swiper swiper-links': 'w-full flex' }}"> <div class="{{ count($payment_methods) > 3 ? 'swiper-wrapper' : 'inline-flex' }}">
<div class="{{ count($payment_methods) > 3 ? 'swiper-wrapper' : 'w-full flex' }}"> @foreach ($payment_methods as $key => $name)
@foreach ($payment_methods as $key => $name) @stack('invoice_{{ $key }}_tab_start')
@stack('invoice_{{ $key }}_tab_start') <div
<div class="{{ count($payment_methods) > 3 ? 'swiper-slide': '' }}"> x-on:click="active = '{{ $name }}'"
<x-tabs.nav @click="onChangePaymentMethodSigned('{{ $key }}')"
id="{{ $name }}" id="tabs-payment-method-{{ $key }}-tab"
@click="onChangePaymentMethodSigned('{{ $key }}')" x-bind:class="active != '{{ $name }}' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
> class="relative px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b whitespace-nowrap tabs-link {{ count($payment_methods) > 3 ? 'swiper-slide': '' }}"
<div> >
{{ $name }} {{ $name }}
</div> </div>
</x-tabs.nav> @stack('invoice_{{ $key }}_tab_end')
</div>
@stack('invoice_{{ $key }}_tab_end')
@php $is_active = false; @endphp @php $is_active = false; @endphp
@endforeach @endforeach
</div>
@if (count($payment_methods) > 3)
<div class="swiper-button-next bg-body text-white flex items-center justify-center right-0 top-3">
<span class="material-icons text-purple text-4xl">chevron_right</span>
</div> </div>
@if (count($payment_methods) > 3) <div class="swiper-button-prev bg-body text-white flex items-center justify-center left-0 top-3">
<div class="swiper-button-next top-3 right-0"> <span class="material-icons text-purple text-4xl">chevron_left</span>
<span class="material-icons">chevron_right</span> </div>
</div> @endif
</div>
<div class="swiper-button-prev top-3 left-0">
<span class="material-icons">chevron_left</span>
</div>
@endif
</div>
</x-slot>
</div> </div>
@php $is_active = true; @endphp @php $is_active = true; @endphp
<x-slot name="content"> @foreach ($payment_methods as $key => $name)
@foreach ($payment_methods as $key => $name) @stack('invoice_{{ $key }}_content_start')
@stack('invoice_{{ $key }}_content_start') <div
<x-tabs.tab id="{{ $name }}"> x-bind:class="active != '{{ $name }}' ? 'hidden': 'block'"
<div class="my-3"> class="my-3"
<component v-bind:is="method_show_html" @interface="onRedirectConfirm"></component> id="tabs-payment-method-{{ $key }}"
</div> >
</x-tabs.tab> <component v-bind:is="method_show_html" @interface="onRedirectConfirm"></component>
@stack('invoice_{{ $key }}_content_end') </div>
@stack('invoice_{{ $key }}_content_end')
@php $is_active = false; @endphp @php $is_active = false; @endphp
@endforeach @endforeach
<x-form id="portal"> <x-form id="portal">
<x-form.group.payment-method <x-form.group.payment-method
id="payment-method" id="payment-method"
:selected="array_key_first($payment_methods)" :selected="array_key_first($payment_methods)"
not-required not-required
form-group-class="invisible" form-group-class="invisible"
placeholder="{{ trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)]) }}" placeholder="{{ trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)]) }}"
change="onChangePaymentMethodSigned('{{ array_key_first($payment_methods) }}')" change="onChangePaymentMethodSigned('{{ array_key_first($payment_methods) }}')"
/> />
<x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" /> <x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" />
</x-form> </x-form>
</x-slot> </div>
</x-tabs>
@endif @endif
@if ($invoice->transactions->count()) @if ($invoice->transactions->count())

105
resources/views/portal/invoices/show.blade.php
View File

@ -21,72 +21,69 @@
<div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-12 lg:space-y-0"> <div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-12 lg:space-y-0">
<div class="w-full lg:w-5/12"> <div class="w-full lg:w-5/12">
@if (! empty($payment_methods) && ! in_array($invoice->status, ['paid', 'cancelled'])) @if (! empty($payment_methods) && ! in_array($invoice->status, ['paid', 'cancelled']))
<x-tabs active="{{ reset($payment_methods) }}"> <div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }">
<div role="tablist" class="flex flex-wrap"> <div role="tablist" class="flex flex-wrap">
@php $is_active = true; @endphp @php $is_active = true; @endphp
<x-slot name="navs"> <div class="{{ count($payment_methods) > 3 ? 'swiper swiper-links': 'w-full flex' }}">
<div class="w-full flex {{ count($payment_methods) > 3 ? 'swiper swiper-links': 'w-full flex' }}"> <div class="{{ count($payment_methods) > 3 ? 'swiper-wrapper' : 'inline-flex' }}">
<div class="{{ count($payment_methods) > 3 ? 'swiper-wrapper' : 'w-full flex' }}"> @foreach ($payment_methods as $key => $name)
@foreach ($payment_methods as $key => $name) @stack('invoice_{{ $key }}_tab_start')
@stack('invoice_{{ $key }}_tab_start') <div
<div class="{{ count($payment_methods) > 3 ? 'swiper-slide': '' }}"> x-on:click="active = '{{ $name }}'"
<x-tabs.nav @click="onChangePaymentMethodSigned('{{ $key }}')"
id="{{ $name }}" id="tabs-payment-method-{{ $key }}-tab"
@click="onChangePaymentMethodSigned('{{ $key }}')" x-bind:class="active != '{{ $name }}' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
> class="relative px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b whitespace-nowrap tabs-link {{ count($payment_methods) > 3 ? 'swiper-slide': '' }}"
<div> >
{{ $name }} {{ $name }}
</div> </div>
</x-tabs.nav> @stack('invoice_{{ $key }}_tab_end')
</div>
@stack('invoice_{{ $key }}_tab_end')
@php $is_active = false; @endphp @php $is_active = false; @endphp
@endforeach @endforeach
</div>
@if (count($payment_methods) > 3)
<div class="swiper-button-next bg-body text-white flex items-center justify-center right-0 top-3">
<span class="material-icons text-purple text-4xl">chevron_right</span>
</div> </div>
@if (count($payment_methods) > 3) <div class="swiper-button-prev bg-body text-white flex items-center justify-center left-0 top-3">
<div class="swiper-button-next top-3 right-0"> <span class="material-icons text-purple text-4xl">chevron_left</span>
<span class="material-icons">chevron_right</span> </div>
</div> @endif
</div>
<div class="swiper-button-prev top-3 left-0">
<span class="material-icons">chevron_left</span>
</div>
@endif
</div>
</x-slot>
</div> </div>
@php $is_active = true; @endphp @php $is_active = true; @endphp
<x-slot name="content"> @foreach ($payment_methods as $key => $name)
@foreach ($payment_methods as $key => $name) @stack('invoice_{{ $key }}_content_start')
@stack('invoice_{{ $key }}_content_start') <div
<x-tabs.tab id="{{ $name }}"> x-bind:class="active != '{{ $name }}' ? 'hidden': 'block'"
<div class="my-3"> class="my-3"
<component v-bind:is="method_show_html" @interface="onRedirectConfirm"></component> id="tabs-payment-method-{{ $key }}"
</div> >
</x-tabs.tab> <component v-bind:is="method_show_html" @interface="onRedirectConfirm"></component>
@stack('invoice_{{ $key }}_content_end') </div>
@stack('invoice_{{ $key }}_content_end')
@php $is_active = false; @endphp @php $is_active = false; @endphp
@endforeach @endforeach
<x-form id="portal"> <x-form id="portal">
<x-form.group.payment-method <x-form.group.payment-method
id="payment-method" id="payment-method"
:selected="array_key_first($payment_methods)" :selected="array_key_first($payment_methods)"
not-required not-required
form-group-class="invisible" form-group-class="invisible"
placeholder="{{ trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)]) }}" placeholder="{{ trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)]) }}"
change="onChangePaymentMethod('{{ array_key_first($payment_methods) }}')" change="onChangePaymentMethodSigned('{{ array_key_first($payment_methods) }}')"
/> />
<x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" /> <x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" />
</x-form> </x-form>
</x-slot> </div>
</x-tabs>
@endif @endif
@if ($invoice->transactions->count()) @if ($invoice->transactions->count())

107
resources/views/portal/invoices/signed.blade.php
View File

@ -30,72 +30,69 @@
<div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-12 lg:space-y-0"> <div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-12 lg:space-y-0">
<div class="w-full lg:w-5/12"> <div class="w-full lg:w-5/12">
@if (! empty($payment_methods) && ! in_array($invoice->status, ['paid', 'cancelled'])) @if (! empty($payment_methods) && ! in_array($invoice->status, ['paid', 'cancelled']))
<x-tabs active="{{ reset($payment_methods) }}"> <div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }">
<div role="tablist" class="flex flex-wrap"> <div role="tablist" class="flex flex-wrap">
@php $is_active = true; @endphp @php $is_active = true; @endphp
<x-slot name="navs"> <div class="{{ count($payment_methods) > 3 ? 'swiper swiper-links': 'w-full flex' }}">
<div class="w-full flex {{ count($payment_methods) > 3 ? 'swiper swiper-links': 'w-full flex' }}"> <div class="{{ count($payment_methods) > 3 ? 'swiper-wrapper' : 'inline-flex' }}">
<div class="{{ count($payment_methods) > 3 ? 'swiper-wrapper' : 'w-full flex' }}"> @foreach ($payment_methods as $key => $name)
@foreach ($payment_methods as $key => $name) @stack('invoice_{{ $key }}_tab_start')
@stack('invoice_{{ $key }}_tab_start') <div
<div class="{{ count($payment_methods) > 3 ? 'swiper-slide': '' }}"> x-on:click="active = '{{ $name }}'"
<x-tabs.nav @click="onChangePaymentMethodSigned('{{ $key }}')"
id="{{ $name }}" id="tabs-payment-method-{{ $key }}-tab"
@click="onChangePaymentMethodSigned('{{ $key }}')" x-bind:class="active != '{{ $name }}' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
> class="relative px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b whitespace-nowrap tabs-link {{ count($payment_methods) > 3 ? 'swiper-slide': '' }}"
<div> >
{{ $name }} {{ $name }}
</div> </div>
</x-tabs.nav> @stack('invoice_{{ $key }}_tab_end')
</div>
@stack('invoice_{{ $key }}_tab_end')
@php $is_active = false; @endphp @php $is_active = false; @endphp
@endforeach @endforeach
</div>
@if (count($payment_methods) > 3)
<div class="swiper-button-next bg-body text-white flex items-center justify-center right-0 top-3">
<span class="material-icons text-purple text-4xl">chevron_right</span>
</div> </div>
@if (count($payment_methods) > 3) <div class="swiper-button-prev bg-body text-white flex items-center justify-center left-0 top-3">
<div class="swiper-button-next top-3 right-0"> <span class="material-icons text-purple text-4xl">chevron_left</span>
<span class="material-icons">chevron_right</span> </div>
</div> @endif
</div>
<div class="swiper-button-prev top-3 left-0">
<span class="material-icons">chevron_left</span>
</div>
@endif
</div>
</x-slot>
</div> </div>
@php $is_active = true; @endphp @php $is_active = true; @endphp
<x-slot name="content"> @foreach ($payment_methods as $key => $name)
@foreach ($payment_methods as $key => $name) @stack('invoice_{{ $key }}_content_start')
@stack('invoice_{{ $key }}_content_start') <div
<x-tabs.tab id="{{ $name }}"> x-bind:class="active != '{{ $name }}' ? 'hidden': 'block'"
<div class="my-3"> class="my-3"
<component v-bind:is="method_show_html" @interface="onRedirectConfirm"></component> id="tabs-payment-method-{{ $key }}"
</div> >
</x-tabs.tab> <component v-bind:is="method_show_html" @interface="onRedirectConfirm"></component>
@stack('invoice_{{ $key }}_content_end') </div>
@stack('invoice_{{ $key }}_content_end')
@php $is_active = false; @endphp
@endforeach
<x-form id="portal"> @php $is_active = false; @endphp
<x-form.group.payment-method @endforeach
id="payment-method"
:selected="array_key_first($payment_methods)"
not-required
form-group-class="invisible"
placeholder="{{ trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)]) }}"
change="onChangePaymentMethodSigned('{{ array_key_first($payment_methods) }}')"
/>
<x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" /> <x-form id="portal">
</x-form> <x-form.group.payment-method
</x-slot> id="payment-method"
</x-tabs> :selected="array_key_first($payment_methods)"
not-required
form-group-class="invisible"
placeholder="{{ trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)]) }}"
change="onChangePaymentMethodSigned('{{ array_key_first($payment_methods) }}')"
/>
<x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" />
</x-form>
</div>
@endif @endif
@if ($invoice->transactions->count()) @if ($invoice->transactions->count())