From 279ec491e8f716b670726d0a44bb174280119a61 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Tue, 26 Jul 2022 13:57:04 +0300 Subject: [PATCH 1/2] console error fixed --- .../components/documents/form/items.blade.php | 47 ++++++++++--------- .../form/group/invoice_text.blade.php | 4 +- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/resources/views/components/documents/form/items.blade.php b/resources/views/components/documents/form/items.blade.php index 00f6497a1..4de3c6fad 100644 --- a/resources/views/components/documents/form/items.blade.php +++ b/resources/views/components/documents/form/items.blade.php @@ -26,53 +26,56 @@ @if (! $hideItems) @stack('name_th_start') - @if (! $hideItemName) - {{ (trans_choice($textItemName, 2) != $textItemName) ? trans_choice($textItemName, 2) : trans($textItemName) }} + @if (! $hideItemName) + {{ (trans_choice($textItemName, 2) != $textItemName) ? trans_choice($textItemName, 2) : trans($textItemName) }} + @endif - @endif + @stack('name_th_end') @stack('move_th_start') - @if (! $hideItemDescription) - + + @if (! $hideItemDescription) {{ trans($textItemDescription) }} - - @endif + @endif + + @stack('move_th_end') @endif @stack('quantity_th_start') - @if (! $hideItemQuantity) - + + @if (! $hideItemQuantity) {{ trans($textItemQuantity) }} - - @endif + @endif + + @stack('quantity_th_end') @stack('price_th_start') - @if (! $hideItemPrice) - + + @if (! $hideItemPrice) {{ trans($textItemPrice) }} - - @endif - + @endif + + @stack('price_th_end') @stack('total_th_start') - @if (! $hideItemAmount) - + + @if (! $hideItemAmount) {{ trans($textItemAmount) }} - - @endif - + @endif + + @stack('total_th_end') @stack('remove_th_start') @@ -106,4 +109,4 @@ - + \ No newline at end of file diff --git a/resources/views/components/form/group/invoice_text.blade.php b/resources/views/components/form/group/invoice_text.blade.php index 8b6a9933e..60018d6c6 100644 --- a/resources/views/components/form/group/invoice_text.blade.php +++ b/resources/views/components/form/group/invoice_text.blade.php @@ -168,8 +168,8 @@ @foreach ($options as $option) @if ($option->id == 'custom') -
- +
+
@endif @endforeach From e7c5dd885ed39248cbae816b1598ca7766f192d5 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Tue, 26 Jul 2022 14:00:41 +0300 Subject: [PATCH 2/2] unused developments ejected --- resources/assets/js/views/common/documents.js | 20 +++++-------------- .../documents/form/buttons.blade.php | 8 ++++---- .../views/portal/invoices/preview.blade.php | 4 ++-- .../views/portal/invoices/signed.blade.php | 4 ++-- 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js index f08f6b167..07c8be53b 100644 --- a/resources/assets/js/views/common/documents.js +++ b/resources/assets/js/views/common/documents.js @@ -76,7 +76,6 @@ const app = new Vue({ ',,' ], email_template: false, - minor_form_loading: false } }, @@ -662,11 +661,13 @@ const app = new Vue({ if (response.data.error) { this.form.loading = false; + this.form.response = response.data; } }) .catch(error => { this.form.loading = false; + this.form.onFail(error); this.method_show_html = error.message; @@ -945,7 +946,7 @@ const app = new Vue({ let form_html = document.querySelector('form'); if (form_html && form_html.getAttribute('id') == 'document') { - form_html.querySelectorAll('input, textarea, select, ul, li, a').forEach((element) => { + form_html.querySelectorAll('input, textarea, select, ul, li, a, [type="button"]').forEach((element) => { element.addEventListener('click', () => { this.onBeforeUnload(); }); @@ -969,18 +970,7 @@ const app = new Vue({ onSubmitViaSendEmail() { this.form['senddocument'] = true; - this.minor_form_loading = true; - this.onSubmit(); - - this.form.loading = false; - - setTimeout(() => { - if (Object.keys(this.form.errors.errors.length > 0)) { - this.minor_form_loading = false; - return; - } - }, 200); }, }, @@ -1120,6 +1110,6 @@ const app = new Vue({ } this.form.discount = this.form.discount.replace(',', '.'); - } + }, }, -}); +}); \ No newline at end of file diff --git a/resources/views/components/documents/form/buttons.blade.php b/resources/views/components/documents/form/buttons.blade.php index d8d77b63c..b886223d4 100644 --- a/resources/views/components/documents/form/buttons.blade.php +++ b/resources/views/components/documents/form/buttons.blade.php @@ -8,15 +8,15 @@ id="invoice-send-to" class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 ltr:ml-2 rtl:mr-2 text-base rounded-lg disabled:bg-green-100" override="class" - ::disabled="minor_form_loading" + ::disabled="form.loading" @click="onSubmitViaSendEmail" > - - + + {{ trans('general.send_to') }} @endif
- + \ No newline at end of file diff --git a/resources/views/portal/invoices/preview.blade.php b/resources/views/portal/invoices/preview.blade.php index a118bbc62..545fec7b7 100644 --- a/resources/views/portal/invoices/preview.blade.php +++ b/resources/views/portal/invoices/preview.blade.php @@ -27,7 +27,7 @@
@php $is_active = true; @endphp -
+
@foreach ($payment_methods as $key => $name) @stack('invoice_{{ $key }}_tab_start') @@ -148,4 +148,4 @@ @endpush - + \ No newline at end of file diff --git a/resources/views/portal/invoices/signed.blade.php b/resources/views/portal/invoices/signed.blade.php index 2d6024d6f..db05f9b8d 100644 --- a/resources/views/portal/invoices/signed.blade.php +++ b/resources/views/portal/invoices/signed.blade.php @@ -34,7 +34,7 @@
@php $is_active = true; @endphp -
+
@foreach ($payment_methods as $key => $name) @stack('invoice_{{ $key }}_tab_start') @@ -148,4 +148,4 @@ -
+
\ No newline at end of file