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

Merge branch 'master' into form-elements

Browse Source
This commit is contained in:
Burak Civan
2022-07-04 15:10:50 +03:00
committed by GitHub
parent c5703e633a da6eabc0d2
commit fc3bdad69d
115 changed files with 973 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/views/components/button/hover.blade.php Normal file
View File

@ -0,0 +1,9 @@
<span
@class([
$color,
$groupHover ? 'group-hover:bg-full-2' : 'hover:bg-full-2',
'bg-no-repeat bg-0-2 bg-0-full bg-gradient-to-b from-transparent transition-backgroundSize'
])
>
{!! $slot !!}
</span>

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

@ -18,7 +18,7 @@
<tbody>
<tr>
@stack('move_td_start')
<td class="align-middle border-b-0 move flex items-center justify-center" style="width:24px; height:100px; color: #8898aa;">
<td class="align-middle border-b-0 flex items-center justify-center" style="width:24px; height:100px; color: #8898aa;">
<span class="w-6 material-icons">list</span>
</td>
@stack('move_td_end')
@ -147,7 +147,7 @@
@stack('total_td_start')
<td class="px-3 py-3 text-right border-b-0 total">
<td class="px-3 py-3 text-right border-b-0 total">
@if (! $hideItemAmount)
<div>
<x-form.input.money
@ -171,7 +171,7 @@
@stack('delete_td_start')
<td class="text-right group">
<button type="button" @click="onDeleteItem(index)" class="btn btn-link btn-delete w-6 h-7 flex items-center rounded-lg p-0 group-hover:bg-gray-100">
<button type="button" @click="onDeleteItem(index)" class="w-6 h-7 flex items-center rounded-lg p-0 group-hover:bg-gray-100">
<span class="w-full material-icons-outlined text-lg text-gray-300 group-hover:text-gray-500">delete</span>
</button>
</td>
@ -189,20 +189,20 @@
<div class="absolute -top-6 left-3 flex items-center">
@if (! $hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
<div class="text-left border-0 p-0 mr-16" v-if="!row.add_discount">
<button type="button" class="text-xs text-purple" @click="onAddLineDiscount(index)">
<x-link.hover color="to-purple">
<x-button type="button" class="text-xs text-purple" @click="onAddLineDiscount(index)" override="class">
<x-button.hover color="to-purple">
{{ trans('general.title.add', ['type' => trans('invoices.discount')]) }}
</x-link.hover>
</button>
</x-button.hover>
</x-button>
</div>
@endif
<div class="text-right border-0 p-0 pr-4">
<button type="button" class="text-xs text-purple" @click="onAddTax(index)">
<x-link.hover color="to-purple">
<x-button type="button" class="text-xs text-purple" @click="onAddTax(index)" override="class">
<x-button.hover color="to-purple">
{{ trans('general.title.add', ['type' => trans_choice('general.taxes', 1)]) }}
</x-link.hover>
</button>
</x-button.hover>
</x-button>
</div>
</div>
</div>
@ -210,7 +210,7 @@
<div v-if="row.add_discount" class="flex items-center justify-between pb-3 ml-2">
@stack('discount_input_start')
<div class="form-group mb-0 w-100" style="display: inline-block; position: relative;">
<div class="mb-0" style="display: inline-block; position: relative;">
<div class="flex items-center">
<div class="w-16 flex items-center bg-gray-200 p-1 ltr:mr-2 rtl:ml-2 rounded-lg">
<button type="button"
@ -344,7 +344,7 @@
</div>
<div class="pl-2 group">
<button type="button" @click="onDeleteTax(index, row_tax_index)" class="btn btn-link btn-delete w-6 h-7 flex items-center rounded-lg p-0 group-hover:bg-gray-100">
<button type="button" @click="onDeleteTax(index, row_tax_index)" class="w-6 h-7 flex items-center rounded-lg p-0 group-hover:bg-gray-100">
<span class="w-full material-icons-outlined text-lg text-gray-300 group-hover:text-gray-500">delete</span>
</button>
</div>
@ -409,7 +409,7 @@
</div>
<div class="pl-2 group">
<button type="button" @click="onDeleteTax(index, 999)" class="btn btn-link btn-delete w-6 h-7 flex items-center rounded-lg p-0 group-hover:bg-gray-100">
<button type="button" @click="onDeleteTax(index, 999)" class="w-6 h-7 flex items-center rounded-lg p-0 group-hover:bg-gray-100">
<span class="w-full material-icons-outlined text-lg text-gray-300 group-hover:text-gray-500">delete</span>
</button>
</div>

4
resources/views/components/documents/form/recurring_metadata.blade.php
View File

@ -25,7 +25,7 @@
@stack('issue_start')
@if (! $hideIssuedAt)
<div class="form-group form-group relative sm:col-span-3">
<div class="relative sm:col-span-3">
<x-form.label>
{{ trans($textIssuedAt) }}
</x-form.label>
@ -61,7 +61,7 @@
@stack('document_number_start')
@if (! $hideDocumentNumber)
<div class="form-group form-group relative sm:col-span-3">
<div class="relative sm:col-span-3">
<x-form.label>
{{ trans($textDocumentNumber) }}
</x-form.label>

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

@ -80,9 +80,9 @@
<td class="text-right border-t-0 border-r-0 border-b-0 align-middle py-0 pr-0">
<div v-if="show_discount_text" v-if="!totals.discount_text" @click="onAddDiscount()">
<x-link.hover color="to-purple">
<x-button.hover color="to-purple">
{{ trans('invoices.add_discount') }}
</x-link.hover>
</x-button.hover>
</div>
<span v-if="totals.discount_text" v-html="totals.discount_text"></span>

12
resources/views/components/documents/show/get-paid.blade.php
View File

@ -62,16 +62,16 @@
@if (! empty($transaction->contact) && $transaction->contact->email)
<x-button id="button-email-send" class="text-purple mt-1" override="class" @click="onEmail('{{ route($transactionEmailRoute, $transaction->id) }}')">
<x-link.hover color="to-purple">
<x-button.hover color="to-purple">
{{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }}
</x-link.hover>
</x-button.hover>
</x-button>
@else
<x-tooltip message="{{ trans('invoices.messages.email_required') }}" placement="top">
<x-button class="text-purple mt-1" override="class" disabled="disabled">
<x-link.hover color="to-purple">
<x-button.hover color="to-purple">
{{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }}
</x-link.hover>
</x-button.hover>
</x-button>
</x-tooltip>
@endif
@ -84,9 +84,9 @@
class="text-purple mt-1"
override="class"
>
<x-link.hover color="to-purple">
<x-button.hover color="to-purple">
{{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }}
</x-link.hover>
</x-button.hover>
</x-button>
<span> - </span>

12
resources/views/components/documents/show/make-payment.blade.php
View File

@ -46,16 +46,16 @@
@if (! empty($transaction->contact) && $transaction->contact->email)
<x-button id="button-email-send" class="text-purple mt-1" override="class" @click="onEmail('{{ route($transactionEmailRoute, $transaction->id) }}')">
<x-link.hover color="to-purple">
<x-button.hover color="to-purple">
{{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }}
</x-link.hover>
</x-button.hover>
</x-button>
@else
<x-tooltip message="{{ trans('invoices.messages.email_required') }}" placement="top">
<x-button class="text-purple mt-1" override="class" disabled="disabled">
<x-link.hover color="to-purple">
<x-button.hover color="to-purple">
{{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }}
</x-link.hover>
</x-button.hover>
</x-button>
</x-tooltip>
@endif
@ -68,9 +68,9 @@
class="text-purple mt-1"
override="class"
>
<x-link.hover color="to-purple">
<x-button.hover color="to-purple">
{{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }}
</x-link.hover>
</x-button.hover>
</x-button>
<span> - </span>

2
resources/views/components/form/group/attachment.blade.php
View File

@ -3,7 +3,7 @@
label="{{ trans('general.attachment') }}"
singleWidthClasses
not-required
dropzone-class="w-100"
dropzone-class="w-full"
multiple="multiple"
:options="['acceptedFiles' => $file_types]"
form-group-class="sm:col-span-6"

2
resources/views/components/form/group/checkbox.blade.php
View File

@ -1,7 +1,7 @@
@stack($name . '_input_start')
<div
@class([
'form-group relative',
'relative',
$formGroupClass,
'required' => $required,
'readonly' => $readonly,

2
resources/views/components/form/group/color.blade.php
View File

@ -1,7 +1,7 @@
@stack($name . '_input_start')
<akaunting-color
@class([
'form-group relative',
'relative',
$formGroupClass,
'required' => $required,
'readonly' => $readonly,

2
resources/views/components/form/group/date.blade.php
View File

@ -2,7 +2,7 @@
<akaunting-date
@class([
'form-group relative',
'relative',
$formGroupClass,
'required' => $required,
'readonly' => $readonly,

2
resources/views/components/form/group/date_time.blade.php
View File

@ -2,7 +2,7 @@
<akaunting-date
@class([
'form-group relative',
'relative',
$formGroupClass,
'required' => $required,
'readonly' => $readonly,

2
resources/views/components/form/group/editor.blade.php
View File

@ -1,7 +1,7 @@
@stack($name . '_input_start')
<div
@class([
'form-group relative',
'relative',
$formGroupClass,
'required' => $required,
'readonly' => $readonly,

3
resources/views/components/form/group/email.blade.php
View File

@ -1,7 +1,7 @@
@stack($name . '_input_start')
<div
@class([
'form-group relative',
'relative',
$formGroupClass,
'required' => $required,
'readonly' => $readonly,
@ -30,7 +30,6 @@
@endif
<div @class([
'input-group input-group-merge',
$inputGroupClass,
])
>

3
resources/views/components/form/group/file.blade.php
View File

@ -1,7 +1,7 @@
@stack($name . '_input_start')
<div
@class([
'form-group relative',
'relative',
$formGroupClass,
'required' => $required,
'readonly' => $readonly,
@ -30,7 +30,6 @@
@endif
<div @class([
'input-group input-group-merge',
$inputGroupClass,
])
>

2
resources/views/components/form/group/invoice_text.blade.php
View File

@ -18,7 +18,7 @@
>
<akaunting-select
@class([
'form-group relative',
'relative',
$formGroupClass,
'required' => $required,
'readonly' => $readonly,

3
resources/views/components/form/group/number.blade.php
View File

@ -1,7 +1,7 @@
@stack($name . '_input_start')
<div
@class([
'form-group relative',
'relative',
$formGroupClass,
'required' => $required,
'readonly' => $readonly,
@ -30,7 +30,6 @@
@endif
<div @class([
'input-group input-group-merge',
$inputGroupClass,
])
>

3
resources/views/components/form/group/password.blade.php
View File

@ -1,7 +1,7 @@
@stack($name . '_input_start')
<div
@class([
'form-group relative',
'relative',
$formGroupClass,
'required' => $required,
'readonly' => $readonly,
@ -30,7 +30,6 @@
@endif
<div @class([
'input-group input-group-merge',
$inputGroupClass,
])
>

2
resources/views/components/form/group/radio.blade.php
View File

@ -1,7 +1,7 @@
@stack($name . '_input_start')
<div
@class([
'form-group relative',
'relative',
$formGroupClass,
'required' => $required,
'readonly' => $readonly,

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

@ -6,7 +6,7 @@
<akaunting-select
@endif
@class([
'form-group relative',
'relative',
$formGroupClass,
'required' => $required,
'readonly' => $readonly,

3
resources/views/components/form/group/text.blade.php
View File

@ -1,7 +1,7 @@
@stack($name . '_input_start')
<div
@class([
'form-group relative',
'relative',
$formGroupClass,
'required' => $required,
'readonly' => $readonly,
@ -30,7 +30,6 @@
@endif
<div @class([
'input-group input-group-merge',
$inputGroupClass,
])
>

2
resources/views/components/form/group/textarea.blade.php
View File

@ -1,7 +1,7 @@
@stack($name . '_input_start')
<div
@class([
'form-group relative',
'relative',
$formGroupClass,
'required' => $required,
'readonly' => $readonly,

2
resources/views/components/form/group/time.blade.php
View File

@ -2,7 +2,7 @@
<akaunting-date
@class([
'form-group relative',
'relative',
$formGroupClass,
'required' => $required,
'readonly' => $readonly,

2
resources/views/components/form/group/toggle.blade.php
View File

@ -1,7 +1,7 @@
@stack($name . '_input_start')
<div
class="form-group sm:col-span-3 {{ isset($attributes['required']) ? ' required' : '' }}{{ isset($attributes['readonly']) ? ' readonly' : '' }}{{ isset($attributes['disabled']) ? ' disabled' : '' }}"
class="sm:col-span-3 {{ isset($attributes['required']) ? ' required' : '' }}{{ isset($attributes['readonly']) ? ' readonly' : '' }}{{ isset($attributes['disabled']) ? ' disabled' : '' }}"
:class="[{'has-error': {{ isset($attributes['v-error']) ? $attributes['v-error'] : 'form.errors.get("' . $name . '")' }} }]"
@if (isset($attributes['show']))
v-if="{{ $attributes['show'] }}"

2
resources/views/components/form/input/color.blade.php
View File

@ -1,7 +1,7 @@
@stack($name . '_input_start')
<akaunting-color
@class([
'form-group relative',
'relative',
$formGroupClass,
'required' => $required,
'readonly' => $readonly,

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

@ -4,7 +4,7 @@
<akaunting-select
@endif
@class([
'form-group relative',
'relative',
$formGroupClass,
'required' => $required,
'readonly' => $readonly,

10
resources/views/components/index/bulkaction/index.blade.php
View File

@ -54,13 +54,13 @@
@endif
@endforeach
</div>
<div class="ltr:mr-4 rtl:ml-4" v-if="bulk_action.count">
<button type="button" @click="onClearBulkAction">
<x-link.hover>
<x-button @click="onClearBulkAction" class="bg-transparent" override="class">
<x-button.hover>
{{ trans('general.clear') }}
</x-link.hover>
</button>
</x-button.hover>
</x-button>
</div>
</div>

4
resources/views/components/layouts/admin/menu.blade.php
View File

@ -113,9 +113,9 @@
<div class="flex ltr:ml-2 rtl:mr-2">
<span class="w-28 text-left block text-base truncate">
<x-link.hover>
<x-button.hover>
{{ Str::limit(setting('company.name'), 22) }}
</x-link.hover>
</x-button.hover>
</span>
@can('read-common-companies')

4
resources/views/components/layouts/portal/menu.blade.php
View File

@ -84,9 +84,9 @@
<div class="flex ltr:ml-2 rtl:mr-2">
<span class="w-28 text-left block text-base truncate">
<x-link.hover>
<x-button.hover>
{{ Str::limit(setting('company.name'), 22) }}
</x-link.hover>
</x-button.hover>
</span>
@can('read-common-companies')

1
resources/views/components/link/hover.blade.php
View File

@ -7,4 +7,3 @@
>
{!! $slot !!}
</span>

6
resources/views/components/modules/items.blade.php
View File

@ -10,11 +10,11 @@
@if ($attributes->has('route'))
<div class="flex justify-center items-center group">
<a href="{{ route($attributes->get('route')) }}">
<x-link.hover group-hover>
<x-link href="{{ route($attributes->get('route')) }}" class="bg-transparent" override="class">
<x-link.hover group-hover>
{{ trans('modules.see_all_type', ['type' => $attributes->get('title')]) }}
</x-link.hover>
</a>
</x-link>
<i class="material-icons text-sm ltr:ml-1 rtl:mr-1 transform transition-all group-hover:translate-x-1">arrow_forward</i>
</div>

4
resources/views/components/show/accordion/head.blade.php
View File

@ -1,8 +1,8 @@
<div>
<h2 class="lg:text-lg font-medium text-black">
<x-link.hover group-hover>
<x-button.hover group-hover>
{{ $title }}
</x-link.hover>
</x-button.hover>
</h2>
@if (! empty($description))

9
resources/views/components/show/no-records.blade.php
View File

@ -8,7 +8,6 @@
<img src="{{ $image }}" class="w-60 h-60 object-contain mt-10 m-auto" />
</div>
<div @class([
'lg:w-3/5',
$textColor,
@ -22,11 +21,11 @@
@if (! empty($button) && $button->isNotEmpty())
{!! $button !!}
@else
<a href="{!! $url !!}">
<x-link.hover color="to-white">
<x-link href="{!! $url !!}" class="bg-transparent" override="class">
<x-link.hover color="to-white">
{{ $textAction }}
</x-link.hover>
</a>
</x-link>
@endif
</div>
</div>
</div>

6
resources/views/components/tips/fixed.blade.php
View File

@ -14,11 +14,11 @@
{!! $item->description !!}
</p>
<a href="{{ $item->action }}" class="font-light text-sm" target="_blank">
<x-link.hover>
<x-link href="{{ $item->action }}" class="font-light text-sm" override="class" target="_blank">
<x-link.hover>
{{ $item->learn_more }}
</x-link.hover>
</a>
</x-link>
</div>
<div class="absolute ltr:right-0 rtl:left-0 -top-4">

4
resources/views/components/tips/relative.blade.php
View File

@ -14,11 +14,11 @@
{!! $item->description !!}
</p>
<a href="{{ $item->action }}" class="font-light text-sm">
<x-link href="{{ $item->action }}" class="font-light text-sm" override="class" target="_blank">
<x-link.hover>
{{ $item->learn_more }}
</x-link.hover>
</a>
</x-link>
</div>
<div class="absolute ltr:right-0 rtl:left-0 -top-4">

4
resources/views/components/transactions/show/attachment.blade.php
View File

@ -6,9 +6,9 @@
x-on:click="attachment !== 1 ? attachment = 1 : attachment = null"
>
<span class="font-medium">
<x-link.hover group-hover>
<x-button.hover group-hover>
{{ trans_choice('general.attachments', 2) }}
</x-link.hover>
</x-button.hover>
</span>
<div class="text-black-400 text-sm">

4
resources/views/components/transactions/show/children.blade.php
View File

@ -3,9 +3,9 @@
x-on:click="children !== 1 ? children = 1 : children = null"
>
<span class="font-medium">
<x-link.hover group-hover>
<x-button.hover group-hover>
{{ trans_choice('general.transactions', 2) }}
</x-link.hover>
</x-button.hover>
</span>
<div class="text-black-400 text-sm">

4
resources/views/components/transactions/show/create.blade.php
View File

@ -5,9 +5,9 @@
x-on:click="create !== 1 ? create = 1 : create = null"
>
<span class="font-medium">
<x-link.hover>
<x-button.hover>
{{ trans('general.create') }}
</x-link.hover>
</x-button.hover>
</span>
<div class="text-black-400 text-sm">

4
resources/views/components/transactions/show/schedule.blade.php
View File

@ -8,9 +8,9 @@
x-on:click="schedule !== 1 ? schedule = 1 : schedule = null"
>
<span class="font-medium">
<x-link.hover group-hover>
<x-button.hover group-hover>
{{ trans_choice('general.schedules', 1) }}
</x-link.hover>
</x-button.hover>
</span>
<div class="text-black-400 text-sm">

6
resources/views/components/transfers/show/attachment.blade.php
View File

@ -2,9 +2,9 @@
<div class="border-b border-gray-200 pb-4" x-data="{ attachment : null }">
<div class="relative w-full text-left cursor-pointer group" x-on:click="attachment !== 1 ? attachment = 1 : attachment = null">
<span class="font-medium">
<x-link.hover group-hover>
<x-button.hover group-hover>
{{ trans_choice('general.attachments', 2) }}
</x-link.hover>
</x-button.hover>
</span>
<div class="text-black-400 text-sm">
@ -17,7 +17,7 @@
<div class="overflow-hidden transition-transform origin-top-left ease-linear duration-100"
x-ref="container1"
x-bind:class="attachment == 1 ? 'h-auto ' : 'scale-y-0 h-0'"
>
@foreach ($transfer->attachment as $file)
<x-media.file :file="$file" />
@endforeach

4
resources/views/components/transfers/show/create.blade.php
View File

@ -3,9 +3,9 @@
<div class="border-b pb-4" x-data="{ create : null }">
<button class="relative w-full text-left group" x-on:click="create !== 1 ? create = 1 : create = null">
<span class="font-medium">
<x-link.hover group-hover>
<x-button.hover group-hover>
{{ trans('general.create') }}
</x-link.hover>
</x-button.hover>
</span>
<div class="text-black-400 text-sm">

4
resources/views/components/widgets/header.blade.php
View File

@ -7,11 +7,11 @@
<div class="flex items-center">
@if ($report = $class->getReportUrl())
<a href="{{ $report }}" class="text-purple text-sm mr-3">
<x-link href="{{ $report }}" class="text-purple text-sm mr-3" override="class">
<x-link.hover color="to-purple">
{{ trans('widgets.view_report') }}
</x-link.hover>
</a>
</x-link>
@endif
<x-dropdown id="dropdown-widget-{{ $class->model->id }}">