From 61a35c6295a27d67313781e2015b97f5a31ea5a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 2 Jun 2022 10:26:07 +0300 Subject: [PATCH 1/5] formatting --- .../View/Components/Transactions/Show.php | 6 +-- app/Jobs/Common/DuplicateContact.php | 54 +++++++++---------- config/type.php | 4 +- .../transactions/show/schedule.blade.php | 2 +- 4 files changed, 34 insertions(+), 32 deletions(-) diff --git a/app/Abstracts/View/Components/Transactions/Show.php b/app/Abstracts/View/Components/Transactions/Show.php index 64bb0994e..35d6e5d2c 100644 --- a/app/Abstracts/View/Components/Transactions/Show.php +++ b/app/Abstracts/View/Components/Transactions/Show.php @@ -1082,14 +1082,14 @@ abstract class Show extends Component 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)) { return $translation; } - return 'general.revenues'; + return 'general.incomes'; } } diff --git a/app/Jobs/Common/DuplicateContact.php b/app/Jobs/Common/DuplicateContact.php index 86eb32cdd..b13e9f002 100644 --- a/app/Jobs/Common/DuplicateContact.php +++ b/app/Jobs/Common/DuplicateContact.php @@ -1,27 +1,27 @@ -model = $model; - - parent::__construct($model); - } - - public function handle(): Contact - { - \DB::transaction(function () { - $this->clone = $this->model->duplicate(); - }); - - return $this->clone; - } -} +model = $model; + + parent::__construct($model); + } + + public function handle(): Contact + { + \DB::transaction(function () { + $this->clone = $this->model->duplicate(); + }); + + return $this->clone; + } +} diff --git a/config/type.php b/config/type.php index fe2a1bacf..c27514990 100644 --- a/config/type.php +++ b/config/type.php @@ -326,7 +326,7 @@ return [ 'translation' => [ 'prefix' => 'transactions', // this translation file name. 'new' => 'general.recurring_incomes', - 'transactions' => 'general.expenses', + 'transactions' => 'general.incomes', ], 'image_empty_page' => 'public/img/empty_pages/recurring_templates.png', 'script' => [ @@ -377,7 +377,9 @@ return [ //'create' => 'create-banking-transactions', ], 'translation' => [ + 'prefix' => 'transactions', // this translation file name. 'new' => 'general.recurring_expenses', + 'transactions' => 'general.expenses', ], 'image_empty_page' => 'public/img/empty_pages/recurring_templates.png', 'script' => [ diff --git a/resources/views/components/transactions/show/schedule.blade.php b/resources/views/components/transactions/show/schedule.blade.php index 9a67cf7dc..df4d28e6c 100644 --- a/resources/views/components/transactions/show/schedule.blade.php +++ b/resources/views/components/transactions/show/schedule.blade.php @@ -26,7 +26,7 @@ @if ($next = $transaction->recurring->getNextRecurring()) {{ trans('recurring.next_date', ['date' => $next->format(company_date_format())]) }}
- @if (($transaction->recurring->limit_by == 'count')) + @if ($transaction->recurring->limit_by == 'count') @if ($transaction->recurring->limit_count == 0) {{ trans('recurring.ends_never') }} @else From d1e7d4fadc790ca1abbd7a09e5d097ad168251c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 2 Jun 2022 11:04:30 +0300 Subject: [PATCH 2/5] typo --- resources/views/components/documents/show/content.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/components/documents/show/content.blade.php b/resources/views/components/documents/show/content.blade.php index 348ccbf27..f1c6f453d 100644 --- a/resources/views/components/documents/show/content.blade.php +++ b/resources/views/components/documents/show/content.blade.php @@ -18,7 +18,7 @@ @php $recurring_message = trans('recurring.message_parent', [ 'type' => mb_strtolower(trans_choice($textRecurringType, 1)), - 'link' => '' . $parent->id . '' + 'link' => '' . $parent->id . '' ]); @endphp From d29525e04e5ffeb122863af532566d888fcc66ce Mon Sep 17 00:00:00 2001 From: Marko Date: Thu, 2 Jun 2022 11:11:50 +0200 Subject: [PATCH 3/5] Update language.php --- config/language.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/language.php b/config/language.php index f1d04b2be..049e2839c 100644 --- a/config/language.php +++ b/config/language.php @@ -192,7 +192,7 @@ return [ ['short' => 'sr', 'long' => 'sr-CS', 'english' => 'Serbian (Latin)', 'native' => 'Српски језик', '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' => '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' => 'th', 'long' => 'th-TH', 'english' => 'Thai', 'native' => 'ไทย', 'direction' => 'ltr'], ['short' => 'tr', 'long' => 'tr-TR', 'english' => 'Turkish', 'native' => 'Türkçe', 'direction' => 'ltr'], From fd14146fa3230fa0b2c1917dce7750ef4b83d41d Mon Sep 17 00:00:00 2001 From: Marko Date: Thu, 2 Jun 2022 11:15:34 +0200 Subject: [PATCH 4/5] Close strong element --- resources/views/components/documents/template/default.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/components/documents/template/default.blade.php b/resources/views/components/documents/template/default.blade.php index 00d6932c1..1b85ae7d0 100644 --- a/resources/views/components/documents/template/default.blade.php +++ b/resources/views/components/documents/template/default.blade.php @@ -296,7 +296,7 @@
- {!! nl2br($document->footer) !!} + {!! nl2br($document->footer) !!}
From 19971413b4cf00e6eba1841105c46fad127eff7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 2 Jun 2022 13:27:07 +0300 Subject: [PATCH 5/5] missing bulk action all input --- resources/views/banking/recurring_transactions/index.blade.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/views/banking/recurring_transactions/index.blade.php b/resources/views/banking/recurring_transactions/index.blade.php index d9b01df78..ddc1fb96a 100644 --- a/resources/views/banking/recurring_transactions/index.blade.php +++ b/resources/views/banking/recurring_transactions/index.blade.php @@ -39,6 +39,9 @@ +