From 7e35aefde60e117a0d6c18d6723eb12839d3cf08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Fri, 25 Dec 2020 13:30:12 +0300 Subject: [PATCH] changed trans and trans_choice location.. --- .../View/Components/DocumentIndex.php | 16 ++-- .../View/Components/DocumentTemplate.php | 94 +++++++++---------- .../Components/Documents/Form/Metadata.php | 16 ++-- .../components/documents/form/items.blade.php | 8 +- .../documents/form/metadata.blade.php | 8 +- .../documents/index/card-body.blade.php | 8 +- .../documents/template/classic.blade.php | 14 +-- .../documents/template/default.blade.php | 18 ++-- .../documents/template/modern.blade.php | 18 ++-- 9 files changed, 100 insertions(+), 100 deletions(-) diff --git a/app/Abstracts/View/Components/DocumentIndex.php b/app/Abstracts/View/Components/DocumentIndex.php index d18bf6080..bc2f9ffad 100644 --- a/app/Abstracts/View/Components/DocumentIndex.php +++ b/app/Abstracts/View/Components/DocumentIndex.php @@ -522,7 +522,7 @@ abstract class DocumentIndex extends Component return $textDocumentNumber; } - return trans_choice('general.numbers', 1); + return 'general.numbers'; } protected function getClassDocumentNumber($type, $classDocumentNumber) @@ -548,12 +548,12 @@ abstract class DocumentIndex extends Component case 'sale': case 'income': case 'invoice': - $textContactName = trans_choice('general.customers', 1); + $textContactName = 'general.customers'; break; case 'bill': case 'expense': case 'purchase': - $textContactName = trans_choice('general.vendors', 1); + $textContactName = 'general.vendors'; break; } @@ -596,12 +596,12 @@ abstract class DocumentIndex extends Component case 'sale': case 'income': case 'invoice': - $textIssueAt = trans('invoices.invoice_date'); + $textIssueAt = 'invoices.invoice_date'; break; case 'bill': case 'expense': case 'purchase': - $textIssueAt = trans('bills.bill_date'); + $textIssueAt = 'bills.bill_date'; break; } @@ -631,12 +631,12 @@ abstract class DocumentIndex extends Component case 'sale': case 'income': case 'invoice': - $textDueAt = trans('invoices.due_date'); + $textDueAt = 'invoices.due_date'; break; case 'bill': case 'expense': case 'purchase': - $textDueAt = trans('bills.due_date'); + $textDueAt = 'bills.due_date'; break; } @@ -674,7 +674,7 @@ abstract class DocumentIndex extends Component $textDocumentStatus = 'bills.statuses.'; break; } - + return $textDocumentStatus; } diff --git a/app/Abstracts/View/Components/DocumentTemplate.php b/app/Abstracts/View/Components/DocumentTemplate.php index 3a9fe0f9b..c148f669e 100644 --- a/app/Abstracts/View/Components/DocumentTemplate.php +++ b/app/Abstracts/View/Components/DocumentTemplate.php @@ -88,7 +88,7 @@ abstract class DocumentTemplate extends Component public $hidePrice; public $hideDiscount; - + public $hideAmount; /** @var string */ @@ -254,12 +254,12 @@ abstract class DocumentTemplate extends Component case 'sale': case 'income': case 'invoice': - $textDocumentNumber = trans('invoices.invoice_number'); + $textDocumentNumber = 'invoices.invoice_number'; break; case 'bill': case 'expense': case 'purchase': - $textDocumentNumber = trans('bills.bill_number'); + $textDocumentNumber = 'bills.bill_number'; break; } @@ -276,12 +276,12 @@ abstract class DocumentTemplate extends Component case 'sale': case 'income': case 'invoice': - $textOrderNumber = trans('invoices.order_number'); + $textOrderNumber = 'invoices.order_number'; break; case 'bill': case 'expense': case 'purchase': - $textOrderNumber = trans('bills.order_number'); + $textOrderNumber = 'bills.order_number'; break; } @@ -298,12 +298,12 @@ abstract class DocumentTemplate extends Component case 'sale': case 'income': case 'invoice': - $textContactInfo = trans('invoices.bill_to'); + $textContactInfo = 'invoices.bill_to'; break; case 'bill': case 'expense': case 'purchase': - $textContactInfo = trans('bills.bill_from'); + $textContactInfo = 'bills.bill_from'; break; } @@ -320,12 +320,12 @@ abstract class DocumentTemplate extends Component case 'sale': case 'income': case 'invoice': - $textIssuedAt = trans('invoices.invoice_date'); + $textIssuedAt = 'invoices.invoice_date'; break; case 'bill': case 'expense': case 'purchase': - $textIssuedAt = trans('bills.bill_date'); + $textIssuedAt = 'bills.bill_date'; break; } @@ -342,68 +342,68 @@ abstract class DocumentTemplate extends Component case 'sale': case 'income': case 'invoice': - $textDueAt = trans('invoices.due_date'); + $textDueAt = 'invoices.due_date'; break; case 'bill': case 'expense': case 'purchase': - $textDueAt = trans('bills.due_date'); + $textDueAt = 'bills.due_date'; break; } return $textDueAt; } - protected function getTextItems($type, $text_items) + protected function getTextItems($type, $textItems) { - if (!empty($text_items)) { - return $text_items; + if (!empty($textItems)) { + return $textItems; } switch ($type) { case 'sale': case 'income': case 'invoice': - $text_items = trans_choice(setting('invoice.item_name', 'general.items'), 2); + $textItems = setting('invoice.item_name', 'general.items'); - if ($text_items == 'custom') { - $text_items = setting('invoice.item_name_input'); + if ($textItems == 'custom') { + $textItems = setting('invoice.item_name_input'); } break; case 'bill': case 'expense': case 'purchase': - $text_items = trans_choice('general.items', 2); + $textItems = 'general.items'; break; } - return $text_items; + return $textItems; } - protected function getTextQuantity($type, $text_quantity) + protected function getTextQuantity($type, $textQuantity) { - if (!empty($text_quantity)) { - return $text_quantity; + if (!empty($textQuantity)) { + return $textQuantity; } switch ($type) { case 'sale': case 'income': case 'invoice': - $text_quantity = trans(setting('invoice.quantity_name', 'invoices.quantity')); + $textQuantity = setting('invoice.quantity_name', 'invoices.quantity'); - if ($text_quantity == 'custom') { - $text_quantity = setting('invoice.quantity_name_input'); + if ($textQuantity == 'custom') { + $textQuantity = setting('invoice.quantity_name_input'); } break; case 'bill': case 'expense': case 'purchase': - $text_quantity = trans('bills.quantity'); + $textQuantity = 'bills.quantity'; break; } - return $text_quantity; + return $textQuantity; } protected function getTextPrice($type, $text_price) @@ -416,7 +416,7 @@ abstract class DocumentTemplate extends Component case 'sale': case 'income': case 'invoice': - $text_price = trans(setting('invoice.price_name', 'invoices.price')); + $text_price = setting('invoice.price_name', 'invoices.price'); if ($text_price == 'custom') { $text_price = setting('invoice.price_name_input'); @@ -425,17 +425,17 @@ abstract class DocumentTemplate extends Component case 'bill': case 'expense': case 'purchase': - $text_price = trans('bills.price'); + $text_price = 'bills.price'; break; } return $text_price; } - protected function getTextAmount($type, $text_amount) + protected function getTextAmount($type, $textAmount) { - if (!empty($text_amount)) { - return $text_amount; + if (!empty($textAmount)) { + return $textAmount; } switch ($type) { @@ -445,11 +445,11 @@ abstract class DocumentTemplate extends Component case 'bill': case 'expense': case 'purchase': - $text_amount = trans('general.amount'); + $textAmount = 'general.amount'; break; } - return $text_amount; + return $textAmount; } protected function getHideItems($type, $hideItems, $hideName, $hideDescription) @@ -457,9 +457,9 @@ abstract class DocumentTemplate extends Component if (!empty($hideItems)) { return $hideItems; } - + $hideItems = ($this->getHideName($type, $hideName) & $this->getHideDescription($type, $hideDescription)) ? true : false; - + return $hideItems; } @@ -468,7 +468,7 @@ abstract class DocumentTemplate extends Component if (!empty($hideName)) { return $hideName; } - + switch ($type) { case 'sale': case 'income': @@ -481,7 +481,7 @@ abstract class DocumentTemplate extends Component $hideName = setting('bill.hide_item_name', $hideName); break; } - + return $hideName; } @@ -490,7 +490,7 @@ abstract class DocumentTemplate extends Component if (!empty($hideDescription)) { return $hideDescription; } - + switch ($type) { case 'sale': case 'income': @@ -503,7 +503,7 @@ abstract class DocumentTemplate extends Component $hideDescription = setting('bill.hide_item_description', $hideDescription); break; } - + return $hideDescription; } @@ -512,7 +512,7 @@ abstract class DocumentTemplate extends Component if (!empty($hideQuantity)) { return $hideQuantity; } - + switch ($type) { case 'sale': case 'income': @@ -525,7 +525,7 @@ abstract class DocumentTemplate extends Component $hideQuantity = setting('bill.hide_quantity', $hideQuantity); break; } - + return $hideQuantity; } @@ -534,7 +534,7 @@ abstract class DocumentTemplate extends Component if (!empty($hidePrice)) { return $hidePrice; } - + switch ($type) { case 'sale': case 'income': @@ -547,7 +547,7 @@ abstract class DocumentTemplate extends Component $hidePrice = setting('bill.hide_price', $hidePrice); break; } - + return $hidePrice; } @@ -572,13 +572,13 @@ abstract class DocumentTemplate extends Component return $hideDiscount; } - + protected function getHideAmount($type, $hideAmount) { if (!empty($hideAmount)) { return $hideAmount; } - + switch ($type) { case 'sale': case 'income': @@ -591,7 +591,7 @@ abstract class DocumentTemplate extends Component $hideAmount = setting('bill.hide_amount', $hideAmount); break; } - + return $hideAmount; } } diff --git a/app/View/Components/Documents/Form/Metadata.php b/app/View/Components/Documents/Form/Metadata.php index 424825055..f6d96dec8 100644 --- a/app/View/Components/Documents/Form/Metadata.php +++ b/app/View/Components/Documents/Form/Metadata.php @@ -244,12 +244,12 @@ class Metadata extends Component case 'sale': case 'income': case 'invoice': - $textDocumentNumber = trans('invoices.invoice_number'); + $textDocumentNumber = 'invoices.invoice_number'; break; case 'bill': case 'expense': case 'purchase': - $textDocumentNumber = trans('bills.bill_number'); + $textDocumentNumber = 'bills.bill_number'; break; } @@ -266,12 +266,12 @@ class Metadata extends Component case 'sale': case 'income': case 'invoice': - $textOrderNumber = trans('invoices.order_number'); + $textOrderNumber = 'invoices.order_number'; break; case 'bill': case 'expense': case 'purchase': - $textOrderNumber = trans('bills.order_number'); + $textOrderNumber = 'bills.order_number'; break; } @@ -288,12 +288,12 @@ class Metadata extends Component case 'sale': case 'income': case 'invoice': - $textIssuedAt = trans('invoices.invoice_date'); + $textIssuedAt = 'invoices.invoice_date'; break; case 'bill': case 'expense': case 'purchase': - $textIssuedAt = trans('bills.bill_date'); + $textIssuedAt = 'bills.bill_date'; break; } @@ -310,12 +310,12 @@ class Metadata extends Component case 'sale': case 'income': case 'invoice': - $textDueAt = trans('invoices.due_date'); + $textDueAt = 'invoices.due_date'; break; case 'bill': case 'expense': case 'purchase': - $textDueAt = trans('bills.due_date'); + $textDueAt = 'bills.due_date'; break; } diff --git a/resources/views/components/documents/form/items.blade.php b/resources/views/components/documents/form/items.blade.php index 468414b57..bbe45d58a 100644 --- a/resources/views/components/documents/form/items.blade.php +++ b/resources/views/components/documents/form/items.blade.php @@ -24,7 +24,7 @@ @if (!$hideItems) @stack('name_th_start') - {{ $textItems }} + {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} @stack('name_th_end') @stack('move_th_start') @@ -34,13 +34,13 @@ @stack('quantity_th_start') @if (!$hideQuantity) - {{ $textQuantity }} + {{ trans($textQuantity) }} @endif @stack('quantity_th_end') @stack('price_th_start') @if (!$hidePrice) - {{ $textPrice }} + {{ trans($textPrice) }} @endif @stack('price_th_end') @@ -54,7 +54,7 @@ @stack('total_th_start') @if (!$hideAmount) - {{ $textAmount }} + {{ trans($textAmount) }} @endif @stack('total_th_end') diff --git a/resources/views/components/documents/form/metadata.blade.php b/resources/views/components/documents/form/metadata.blade.php index bd57db6e3..ce8c7b6ed 100644 --- a/resources/views/components/documents/form/metadata.blade.php +++ b/resources/views/components/documents/form/metadata.blade.php @@ -10,19 +10,19 @@
@if (!$hideIssuedAt) - {{ Form::dateGroup('issued_at', $textIssuedAt, 'calendar', ['id' => 'issued_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], $issuedAt) }} + {{ Form::dateGroup('issued_at', trans($textIssuedAt), 'calendar', ['id' => 'issued_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], $issuedAt) }} @endif @if (!$hideDocumentNumber) - {{ Form::textGroup('document_number', $textDocumentNumber, 'file', ['required' => 'required'], $documentNumber) }} + {{ Form::textGroup('document_number', trans($textDocumentNumber), 'file', ['required' => 'required'], $documentNumber) }} @endif @if (!$hideDueAt) - {{ Form::dateGroup('due_at', $textDueAt, 'calendar', ['id' => 'due_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], $dueAt) }} + {{ Form::dateGroup('due_at', trans($textDueAt), 'calendar', ['id' => 'due_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], $dueAt) }} @endif @if (!$hideOrderNumber) - {{ Form::textGroup('order_number', $textOrderNumber, 'shopping-cart', [], $orderNumber) }} + {{ Form::textGroup('order_number', trans($textOrderNumber), 'shopping-cart', [], $orderNumber) }} @endif
diff --git a/resources/views/components/documents/index/card-body.blade.php b/resources/views/components/documents/index/card-body.blade.php index 48e85c9a8..6b968e0d7 100644 --- a/resources/views/components/documents/index/card-body.blade.php +++ b/resources/views/components/documents/index/card-body.blade.php @@ -13,7 +13,7 @@ @stack('document_number_th_inside_start') - @sortablelink('document_number', $textDocumentNumber, ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow']) + @sortablelink('document_number', trans_choice($textDocumentNumber, 1), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow']) @stack('document_number_th_inside_end') @@ -25,7 +25,7 @@ @stack('contact_name_th_inside_start') - @sortablelink('contact_name', $textContactName) + @sortablelink('contact_name', trans_choice($textContactName, 1)) @stack('contact_name_th_inside_end') @@ -49,7 +49,7 @@ @stack('issued_at_th_inside_start') - @sortablelink('issued_at', $textIssueAt) + @sortablelink('issued_at', trans($textIssueAt)) @stack('issued_at_th_inside_end') @@ -61,7 +61,7 @@ @stack('due_at_th_inside_start') - @sortablelink('due_at', $textDueAt) + @sortablelink('due_at', trans($textDueAt)) @stack('due_at_th_inside_end') diff --git a/resources/views/components/documents/template/classic.blade.php b/resources/views/components/documents/template/classic.blade.php index 52a431fa0..72e62579f 100644 --- a/resources/views/components/documents/template/classic.blade.php +++ b/resources/views/components/documents/template/classic.blade.php @@ -62,7 +62,7 @@ @stack('invoice_number_input_start') @if (!$hideDocumentNumber)
- {{ $textDocumentNumber }}:
+ {{ trans($textDocumentNumber) }}:
{{ $document->document_number }}
@endif @@ -81,7 +81,7 @@
@if (!$hideContactInfo) - {{ $textContactInfo }}
+ {{ trans($textContactInfo) }}
@endif @stack('name_input_start') @@ -129,7 +129,7 @@ @stack('order_number_input_start') @if (!$hideOrderNumber) @if ($document->order_number) - {{ $textOrderNumber }}: + {{ trans($textOrderNumber) }}: {{ $document->order_number }}

@endif @endif @@ -137,14 +137,14 @@ @stack('invoiced_at_input_start') @if (!$hideIssuedAt) - {{ $textIssuedAt }}: + {{ trans($textIssuedAt) }}: @date($document->issued_at)

@endif @stack('invoiced_at_input_end') @stack('due_at_input_start') @if (!$hideDueAt) - {{ $textDueAt }}: + {{ trans($textDueAt) }}: @date($document->due_at)

@endif @stack('due_at_input_end') @@ -167,7 +167,7 @@ @stack('name_th_start') @if (!$hideItems || (!$hideName && !$hideDescription)) - {{ $textItems }} + {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} @endif @stack('name_th_end') @@ -193,7 +193,7 @@ @stack('total_th_start') @if (!$hideAmount) - {{ $textAmount }} + {{ trans($textAmount) }} @endif @stack('total_th_end') diff --git a/resources/views/components/documents/template/default.blade.php b/resources/views/components/documents/template/default.blade.php index f33633d58..84976cf86 100644 --- a/resources/views/components/documents/template/default.blade.php +++ b/resources/views/components/documents/template/default.blade.php @@ -55,7 +55,7 @@

@if ($hideContactInfo) - {{ $textContactInfo }}
+ {{ trans($textContactInfo) }}
@endif @stack('name_input_start') @@ -106,7 +106,7 @@ @stack('document_number_input_start') @if (!$hideDocumentNumber) - {{ $textDocumentNumber }}: + {{ trans($textDocumentNumber) }}: {{ $document->document_number }}

@endif @@ -116,7 +116,7 @@ @if (!$hideOrderNumber) @if ($document->order_number) - {{ $textOrderNumber }}: + {{ trans($textOrderNumber) }}: {{ $document->order_number }}

@endif @@ -126,7 +126,7 @@ @stack('issued_at_input_start') @if (!$hideIssuedAt) - {{ $textIssuedAt }}: + {{ trans($textIssuedAt) }}: @date($document->issued_at)

@endif @@ -135,7 +135,7 @@ @stack('due_at_input_start') @if (!$hideDueAt) - {{ $textDueAt }}: + {{ trans($textDueAt) }}: @date($document->due_at)

@endif @@ -154,19 +154,19 @@ @stack('name_th_start') @if ($hideItems || (!$hideName && !$hideDescription)) - {{ $textItems }} + {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} @endif @stack('name_th_end') @stack('quantity_th_start') @if (!$hideQuantity) - {{ $textQuantity }} + {{ trans($textQuantity) }} @endif @stack('quantity_th_end') @stack('price_th_start') @if (!$hidePrice) - {{ $textPrice }} + {{ trans($textPrice) }} @endif @stack('price_th_end') @@ -180,7 +180,7 @@ @stack('total_th_start') @if (!$hideAmount) - {{ $textAmount }} + {{ trans($textAmount) }} @endif @stack('total_th_end') diff --git a/resources/views/components/documents/template/modern.blade.php b/resources/views/components/documents/template/modern.blade.php index e5ed4d034..a4e986657 100644 --- a/resources/views/components/documents/template/modern.blade.php +++ b/resources/views/components/documents/template/modern.blade.php @@ -54,7 +54,7 @@
@if (!$hideContactInfo) - {{ $textContactInfo }} + {{ trans($textContactInfo) }}
@endif @@ -104,7 +104,7 @@ @stack('order_number_input_start') @if (!$hideOrderNumber) @if ($document->order_number) - {{ $textOrderNumber }}: + {{ trans($textOrderNumber) }}: {{ $document->order_number }}

@endif @endif @@ -112,21 +112,21 @@ @stack('invoice_number_input_start') @if (!$hideDocumentNumber) - {{ $textDocumentNumber }}: + {{ trans($textDocumentNumber) }}: {{ $document->document_number }}

@endif @stack('invoice_number_input_end') @stack('invoiced_at_input_start') @if (!$hideIssuedAt) - {{ $textIssuedAt }}: + {{ trans($textIssuedAt) }}: @date($document->issued_at)

@endif @stack('invoiced_at_input_end') @stack('due_at_input_start') @if (!$hideDueAt) - {{ $textDueAt }}: + {{ trans($textDueAt) }}: @date($document->due_at) @endif @stack('due_at_input_end') @@ -142,19 +142,19 @@ @stack('name_th_start') @if (!$hideItems || (!$hideName && !$hideDescription)) - {{ $textItems }} + {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }} @endif @stack('name_th_end') @stack('quantity_th_start') @if (!$hideQuantity) - {{ $textQuantity }} + {{ trans($textQuantity) }} @endif @stack('quantity_th_end') @stack('price_th_start') @if (!$hidePrice) - {{ $textPrice }} + {{ trans($textPrice) }} @endif @stack('price_th_end') @@ -168,7 +168,7 @@ @stack('total_th_start') @if (!$hideAmount) - {{ $textAmount }} + {{ trans($textAmount) }} @endif @stack('total_th_end')