This commit is contained in:
Cüneyt Şentürk 2023-05-31 16:22:40 +03:00
parent d049463fab
commit 40b294480a
6 changed files with 25 additions and 21 deletions

8
public/css/app.css vendored
View File

@ -65180,14 +65180,14 @@ body{
color: rgb(85 88 139 / var(--tw-text-opacity)); 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){ :is([dir="ltr"] .sm\:ltr\:left-4){
left: 1rem; left: 1rem;
} }
:is([dir="ltr"] .sm\:ltr\:right-4){
right: 1rem;
}
:is([dir="ltr"] .sm\:ltr\:pl-10){ :is([dir="ltr"] .sm\:ltr\:pl-10){
padding-left: 2.5rem; padding-left: 2.5rem;
} }

View File

@ -1011,7 +1011,7 @@ export default {
this.component = Vue.component('add-new-component', (resolve, reject) => { this.component = Vue.component('add-new-component', (resolve, reject) => {
resolve({ resolve({
template: '<div id="dynamic-email-component"><akaunting-modal-add-new modal-dialog-class="max-w-screen-md" :show="email.modal" @submit="onSubmit" @cancel="onCancel" :buttons="email.buttons" :title="email.title" :is_component=true :message="email.html"></akaunting-modal-add-new></div>', template: '<div id="dynamic-email-component"><akaunting-modal-add-new modal-dialog-class="max-w-screen-md" modal-position-top :show="email.modal" @submit="onSubmit" @cancel="onCancel" :buttons="email.buttons" :title="email.title" :is_component=true :message="email.html"></akaunting-modal-add-new></div>',
components: { components: {
AkauntingDropzoneFileUpload, AkauntingDropzoneFileUpload,

View File

@ -621,6 +621,7 @@ const app = new Vue({
onChangeCurrency(currency_code) { onChangeCurrency(currency_code) {
if (this.edit.status && this.edit.currency <= 2) { if (this.edit.status && this.edit.currency <= 2) {
this.edit.currency++; this.edit.currency++;
return; return;
} }

View File

@ -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) { onChangeCurrency(currency_code) {
if (! currency_code) { if (! currency_code) {
return; return;

View File

@ -89,4 +89,5 @@ return [
], ],
], ],
'empty_attachments' => 'There are no files attached to this :type.',
]; ];

View File

@ -1,15 +1,13 @@
<x-form id="form-email" :route="[$store_route, $invoice->id]"> <x-form id="form-email" :route="[$store_route, $invoice->id]">
<x-tabs active="general" class="grid grid-cols-{{ $invoice->attachment ? '2' : '1' }}" override="class" ignore-hash> <x-tabs active="general" class="grid grid-cols-2 auto-rows-max" override="class" ignore-hash>
<x-slot name="navs"> <x-slot name="navs">
<x-tabs.nav id="general"> <x-tabs.nav id="general">
{{ trans('general.general') }} {{ trans('general.general') }}
</x-tabs.nav> </x-tabs.nav>
@if ($invoice->attachment) <x-tabs.nav id="attachments">
<x-tabs.nav id="attachments"> {{ trans_choice('general.attachments', 2) }}
{{ trans_choice('general.attachments', 2) }} </x-tabs.nav>
</x-tabs.nav>
@endif
</x-slot> </x-slot>
<x-slot name="content"> <x-slot name="content">
@ -29,8 +27,8 @@
</x-form.section> </x-form.section>
</x-tabs.tab> </x-tabs.tab>
@if ($invoice->attachment) <x-tabs.tab id="attachments">
<x-tabs.tab id="attachments"> @if ($invoice->attachment)
<x-table> <x-table>
<x-table.thead> <x-table.thead>
<x-table.tr class="flex items-center px-1"> <x-table.tr class="flex items-center px-1">
@ -55,11 +53,11 @@
<x-table.tr id="method-{{ $attachment->id }}"> <x-table.tr id="method-{{ $attachment->id }}">
<x-table.td class="w-1/12"> <x-table.td class="w-1/12">
<input type="checkbox" <input type="checkbox"
id="attachment-{{ $attachment->id }}" id="attachment-{{ $attachment->id }}"
name="{{ $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" class="rounded-sm text-purple border-gray-300 cursor-pointer disabled:bg-gray-200 focus:outline-none focus:ring-transparent"
data-field="attachments" data-field="attachments"
@input="e => form.attachments[e.target.name] = e.target.checked | 0"> @input="e => form.attachments[e.target.name] = e.target.checked | 0">
</x-table.td> </x-table.td>
<x-table.td class="w-1/6"> <x-table.td class="w-1/6">
@if ($attachment->aggregate_type == 'image') @if ($attachment->aggregate_type == 'image')
@ -84,8 +82,12 @@
@endforeach @endforeach
</x-table.tbody> </x-table.tbody>
</x-table> </x-table>
</x-tabs.tab> @else
@endif <p class="mt-6 text-sm">
{{ trans('documents.empty_attachments', ['type' => $invoice->type]) }}
</p>
@endif
</x-tabs.tab>
</x-slot> </x-slot>
</x-tabs> </x-tabs>
</x-form> </x-form>