From fd76c744728a411f4b7470fab33c6ab3b89215f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Thu, 16 Jun 2022 10:45:15 +0300 Subject: [PATCH] Fixed transaction index search and filter, show receipt language text.. --- app/Traits/Translations.php | 3 +++ app/View/Components/SearchString.php | 9 +++++---- .../components/transactions/template/default.blade.php | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/Traits/Translations.php b/app/Traits/Translations.php index 3b557d2b1..7efaa59ff 100644 --- a/app/Traits/Translations.php +++ b/app/Traits/Translations.php @@ -3,11 +3,14 @@ namespace App\Traits; use Throwable; +use Illuminate\Support\Arr; trait Translations { public function findTranslation($keys, $number = 2) { + $keys = Arr::wrap($keys); + try { foreach ($keys as $key) { if (is_array($key)) { diff --git a/app/View/Components/SearchString.php b/app/View/Components/SearchString.php index c24479f34..ae524cb70 100644 --- a/app/View/Components/SearchString.php +++ b/app/View/Components/SearchString.php @@ -4,11 +4,12 @@ namespace App\View\Components; use App\Abstracts\View\Component; use App\Traits\DateTime; +use App\Traits\Translations; use Illuminate\Support\Str; class SearchString extends Component { - use DateTime; + use DateTime, Translations; public $filters; @@ -203,16 +204,16 @@ class SearchString extends Component $values = [ [ 'key' => 0, - 'value' => empty($options['translation']) ? trans('general.no') : trans($options['translation'][0]), + 'value' => empty($options['translation']) ? trans('general.no') : $this->findTranslation($options['translation'][0], 1), ], [ 'key' => 1, - 'value' => empty($options['translation']) ? trans('general.yes') : trans($options['translation'][1]), + 'value' => empty($options['translation']) ? trans('general.yes') : $this->findTranslation($options['translation'][1], 1), ], ]; } else if (isset($options['values'])) { foreach ($options['values'] as $key => $value) { - $values[$key] = trans($value); + $values[$key] = $this->findTranslation($value, 1); } } else if ($search = request()->get('search', false)) { $fields = explode(' ', $search); diff --git a/resources/views/components/transactions/template/default.blade.php b/resources/views/components/transactions/template/default.blade.php index 6ae93650b..bd94efb60 100644 --- a/resources/views/components/transactions/template/default.blade.php +++ b/resources/views/components/transactions/template/default.blade.php @@ -60,7 +60,7 @@

- {{ trans($textContentTitle) }} + {{ $textContentTitle != trans_choice($textContentTitle, 1) ? trans_choice($textContentTitle, 1) : trans($textContentTitle) }}