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

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
Cüneyt Şentürk 2022-11-22 17:40:53 +03:00
commit d97bdbda81
7 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,10 +244,13 @@ function runTooltip(tooltipToggleEl) {
function show() { function show() {
// Make the tooltip visible // Make the tooltip visible
tooltipEl.classList.remove("opacity-0"); if (tooltipEl.classList.contains("opacity-100", "visible")) {
tooltipEl.classList.add("opacity-100"); tooltipEl.classList.remove("opacity-0");
tooltipEl.classList.remove("invisible"); tooltipEl.classList.add("opacity-100");
tooltipEl.classList.add("visible"); // Enable the event listeners tooltipEl.classList.remove("invisible");
tooltipEl.classList.add("visible");
}
// Enable the event listeners
popperInstance.setOptions((options) => ({ popperInstance.setOptions((options) => ({
...options, ...options,
@ -265,10 +268,13 @@ function runTooltip(tooltipToggleEl) {
function hide() { function hide() {
// Hide the tooltip // Hide the tooltip
tooltipEl.classList.remove("opacity-100"); if (tooltipEl.classList.contains("opacity-100", "visible")) {
tooltipEl.classList.add("opacity-0"); tooltipEl.classList.remove("opacity-100");
tooltipEl.classList.remove("visible"); tooltipEl.classList.add("opacity-0");
tooltipEl.classList.add("invisible"); // Disable the event listeners tooltipEl.classList.remove("visible");
tooltipEl.classList.add("invisible");
}
// Disable the event listeners
popperInstance.setOptions((options) => ({ popperInstance.setOptions((options) => ({
...options, ...options,
@ -472,6 +478,10 @@ document.querySelectorAll('[data-page-title-first]').forEach((first) => {
let title_truncate = first.querySelector('[data-title-truncate]'); let title_truncate = first.querySelector('[data-title-truncate]');
if (title_truncate !== null) { if (title_truncate !== null) {
//added for equalize h1 width and parent element width. Because parent element has -ml-0.5 so didn't equalize
first.querySelector('h1').classList.add('mr-0.5');
//added for equalize h1 width and parent element width. Because parent element has -ml-0.5 so didn't equalize
if (first.clientWidth < title_truncate.clientWidth && second.clientHeight > 0) { if (first.clientWidth < title_truncate.clientWidth && second.clientHeight > 0) {
// added specific width styling for truncate text // added specific width styling for truncate text
title_truncate.style.width = first.clientWidth + 'px'; title_truncate.style.width = first.clientWidth + 'px';
@ -499,6 +509,8 @@ document.querySelectorAll('[data-page-title-first]').forEach((first) => {
this.classList.add('truncate'); this.classList.add('truncate');
}); });
// added truncate animation for truncated text // added truncate animation for truncated text
first.querySelector('h1').classList.remove('mr-0.5');
} }
} }

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

@ -156,8 +156,8 @@
@if (! empty($remote)) @if (! empty($remote))
remote-action="{{ $attributes['remote_action'] }}" remote-action="{{ $attributes['remote_action'] }}"
@if (! empty($attributes['currecny_code'])) @if (! empty($attributes['currency_code']))
currency-code="{{ $attributes['currecny_code'] }}" currency-code="{{ $attributes['currency_code'] }}"
@endif @endif
@endif @endif

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

@ -174,8 +174,8 @@
@if (! empty($remote)) @if (! empty($remote))
remote-action="{{ $attributes['remote_action'] }}" remote-action="{{ $attributes['remote_action'] }}"
@if (! empty($attributes['currecny_code'])) @if (! empty($attributes['currency_code']))
currency-code="{{ $attributes['currecny_code'] }}" currency-code="{{ $attributes['currency_code'] }}"
@endif @endif
@endif @endif

4
resources/views/components/form/input/select.blade.php
View File

@ -160,8 +160,8 @@
@if (! empty($remote)) @if (! empty($remote))
remote-action="{{ $attributes['remote_action'] }}" remote-action="{{ $attributes['remote_action'] }}"
@if (! empty($attributes['currecny_code'])) @if (! empty($attributes['currency_code']))
currency-code="{{ $attributes['currecny_code'] }}" currency-code="{{ $attributes['currency_code'] }}"
@endif @endif
@endif @endif

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

@ -20,7 +20,7 @@
</x-slot> </x-slot>
<x-slot name="content"> <x-slot name="content">
<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-4 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']))
<div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }"> <div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }">
@ -80,7 +80,7 @@
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"
/> />
<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" />
@ -128,7 +128,7 @@
@endif @endif
</div> </div>
<div class="hidden lg:block w-7/12"> <div class="w-full lg:w-7/12">
<x-documents.show.template <x-documents.show.template
type="invoice" type="invoice"
:document="$invoice" :document="$invoice"

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

@ -18,7 +18,7 @@
</x-slot> </x-slot>
<x-slot name="content"> <x-slot name="content">
<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-4 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']))
<div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }"> <div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }">
@ -31,7 +31,7 @@
@stack('invoice_{{ $key }}_tab_start') @stack('invoice_{{ $key }}_tab_start')
<div <div
x-on:click="active = '{{ $name }}'" x-on:click="active = '{{ $name }}'"
@click="onChangePaymentMethodSigned('{{ $key }}')" @click="onChangePaymentMethod('{{ $key }}')"
id="tabs-payment-method-{{ $key }}-tab" 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'" 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': '' }}" 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': '' }}"
@ -78,7 +78,7 @@
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="onChangePaymentMethod"
/> />
<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" />
@ -126,7 +126,7 @@
@endif @endif
</div> </div>
<div class="hidden lg:block w-7/12"> <div class="w-full lg:w-7/12">
<x-documents.show.template <x-documents.show.template
type="invoice" type="invoice"
:document="$invoice" :document="$invoice"

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

@ -27,7 +27,7 @@
</x-slot> </x-slot>
<x-slot name="content"> <x-slot name="content">
<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-4 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']))
<div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }"> <div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }">
@ -87,7 +87,7 @@
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"
/> />
<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" />
@ -135,7 +135,7 @@
@endif @endif
</div> </div>
<div class="hidden lg:block w-7/12"> <div class="w-full lg:w-7/12">
<x-documents.show.template <x-documents.show.template
type="invoice" type="invoice"
:document="$invoice" :document="$invoice"