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

Merge branch 'akaunting:master' into sentry

Browse Source
This commit is contained in:
Burak Civan
2022-11-21 16:57:16 +03:00
committed by GitHub
parent d45ad10641 8581e5d3e8
commit 3a7410f0fe
19 changed files with 273 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
resources/views/components/form/group/recurring.blade.php
View File

@ -1,7 +1,7 @@
<akaunting-recurring
start-text="{!! trans('recurring.limit_date', ['type' => Str::replace('-recurring', '', $type)]) !!}"
:date-range-text="{{ json_encode(trans('general.date_range')) }}"
middleText="{!! trans('recurring.limit_middle') !!}"
middle-text="{!! trans('recurring.limit_middle') !!}"
end-text="{{ Str::plural(Str::replace('-recurring', '', $type)) }}"
:frequencies="{{ json_encode($frequencies) }}"
@ -64,4 +64,4 @@
{{ $attributes }}
>
</akaunting-recurring>
</akaunting-recurring>

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

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

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

@ -1,7 +1,7 @@
@stack('header_start')
<div id="header" class="xl:pt-6 -mt-2">
<div class="flex flex-col sm:flex-row items-start justify-between space-x-4 hide-empty-page">
<div class="flex flex-col sm:flex-row items-start justify-between sm:space-x-4 hide-empty-page">
<div data-page-title-first class="w-full sm:w-6/12 items-center mb-3 sm:mb-0">
<div class="flex items-center">
<h1 class="flex items-center text-2xl xl:text-5xl text-black font-light -ml-0.5 mt-2 whitespace-nowrap">
@ -13,7 +13,7 @@
</h1>
@if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4">
<div class="ltr:ml-4 rtl:mr-4 mt-2">
{!! $status !!}
</div>
@endif

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

@ -1,7 +1,7 @@
@stack('header_start')
<div id="header" class="xl:pt-6 -mt-2">
<div class="flex flex-col sm:flex-row items-start justify-between space-x-4 hide-empty-page">
<div class="flex flex-col sm:flex-row items-start justify-between sm:space-x-4 hide-empty-page">
<div data-page-title-first class="w-full sm:w-6/12 items-center mb-3 sm:mb-0">
<div class="flex items-center">
<h1 class="flex items-center text-2xl xl:text-5xl text-black font-light -ml-0.5 mt-2 whitespace-nowrap">
@ -13,7 +13,7 @@
</h1>
@if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4">
<div class="ltr:ml-4 rtl:mr-4 mt-2">
{!! $status !!}
</div>
@endif

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

@ -1,7 +1,7 @@
@stack('header_start')
<div id="header" class="xl:pt-6 -mt-2">
<div lass="flex flex-col sm:flex-row items-start justify-between space-x-4 hide-empty-page">
<div lass="flex flex-col sm:flex-row items-start justify-between sm:space-x-4 hide-empty-page">
<div data-page-title-first class="w-full sm:w-6/12 items-center mb-3 sm:mb-0">
<div class="flex items-center">
<h1 class="flex items-center text-2xl xl:text-5xl text-black font-light -ml-0.5 mt-2 whitespace-nowrap">
@ -13,7 +13,7 @@
</h1>
@if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4">
<div class="ltr:ml-4 rtl:mr-4 mt-2">
{!! $status !!}
</div>
@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="w-full lg:w-5/12">
@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">
@php $is_active = true; @endphp
<x-slot name="navs">
<div class="w-full flex {{ count($payment_methods) > 3 ? 'swiper swiper-links': 'w-full flex' }}">
<div class="{{ count($payment_methods) > 3 ? 'swiper-wrapper' : 'w-full flex' }}">
@foreach ($payment_methods as $key => $name)
@stack('invoice_{{ $key }}_tab_start')
<div class="{{ count($payment_methods) > 3 ? 'swiper-slide': '' }}">
<x-tabs.nav
id="{{ $name }}"
@click="onChangePaymentMethodSigned('{{ $key }}')"
>
<div>
{{ $name }}
</div>
</x-tabs.nav>
</div>
@stack('invoice_{{ $key }}_tab_end')
<div class="{{ count($payment_methods) > 3 ? 'swiper swiper-links': 'w-full flex' }}">
<div class="{{ count($payment_methods) > 3 ? 'swiper-wrapper' : 'inline-flex' }}">
@foreach ($payment_methods as $key => $name)
@stack('invoice_{{ $key }}_tab_start')
<div
x-on:click="active = '{{ $name }}'"
@click="onChangePaymentMethodSigned('{{ $key }}')"
id="tabs-payment-method-{{ $key }}-tab"
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': '' }}"
>
{{ $name }}
</div>
@stack('invoice_{{ $key }}_tab_end')
@php $is_active = false; @endphp
@endforeach
@php $is_active = false; @endphp
@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>
@if (count($payment_methods) > 3)
<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>
@endif
</div>
</x-slot>
<div class="swiper-button-prev bg-body text-white flex items-center justify-center left-0 top-3">
<span class="material-icons text-purple text-4xl">chevron_left</span>
</div>
@endif
</div>
</div>
@php $is_active = true; @endphp
<x-slot name="content">
@foreach ($payment_methods as $key => $name)
@stack('invoice_{{ $key }}_content_start')
<x-tabs.tab id="{{ $name }}">
<div class="my-3">
<component v-bind:is="method_show_html" @interface="onRedirectConfirm"></component>
</div>
</x-tabs.tab>
@stack('invoice_{{ $key }}_content_end')
@foreach ($payment_methods as $key => $name)
@stack('invoice_{{ $key }}_content_start')
<div
x-bind:class="active != '{{ $name }}' ? 'hidden': 'block'"
class="my-3"
id="tabs-payment-method-{{ $key }}"
>
<component v-bind:is="method_show_html" @interface="onRedirectConfirm"></component>
</div>
@stack('invoice_{{ $key }}_content_end')
@php $is_active = false; @endphp
@endforeach
@php $is_active = false; @endphp
@endforeach
<x-form id="portal">
<x-form.group.payment-method
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 id="portal">
<x-form.group.payment-method
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>
</x-slot>
</x-tabs>
<x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" />
</x-form>
</div>
@endif
@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="w-full lg:w-5/12">
@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">
@php $is_active = true; @endphp
<x-slot name="navs">
<div class="w-full flex {{ count($payment_methods) > 3 ? 'swiper swiper-links': 'w-full flex' }}">
<div class="{{ count($payment_methods) > 3 ? 'swiper-wrapper' : 'w-full flex' }}">
@foreach ($payment_methods as $key => $name)
@stack('invoice_{{ $key }}_tab_start')
<div class="{{ count($payment_methods) > 3 ? 'swiper-slide': '' }}">
<x-tabs.nav
id="{{ $name }}"
@click="onChangePaymentMethodSigned('{{ $key }}')"
>
<div>
{{ $name }}
</div>
</x-tabs.nav>
</div>
@stack('invoice_{{ $key }}_tab_end')
<div class="{{ count($payment_methods) > 3 ? 'swiper swiper-links': 'w-full flex' }}">
<div class="{{ count($payment_methods) > 3 ? 'swiper-wrapper' : 'inline-flex' }}">
@foreach ($payment_methods as $key => $name)
@stack('invoice_{{ $key }}_tab_start')
<div
x-on:click="active = '{{ $name }}'"
@click="onChangePaymentMethodSigned('{{ $key }}')"
id="tabs-payment-method-{{ $key }}-tab"
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': '' }}"
>
{{ $name }}
</div>
@stack('invoice_{{ $key }}_tab_end')
@php $is_active = false; @endphp
@endforeach
@php $is_active = false; @endphp
@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>
@if (count($payment_methods) > 3)
<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>
@endif
</div>
</x-slot>
<div class="swiper-button-prev bg-body text-white flex items-center justify-center left-0 top-3">
<span class="material-icons text-purple text-4xl">chevron_left</span>
</div>
@endif
</div>
</div>
@php $is_active = true; @endphp
<x-slot name="content">
@foreach ($payment_methods as $key => $name)
@stack('invoice_{{ $key }}_content_start')
<x-tabs.tab id="{{ $name }}">
<div class="my-3">
<component v-bind:is="method_show_html" @interface="onRedirectConfirm"></component>
</div>
</x-tabs.tab>
@stack('invoice_{{ $key }}_content_end')
@foreach ($payment_methods as $key => $name)
@stack('invoice_{{ $key }}_content_start')
<div
x-bind:class="active != '{{ $name }}' ? 'hidden': 'block'"
class="my-3"
id="tabs-payment-method-{{ $key }}"
>
<component v-bind:is="method_show_html" @interface="onRedirectConfirm"></component>
</div>
@stack('invoice_{{ $key }}_content_end')
@php $is_active = false; @endphp
@endforeach
@php $is_active = false; @endphp
@endforeach
<x-form id="portal">
<x-form.group.payment-method
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="onChangePaymentMethod('{{ array_key_first($payment_methods) }}')"
/>
<x-form id="portal">
<x-form.group.payment-method
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>
</x-slot>
</x-tabs>
<x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" />
</x-form>
</div>
@endif
@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="w-full lg:w-5/12">
@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">
@php $is_active = true; @endphp
<x-slot name="navs">
<div class="w-full flex {{ count($payment_methods) > 3 ? 'swiper swiper-links': 'w-full flex' }}">
<div class="{{ count($payment_methods) > 3 ? 'swiper-wrapper' : 'w-full flex' }}">
@foreach ($payment_methods as $key => $name)
@stack('invoice_{{ $key }}_tab_start')
<div class="{{ count($payment_methods) > 3 ? 'swiper-slide': '' }}">
<x-tabs.nav
id="{{ $name }}"
@click="onChangePaymentMethodSigned('{{ $key }}')"
>
<div>
{{ $name }}
</div>
</x-tabs.nav>
</div>
@stack('invoice_{{ $key }}_tab_end')
<div class="{{ count($payment_methods) > 3 ? 'swiper swiper-links': 'w-full flex' }}">
<div class="{{ count($payment_methods) > 3 ? 'swiper-wrapper' : 'inline-flex' }}">
@foreach ($payment_methods as $key => $name)
@stack('invoice_{{ $key }}_tab_start')
<div
x-on:click="active = '{{ $name }}'"
@click="onChangePaymentMethodSigned('{{ $key }}')"
id="tabs-payment-method-{{ $key }}-tab"
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': '' }}"
>
{{ $name }}
</div>
@stack('invoice_{{ $key }}_tab_end')
@php $is_active = false; @endphp
@endforeach
@php $is_active = false; @endphp
@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>
@if (count($payment_methods) > 3)
<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>
@endif
</div>
</x-slot>
<div class="swiper-button-prev bg-body text-white flex items-center justify-center left-0 top-3">
<span class="material-icons text-purple text-4xl">chevron_left</span>
</div>
@endif
</div>
</div>
@php $is_active = true; @endphp
<x-slot name="content">
@foreach ($payment_methods as $key => $name)
@stack('invoice_{{ $key }}_content_start')
<x-tabs.tab id="{{ $name }}">
<div class="my-3">
<component v-bind:is="method_show_html" @interface="onRedirectConfirm"></component>
</div>
</x-tabs.tab>
@stack('invoice_{{ $key }}_content_end')
@php $is_active = false; @endphp
@endforeach
@foreach ($payment_methods as $key => $name)
@stack('invoice_{{ $key }}_content_start')
<div
x-bind:class="active != '{{ $name }}' ? 'hidden': 'block'"
class="my-3"
id="tabs-payment-method-{{ $key }}"
>
<component v-bind:is="method_show_html" @interface="onRedirectConfirm"></component>
</div>
@stack('invoice_{{ $key }}_content_end')
<x-form id="portal">
<x-form.group.payment-method
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) }}')"
/>
@php $is_active = false; @endphp
@endforeach
<x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" />
</x-form>
</x-slot>
</x-tabs>
<x-form id="portal">
<x-form.group.payment-method
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>
</div>
@endif
@if ($invoice->transactions->count())