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

Browse Source
This commit is contained in:
Burak Civan 2022-06-02 16:35:18 +03:00
commit 4f87e09674
8 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Abstracts/View/Components/Transactions/Show.php
View File

@ -1082,14 +1082,14 @@ abstract class Show extends Component
return $textRecurringType; return $textRecurringType;
} }
$default_key = config('type.' . $type . '.translation.prefix'); $default_key = config('type.transaction.' . $type . '.translation.transactions');
$translation = $this->getTextFromConfig($type, 'recurring_tye', $default_key); $translation = $this->getTextFromConfig($type, 'recurring_type', $default_key);
if (! empty($translation)) { if (! empty($translation)) {
return $translation; return $translation;
} }
return 'general.revenues'; return 'general.incomes';
} }
} }

54
app/Jobs/Common/DuplicateContact.php
View File

@ -1,27 +1,27 @@
<?php <?php
namespace App\Jobs\Common; namespace App\Jobs\Common;
use App\Abstracts\Job; use App\Abstracts\Job;
use App\Models\Common\Contact; use App\Models\Common\Contact;
class DuplicateContact extends Job class DuplicateContact extends Job
{ {
protected $clone; protected $clone;
public function __construct(Contact $model) public function __construct(Contact $model)
{ {
$this->model = $model; $this->model = $model;
parent::__construct($model); parent::__construct($model);
} }
public function handle(): Contact public function handle(): Contact
{ {
\DB::transaction(function () { \DB::transaction(function () {
$this->clone = $this->model->duplicate(); $this->clone = $this->model->duplicate();
}); });
return $this->clone; return $this->clone;
} }
} }

2
config/language.php
View File

@ -192,7 +192,7 @@ return [
['short' => 'sr', 'long' => 'sr-CS', 'english' => 'Serbian (Latin)', 'native' => 'Српски језик', 'direction' => 'ltr'], ['short' => 'sr', 'long' => 'sr-CS', 'english' => 'Serbian (Latin)', 'native' => 'Српски језик', 'direction' => 'ltr'],
['short' => 'sq', 'long' => 'sq-AL', 'english' => 'Albanian', 'native' => 'Shqip', 'direction' => 'ltr'], ['short' => 'sq', 'long' => 'sq-AL', 'english' => 'Albanian', 'native' => 'Shqip', 'direction' => 'ltr'],
['short' => 'sk', 'long' => 'sk-SK', 'english' => 'Slovak', 'native' => 'Slovenčina', 'direction' => 'ltr'], ['short' => 'sk', 'long' => 'sk-SK', 'english' => 'Slovak', 'native' => 'Slovenčina', 'direction' => 'ltr'],
['short' => 'sl', 'long' => 'sl-SL', 'english' => 'Slovenian', 'native' => 'Slovenščina', 'direction' => 'ltr'], ['short' => 'sl', 'long' => 'sl-SI', 'english' => 'Slovenian', 'native' => 'Slovenščina', 'direction' => 'ltr'],
['short' => 'sv', 'long' => 'sv-SE', 'english' => 'Swedish', 'native' => 'Svenska', 'direction' => 'ltr'], ['short' => 'sv', 'long' => 'sv-SE', 'english' => 'Swedish', 'native' => 'Svenska', 'direction' => 'ltr'],
['short' => 'th', 'long' => 'th-TH', 'english' => 'Thai', 'native' => 'ไทย', 'direction' => 'ltr'], ['short' => 'th', 'long' => 'th-TH', 'english' => 'Thai', 'native' => 'ไทย', 'direction' => 'ltr'],
['short' => 'tr', 'long' => 'tr-TR', 'english' => 'Turkish', 'native' => 'Türkçe', 'direction' => 'ltr'], ['short' => 'tr', 'long' => 'tr-TR', 'english' => 'Turkish', 'native' => 'Türkçe', 'direction' => 'ltr'],

4
config/type.php
View File

@ -326,7 +326,7 @@ return [
'translation' => [ 'translation' => [
'prefix' => 'transactions', // this translation file name. 'prefix' => 'transactions', // this translation file name.
'new' => 'general.recurring_incomes', 'new' => 'general.recurring_incomes',
'transactions' => 'general.expenses', 'transactions' => 'general.incomes',
], ],
'image_empty_page' => 'public/img/empty_pages/recurring_templates.png', 'image_empty_page' => 'public/img/empty_pages/recurring_templates.png',
'script' => [ 'script' => [
@ -377,7 +377,9 @@ return [
//'create' => 'create-banking-transactions', //'create' => 'create-banking-transactions',
], ],
'translation' => [ 'translation' => [
'prefix' => 'transactions', // this translation file name.
'new' => 'general.recurring_expenses', 'new' => 'general.recurring_expenses',
'transactions' => 'general.expenses',
], ],
'image_empty_page' => 'public/img/empty_pages/recurring_templates.png', 'image_empty_page' => 'public/img/empty_pages/recurring_templates.png',
'script' => [ 'script' => [

3
resources/views/banking/recurring_transactions/index.blade.php
View File

@ -39,6 +39,9 @@
<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">
<x-table.th class="ltr:pr-6 rtl:pl-6 hidden sm:table-cell" override="class">
<x-index.bulkaction.all />
</x-table.th>
<x-table.th class="w-4/12 sm:w-3/12"> <x-table.th class="w-4/12 sm:w-3/12">
<x-slot name="first"> <x-slot name="first">

2
resources/views/components/documents/show/content.blade.php
View File

@ -18,7 +18,7 @@
@php @php
$recurring_message = trans('recurring.message_parent', [ $recurring_message = trans('recurring.message_parent', [
'type' => mb_strtolower(trans_choice($textRecurringType, 1)), 'type' => mb_strtolower(trans_choice($textRecurringType, 1)),
'link' => '<a href="' . route(config('type.document.' . $document->paten->type . '.route.prefix', 'invoices') . '.show', $parent->id) . '"><u>' . $parent->id . '</u></a>' 'link' => '<a href="' . route(config('type.document.' . $document->parent->type . '.route.prefix', 'invoices') . '.show', $parent->id) . '"><u>' . $parent->id . '</u></a>'
]); ]);
@endphp @endphp

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

@ -296,7 +296,7 @@
<div class="row mt-4"> <div class="row mt-4">
<div class="col-100 text-left"> <div class="col-100 text-left">
<div class="text"> <div class="text">
<strong>{!! nl2br($document->footer) !!}<strong> <strong>{!! nl2br($document->footer) !!}</strong>
</div> </div>
</div> </div>
</div> </div>

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

@ -26,7 +26,7 @@
@if ($next = $transaction->recurring->getNextRecurring()) @if ($next = $transaction->recurring->getNextRecurring())
{{ trans('recurring.next_date', ['date' => $next->format(company_date_format())]) }} {{ trans('recurring.next_date', ['date' => $next->format(company_date_format())]) }}
<br> <br>
@if (($transaction->recurring->limit_by == 'count')) @if ($transaction->recurring->limit_by == 'count')
@if ($transaction->recurring->limit_count == 0) @if ($transaction->recurring->limit_count == 0)
{{ trans('recurring.ends_never') }} {{ trans('recurring.ends_never') }}
@else @else