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

Merge branch 'akaunting:master' into master

Browse Source
This commit is contained in:
Burak Civan
2022-06-07 18:17:29 +03:00
committed by GitHub
parent 5f1a33b48c 15c0fa2f76
commit 586db83514
20 changed files with 374 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@
choose-different-contact-text="{{ is_array($textChooseDifferentContact) ? trans($textChooseDifferentContact[0], ['field' => Str::lower(trans_choice($textChooseDifferentContact[1], 1))]) : trans($textChooseDifferentContact) }}"
:add-new="{{ json_encode([
'status' => true,
'text' => trans('general.add_new'),
'text' => is_array($textCreateNewContact) ? trans($textCreateNewContact[0], ['field' => trans_choice($textCreateNewContact[1], 1)]) : trans($textCreateNewContact),
'new_text' => trans('modules.new'),
'buttons' => [
'cancel' => [

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

@ -9,5 +9,5 @@
:search-char-limit="{{ $searchCharLimit }}"
@item="onSelectedItem($event)"
add-item-text="{{ trans('general.form.add_an', ['field' => trans_choice('general.items', 1)]) }}"
create-new-item-text="{{ trans('general.title.create', ['type' => trans_choice('general.items', 1)]) }}"
create-new-item-text="{{ trans('general.title.new', ['type' => trans_choice('general.items', 1)]) }}"
></akaunting-item-button>

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

@ -350,7 +350,7 @@
:value="tax_id"
:add-new="{{ json_encode([
'status' => true,
'text' => trans('general.add_new'),
'text' => trans('general.title.new', ['type' => trans_choice('general.taxes', 1)]),
'path' => route('modals.taxes.create'),
'type' => 'modal',
'field' => [

1
resources/views/components/form/group/country.blade.php
View File

@ -5,4 +5,5 @@
:selected="setting('company.country')"
not-required
model="form.country"
form-group-class="{{ $formGroupClass }}"
/>

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

@ -74,7 +74,7 @@
@if (! empty($addNew))
:add-new="{{ json_encode([
'status' => true,
'text' => trans('general.add_new'),
'text' => trans('general.title.new', ['type' => $label ?? '']),
'path' => isset($attributes['path']) ? $attributes['path']: false,
'type' => isset($attributes['type']) ? $attributes['type'] : 'modal',
'field' => [