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

Merge branch 'master' of https://github.com/brkcvn/akaunting into code-clean

Browse Source
This commit is contained in:
Burak Civan
2022-08-08 09:42:18 +03:00
parent fa3715fdb7 27a43ebdd1
commit cf5f65310e
13 changed files with 72 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
resources/assets/js/components/AkauntingDropzoneFileUpload.vue
View File

@ -17,6 +17,12 @@
<span class="material-icons-outlined avatar hidden" data-dz-thumbnail-word>content_paste</span>
<span class="material-icons-outlined avatar hidden" data-dz-thumbnail-excel>table_chart</span>
<span class="mb-1 text-sm ml-3 text-gray-500 hidden" data-dz-name>...</span>
<div class="gap-x-1 relative">
<button data-dz-remove="true" class="absolute group right-0">
<span class="material-icons text-base text-red px-1.5 py-1 rounded-lg group-hover:bg-gray-100">delete</span>
</button>
</div>
</div>
</div>
@ -40,11 +46,11 @@
</div>
<div class="gap-x-1">
<button data-dz-remove="true" class="btn btn-danger btn-sm">
<span class="material-icons text-base text-red">delete</span>
<button data-dz-remove="true" class="group">
<span class="material-icons text-base text-red px-1.5 py-1 rounded-lg group-hover:bg-gray-100">delete</span>
</button>
<a href="#" type="button" class="btn btn-sm btn-info hidden" data-dz-download>
<span class="material-icons-round text-base">download</span>
<a href="#" type="button" class="group hidden" data-dz-download>
<span class="material-icons-round text-base text-red px-1.5 py-1 rounded-lg group-hover:bg-gray-100">download</span>
</a>
</div>
</div>

7
resources/assets/js/components/AkauntingSearch.vue
View File

@ -867,8 +867,7 @@ export default {
}
html[dir='rtl'] .searh-field .el-tag-option {
border-radius: 0.50rem;
margin-right: 10px;
border-radius: 0 0.5rem 0.5rem 0;
}
.searh-field .el-tag-operator {
@ -883,12 +882,12 @@ export default {
}
html[dir='rtl'] .searh-field .el-tag-value {
border-radius: 0.50rem;
border-radius: 0.5rem 0 0 0.5rem;
margin-left: 10px;
}
html[dir='rtl'] .searh-field .el-tag-operator {
border-radius: 0.50rem;
border-radius: 0;
}
.searh-field .el-select.input-new-tag {

2
resources/views/components/contacts/form/general.blade.php
View File

@ -64,7 +64,7 @@
@endif
@if (! $hideLogo)
<x-form.group.file name="logo" label="{{ trans_choice('general.pictures', 1) }}" not-required />
<x-form.group.file name="logo" label="{{ trans_choice('general.pictures', 1) }}" :value="! empty($contact) ? $contact->logo : false" not-required />
@endif
</div>
</x-slot>

10
resources/views/components/contacts/index/content.blade.php
View File

@ -136,15 +136,15 @@
@stack('name_td_start')
@if (! $hideName)
<x-slot name="first" class="flex items-center">
@if ($showPicture)
@if (is_object($item->picture))
<img src="{{ Storage::url($item->picture->id) }}" class="absolute w-6 h-6 bottom-6 rounded-full mr-2 hidden lg:block" alt="{{ $item->name }}" title="{{ $item->name }}">
@if ($showLogo)
@if (is_object($item->logo))
<img src="{{ Storage::url($item->logo->id) }}" class="absolute w-6 h-6 bottom-6 rounded-full mr-2 hidden lg:block" alt="{{ $item->name }}" title="{{ $item->name }}">
@else
<img src="{{ asset('public/img/user.svg') }}" class="absolute w-6 h-6 bottom-6 rounded-full mr-2 hidden lg:block" alt="{{ $item->name }}"/>
@endif
@endif
<div class="truncate {{ $showPicture ? ' ltr:pl-8 rtl:pr-8' : '' }}">
<div class="truncate {{ $showLogo ? ' ltr:pl-8 rtl:pr-8' : '' }}">
{{ $item->name }}
</div>
@ -157,7 +157,7 @@
@stack('tax_number_td_start')
@if (! $hideTaxNumber)
<x-slot name="second" class="w-32 {{ $showPicture ? ' ltr:pl-8 rtl:pr-8' : '' }}">
<x-slot name="second" class="w-32 {{ $showLogo ? ' ltr:pl-8 rtl:pr-8' : '' }}">
{{ $item->tax_number }}
</x-slot>
@endif

2
resources/views/components/reports/summary/chart.blade.php
View File

@ -3,7 +3,7 @@
<div class="w-full lg:w-6/12 lg:ltr:pl-24 lg:rtl:pr-24">
<div class="relative mb-10" x-data="{ toggle: 'donut' }">
<div class="flex border-b pb-2">
<div class="w-full lg:w-11/12 text-xl text-left text-black-400">
<div class="w-full lg:w-11/12 ltr:text-xl rtl:text-right text-left text-black-400">
<h2 x-show="toggle === 'donut'">{{ trans('general.timeline') }}</h2>
<h2 x-show="toggle === 'bar'">{{ trans('general.distribution') }}</h2>
</div>

2
resources/views/purchases/vendors/index.blade.php vendored
View File

@ -16,7 +16,7 @@
</x-slot>
<x-slot name="content">
<x-contacts.index.content type="vendor" :contacts="$vendors" show-picture />
<x-contacts.index.content type="vendor" :contacts="$vendors" show-logo />
</x-slot>
<x-contacts.script type="vendor" />