From 40b294480a564288e378fdc59366e0211152af67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Wed, 31 May 2023 16:22:40 +0300 Subject: [PATCH] typo --- public/css/app.css | 8 ++--- resources/assets/js/mixins/global.js | 2 +- resources/assets/js/views/common/documents.js | 1 + .../assets/js/views/settings/settings.js | 2 +- resources/lang/en-GB/documents.php | 1 + .../views/modals/invoices/email.blade.php | 32 ++++++++++--------- 6 files changed, 25 insertions(+), 21 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 0c0b68544..0a9db28fa 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -65180,14 +65180,14 @@ body{ color: rgb(85 88 139 / var(--tw-text-opacity)); } - :is([dir="ltr"] .sm\:ltr\:right-4){ - right: 1rem; - } - :is([dir="ltr"] .sm\:ltr\:left-4){ left: 1rem; } + :is([dir="ltr"] .sm\:ltr\:right-4){ + right: 1rem; + } + :is([dir="ltr"] .sm\:ltr\:pl-10){ padding-left: 2.5rem; } diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js index 5b3965e63..37721aeb3 100644 --- a/resources/assets/js/mixins/global.js +++ b/resources/assets/js/mixins/global.js @@ -1011,7 +1011,7 @@ export default { this.component = Vue.component('add-new-component', (resolve, reject) => { resolve({ - template: '
', + template: '
', components: { AkauntingDropzoneFileUpload, diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js index a1be6d75b..c9d3fe3d6 100644 --- a/resources/assets/js/views/common/documents.js +++ b/resources/assets/js/views/common/documents.js @@ -621,6 +621,7 @@ const app = new Vue({ onChangeCurrency(currency_code) { if (this.edit.status && this.edit.currency <= 2) { this.edit.currency++; + return; } diff --git a/resources/assets/js/views/settings/settings.js b/resources/assets/js/views/settings/settings.js index 7995f1969..5b6c5d181 100644 --- a/resources/assets/js/views/settings/settings.js +++ b/resources/assets/js/views/settings/settings.js @@ -141,7 +141,7 @@ const app = new Vue({ }); }, - // Change currency get money + // Change currency get money override because remove form currency_code and currency_rate column onChangeCurrency(currency_code) { if (! currency_code) { return; diff --git a/resources/lang/en-GB/documents.php b/resources/lang/en-GB/documents.php index 81ecb7ea1..0555c7146 100644 --- a/resources/lang/en-GB/documents.php +++ b/resources/lang/en-GB/documents.php @@ -89,4 +89,5 @@ return [ ], ], + 'empty_attachments' => 'There are no files attached to this :type.', ]; diff --git a/resources/views/modals/invoices/email.blade.php b/resources/views/modals/invoices/email.blade.php index db03c2da4..ff39d118e 100644 --- a/resources/views/modals/invoices/email.blade.php +++ b/resources/views/modals/invoices/email.blade.php @@ -1,15 +1,13 @@ - + {{ trans('general.general') }} - @if ($invoice->attachment) - - {{ trans_choice('general.attachments', 2) }} - - @endif + + {{ trans_choice('general.attachments', 2) }} + @@ -29,8 +27,8 @@ - @if ($invoice->attachment) - + + @if ($invoice->attachment) @@ -55,11 +53,11 @@ + id="attachment-{{ $attachment->id }}" + name="{{ $attachment->id }}" + class="rounded-sm text-purple border-gray-300 cursor-pointer disabled:bg-gray-200 focus:outline-none focus:ring-transparent" + data-field="attachments" + @input="e => form.attachments[e.target.name] = e.target.checked | 0"> @if ($attachment->aggregate_type == 'image') @@ -84,8 +82,12 @@ @endforeach - - @endif + @else +

+ {{ trans('documents.empty_attachments', ['type' => $invoice->type]) }} +

+ @endif +