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 form-elements

Browse Source
This commit is contained in:
Burak Civan
2022-06-16 14:47:11 +03:00
parent 48cf229b3c 79f9703635
commit 7f4818c0f7
54 changed files with 1615 additions and 12642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resources/views/banking/accounts/show.blade.php
View File

@ -291,11 +291,17 @@
<x-slot name="first">
{{ $item->contact->name }}
</x-slot>
<x-slot name="second">
<x-slot name="second" class="w-20 font-normal group">
@if ($item->document)
<div data-tooltip-target="tooltip-information-{{ $item->document_id }}" data-tooltip-placement="left" override="class">
<a href="{{ route($item->route_name, $item->route_id) }}" class="font-normal truncate border-b border-black border-dashed">
{{ $item->document->document_number }}
</a>
<div class="w-28 absolute h-10 -ml-12 -mt-6"></div>
<x-documents.index.information :document="$item->document" />
</div>
@else
<x-empty-data />
@endif
@ -444,6 +450,16 @@
</x-show.content.right>
</x-show.content>
</x-show.container>
<akaunting-connect-transactions
:show="connect.show"
:transaction="connect.transaction"
:currency="connect.currency"
:documents="connect.documents"
:translations="{{ json_encode($transactions) }}"
modal-dialog-class="max-w-screen-lg"
v-on:close-modal="connect.show = false"
></akaunting-connect-transactions>
</x-slot>
<x-script folder="banking" file="accounts" />

1
resources/views/banking/transactions/index.blade.php
View File

@ -59,6 +59,7 @@
<x-slot name="third"
amount="{{ money($totals['profit'], setting('default.currency'), true) }}"
title="{{ trans_choice('general.profits', 1) }}"
class="cursor-default"
></x-slot>
</x-index.summary>

2
resources/views/components/documents/form/line-item.blade.php
View File

@ -65,7 +65,7 @@
<td class="px-3 py-3 border-b-0 description">
@if (! $hideItemDescription)
<textarea
class="w-full text-sm px-3 py-2.5 mt-1.5 rounded-lg border border-light-gray text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple resize-none"
class="w-full text-sm px-3 py-2.5 mt-1.5 rounded-lg border border-light-gray text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple"
style="height:42px;"
:ref="'items-' + index + '-description'"
placeholder="{{ trans('items.enter_item_description') }}"

2
resources/views/components/documents/form/totals.blade.php
View File

@ -106,7 +106,7 @@
</button>
</div>
<x-form.group.number name="pre_discount" id="pre-discount" form-group-class="-mt-1" v-model="form.discount" @input="onAddTotalDiscount" />
<x-form.group.text name="pre_discount" id="pre-discount" form-group-class="-mt-1" v-model="form.discount" @input="onAddTotalDiscount" />
</div>
</td>

2
resources/views/components/documents/template/default.blade.php
View File

@ -196,7 +196,7 @@
<div class="col-100">
<div class="text extra-spacing">
<table class="lines">
<thead class="bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
<thead style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
<tr>
@stack('name_th_start')
@if (! $hideItems || (! $hideName && ! $hideDescription))

4
resources/views/components/documents/template/modern.blade.php
View File

@ -207,7 +207,7 @@
<div class="col-100">
<div class="text extra-spacing">
<table class="lines modern-lines">
<thead class="bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
<thead style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
<tr>
@stack('name_th_start')
@if (! $hideItems || (! $hideName && ! $hideDescription))
@ -346,7 +346,7 @@
@if (! $hideFooter)
@if ($document->footer)
<div class="row mt-7">
<div class="col-100 py-top p-modern bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
<div class="col-100 py-top p-modern" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
<div class="text pl-2">
<strong class="text-white">
{!! nl2br($document->footer) !!}

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

@ -121,6 +121,10 @@
clearable
@endif
@if (isset($attributes['no-arrow']))
:no-arrow="{{ $attributes['no-arrow'] }}"
@endif
@if (isset($attributes['v-disabled']))
:disabled="{{ $attributes['v-disabled'] }}"
@endif

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

@ -121,6 +121,10 @@
clearable
@endif
@if (isset($attributes['no-arrow']))
:no-arrow="{{ $attributes['no-arrow'] }}"
@endif
@if (isset($attributes['v-disabled']))
:disabled="{{ $attributes['v-disabled'] }}"
@endif

12
resources/views/components/index/summary.blade.php
View File

@ -23,10 +23,10 @@
@elseif (! empty($first))
<div class="w-1/2 sm:w-1/3 text-center">
@if ($first->attributes->has('href'))
<a href="{{ $first->attributes->get('hef') }}" class="group">
<a href="{{ $first->attributes->get('href') }}" class="group">
@endif
@php $text_color = $first->attributes->has('text-color') ? $first->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
<div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
<div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $first->attributes->get('class')])>
{!! $first->attributes->get('amount') !!}
<span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
</div>
@ -51,10 +51,10 @@
@elseif (! empty($second))
<div class="w-1/2 sm:w-1/3 text-center">
@if ($second->attributes->has('href'))
<a href="{{ $second->attributes->get('hef') }}" class="group">
<a href="{{ $second->attributes->get('href') }}" class="group">
@endif
@php $text_color = $second->attributes->has('text-color') ? $second->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
<div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
<div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $second->attributes->get('class')])>
{!! $second->attributes->get('amount') !!}
<span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
</div>
@ -80,10 +80,10 @@
@elseif (! empty($third))
<div class="w-1/2 sm:w-1/3 text-center">
@if ($third->attributes->has('href'))
<a href="{{ $third->attributes->get('hef') }}" class="group">
<a href="{{ $third->attributes->get('href') }}" class="group">
@endif
@php $text_color = $third->attributes->has('text-color') ? $third->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
<div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
<div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $third->attributes->get('class')])>
{!! $third->attributes->get('amount') !!}
<span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
</div>

2
resources/views/components/loading/content.blade.php
View File

@ -1,4 +1,4 @@
<div data-loading-content v-if="content_loading" class="fixed w-4/5 h-screen hidden lg:flex items-center justify-center bg-body top-0 bottom-0 ltr:right-0 rtl:left-0 -mx-1 z-50">
<div data-loading-content v-if="content_loading" class="fixed w-4/5 h-screen lg:flex items-center justify-center bg-body top-0 bottom-0 ltr:right-0 rtl:left-0 -mx-1 z-50">
<img src="{{ asset('public/img/akaunting-loading.gif') }}" class="w-28 h-28 -mt-16" alt="Akaunting" />
</div>
<!--data attr added because for none vue.js pages-->

2
resources/views/components/transactions/show/more-buttons.blade.php
View File

@ -29,7 +29,7 @@
type="button"
class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap"
title="{{ trans('general.connect') }}"
@click="onConnect('{{ route('transactions.dial', $transaction->id) }}')">
@click="onConnectTransactions('{{ route('transactions.dial', $transaction->id) }}')">
<span class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100">{{ trans('general.connect') }}</span>
</button>
@endcan

2
resources/views/components/transactions/template/default.blade.php
View File

@ -60,7 +60,7 @@
<tr>
<td style="width: 60%; padding: 15px 0 15px 0;">
<h2 style="font-size: 12px; font-weight:600;">
{{ trans($textContentTitle) }}
{{ $textContentTitle != trans_choice($textContentTitle, 1) ? trans_choice($textContentTitle, 1) : trans($textContentTitle) }}
</h2>
</td>
</tr>

16
resources/views/modules/api_key/create.blade.php
View File

@ -1,19 +1,9 @@
<x-layouts.modules>
<x-layouts.admin>
<x-slot name="title">
{{ trans('modules.api_key') }}
</x-slot>
<x-slot name="buttons">
<x-link href="{{ route('apps.api-key.create') }}">
{{ trans('modules.api_key') }}
</x-link>
<x-link href="{{ route('apps.my.index') }}">
{{ trans('modules.my_apps') }}
</x-link>
</x-slot>
<x-slot name="content" without-bar>
<x-slot name="content">
<x-form id="form-app" route="apps.api-key.store">
<div class="w-1/2">
<div class="py-8 flex flex-col gap-2">
@ -32,4 +22,4 @@
</x-slot>
<x-script folder="modules" file="apps" />
</x-layouts.modules>
</x-layouts.admin>

2
resources/views/settings/invoice/edit.blade.php
View File

@ -58,7 +58,7 @@
</label>
</div>
<x-form.group.color name="color" label="{{ trans('general.color') }}" />
<x-form.group.color name="color" label="{{ trans('general.color') }}" :value="setting('invoice.color')" />
</x-slot>
</x-form.section>