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

changed trans and trans_choice location..

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-12-25 13:30:12 +03:00
parent 7b126834ff
commit 7e35aefde6
9 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Abstracts/View/Components/DocumentIndex.php
View File

@@ -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;
}

94
app/Abstracts/View/Components/DocumentTemplate.php
View File

@@ -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;
}
}

16
app/View/Components/Documents/Form/Metadata.php
View File

@@ -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;
}

8
resources/views/components/documents/form/items.blade.php
View File

@@ -24,7 +24,7 @@
@if (!$hideItems)
@stack('name_th_start')
<th class="text-left border-top-0 border-right-0 border-bottom-0">{{ $textItems }}</th>
<th class="text-left border-top-0 border-right-0 border-bottom-0">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
@stack('name_th_end')
@stack('move_th_start')
@@ -34,13 +34,13 @@
@stack('quantity_th_start')
@if (!$hideQuantity)
<th class="text-center border-top-0 border-right-0 border-bottom-0" style="padding-right: 5px;">{{ $textQuantity }}</th>
<th class="text-center border-top-0 border-right-0 border-bottom-0" style="padding-right: 5px;">{{ trans($textQuantity) }}</th>
@endif
@stack('quantity_th_end')
@stack('price_th_start')
@if (!$hidePrice)
<th class="text-right border-top-0 border-right-0 border-bottom-0" style="padding-left: 5px;">{{ $textPrice }}</th>
<th class="text-right border-top-0 border-right-0 border-bottom-0" style="padding-left: 5px;">{{ trans($textPrice) }}</th>
@endif
@stack('price_th_end')
@@ -54,7 +54,7 @@
@stack('total_th_start')
@if (!$hideAmount)
<th class="text-right border-top-0 border-bottom-0 item-total">{{ $textAmount }}</th>
<th class="text-right border-top-0 border-bottom-0 item-total">{{ trans($textAmount) }}</th>
@endif
@stack('total_th_end')

8
resources/views/components/documents/form/metadata.blade.php
View File

@@ -10,19 +10,19 @@
<div class="col-sm-6 col-md-6 col-lg-6 col-xl-6">
<div class="row">
@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
</div>
</div>

8
resources/views/components/documents/index/card-body.blade.php
View File

@@ -13,7 +13,7 @@
<th class="{{ $classDocumentNumber }}">
@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')
</th>
@@ -25,7 +25,7 @@
<th class="{{ $classContactName }}">
@stack('contact_name_th_inside_start')
@sortablelink('contact_name', $textContactName)
@sortablelink('contact_name', trans_choice($textContactName, 1))
@stack('contact_name_th_inside_end')
</th>
@@ -49,7 +49,7 @@
<th class="{{ $classIssuedAt }}">
@stack('issued_at_th_inside_start')
@sortablelink('issued_at', $textIssueAt)
@sortablelink('issued_at', trans($textIssueAt))
@stack('issued_at_th_inside_end')
</th>
@@ -61,7 +61,7 @@
<th class="{{ $classDueAt }}">
@stack('due_at_th_inside_start')
@sortablelink('due_at', $textDueAt)
@sortablelink('due_at', trans($textDueAt))
@stack('due_at_th_inside_end')
</th>

14
resources/views/components/documents/template/classic.blade.php
View File

@@ -62,7 +62,7 @@
@stack('invoice_number_input_start')
@if (!$hideDocumentNumber)
<div class="text company">
<strong>{{ $textDocumentNumber }}:</strong><br>
<strong>{{ trans($textDocumentNumber) }}:</strong><br>
{{ $document->document_number }}
</div>
@endif
@@ -81,7 +81,7 @@
<div class="col-58">
<div class="text company">
@if (!$hideContactInfo)
<strong>{{ $textContactInfo }}</strong><br>
<strong>{{ trans($textContactInfo) }}</strong><br>
@endif
@stack('name_input_start')
@@ -129,7 +129,7 @@
@stack('order_number_input_start')
@if (!$hideOrderNumber)
@if ($document->order_number)
<strong>{{ $textOrderNumber }}:</strong>
<strong>{{ trans($textOrderNumber) }}:</strong>
<span class="float-right">{{ $document->order_number }}</span><br><br>
@endif
@endif
@@ -137,14 +137,14 @@
@stack('invoiced_at_input_start')
@if (!$hideIssuedAt)
<strong>{{ $textIssuedAt }}:</strong>
<strong>{{ trans($textIssuedAt) }}:</strong>
<span class="float-right">@date($document->issued_at)</span><br><br>
@endif
@stack('invoiced_at_input_end')
@stack('due_at_input_start')
@if (!$hideDueAt)
<strong>{{ $textDueAt }}:</strong>
<strong>{{ trans($textDueAt) }}:</strong>
<span class="float-right">@date($document->due_at)</span><br><br>
@endif
@stack('due_at_input_end')
@@ -167,7 +167,7 @@
<tr>
@stack('name_th_start')
@if (!$hideItems || (!$hideName && !$hideDescription))
<th class="text-left item">{{ $textItems }}</th>
<th class="text-left item">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
@endif
@stack('name_th_end')
@@ -193,7 +193,7 @@
@stack('total_th_start')
@if (!$hideAmount)
<th class="total">{{ $textAmount }}</th>
<th class="total">{{ trans($textAmount) }}</th>
@endif
@stack('total_th_end')
</tr>

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

@@ -55,7 +55,7 @@
<div class="text company">
<br>
@if ($hideContactInfo)
<strong>{{ $textContactInfo }}</strong><br>
<strong>{{ trans($textContactInfo) }}</strong><br>
@endif
@stack('name_input_start')
@@ -106,7 +106,7 @@
@stack('document_number_input_start')
@if (!$hideDocumentNumber)
<strong>
{{ $textDocumentNumber }}:
{{ trans($textDocumentNumber) }}:
</strong>
<span class="float-right">{{ $document->document_number }}</span><br><br>
@endif
@@ -116,7 +116,7 @@
@if (!$hideOrderNumber)
@if ($document->order_number)
<strong>
{{ $textOrderNumber }}:
{{ trans($textOrderNumber) }}:
</strong>
<span class="float-right">{{ $document->order_number }}</span><br><br>
@endif
@@ -126,7 +126,7 @@
@stack('issued_at_input_start')
@if (!$hideIssuedAt)
<strong>
{{ $textIssuedAt }}:
{{ trans($textIssuedAt) }}:
</strong>
<span class="float-right">@date($document->issued_at)</span><br><br>
@endif
@@ -135,7 +135,7 @@
@stack('due_at_input_start')
@if (!$hideDueAt)
<strong>
{{ $textDueAt }}:
{{ trans($textDueAt) }}:
</strong>
<span class="float-right">@date($document->due_at)</span><br><br>
@endif
@@ -154,19 +154,19 @@
<tr>
@stack('name_th_start')
@if ($hideItems || (!$hideName && !$hideDescription))
<th class="item text-left text-white">{{ $textItems }}</th>
<th class="item text-left text-white">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
@endif
@stack('name_th_end')
@stack('quantity_th_start')
@if (!$hideQuantity)
<th class="quantity text-white">{{ $textQuantity }}</th>
<th class="quantity text-white">{{ trans($textQuantity) }}</th>
@endif
@stack('quantity_th_end')
@stack('price_th_start')
@if (!$hidePrice)
<th class="price text-white">{{ $textPrice }}</th>
<th class="price text-white">{{ trans($textPrice) }}</th>
@endif
@stack('price_th_end')
@@ -180,7 +180,7 @@
@stack('total_th_start')
@if (!$hideAmount)
<th class="total text-white">{{ $textAmount }}</th>
<th class="total text-white">{{ trans($textAmount) }}</th>
@endif
@stack('total_th_end')
</tr>

18
resources/views/components/documents/template/modern.blade.php
View File

@@ -54,7 +54,7 @@
<div class="col-58">
<div class="text company">
@if (!$hideContactInfo)
<strong>{{ $textContactInfo }}</strong>
<strong>{{ trans($textContactInfo) }}</strong>
<br>
@endif
@@ -104,7 +104,7 @@
@stack('order_number_input_start')
@if (!$hideOrderNumber)
@if ($document->order_number)
<strong>{{ $textOrderNumber }}:</strong>
<strong>{{ trans($textOrderNumber) }}:</strong>
<span class="float-right">{{ $document->order_number }}</span><br><br>
@endif
@endif
@@ -112,21 +112,21 @@
@stack('invoice_number_input_start')
@if (!$hideDocumentNumber)
<strong>{{ $textDocumentNumber }}:</strong>
<strong>{{ trans($textDocumentNumber) }}:</strong>
<span class="float-right">{{ $document->document_number }}</span><br><br>
@endif
@stack('invoice_number_input_end')
@stack('invoiced_at_input_start')
@if (!$hideIssuedAt)
<strong>{{ $textIssuedAt }}:</strong>
<strong>{{ trans($textIssuedAt) }}:</strong>
<span class="float-right">@date($document->issued_at)</span><br><br>
@endif
@stack('invoiced_at_input_end')
@stack('due_at_input_start')
@if (!$hideDueAt)
<strong>{{ $textDueAt }}:</strong>
<strong>{{ trans($textDueAt) }}:</strong>
<span class="float-right">@date($document->due_at)</span>
@endif
@stack('due_at_input_end')
@@ -142,19 +142,19 @@
<tr>
@stack('name_th_start')
@if (!$hideItems || (!$hideName && !$hideDescription))
<th class="item text-left text-white">{{ $textItems }}</th>
<th class="item text-left text-white">{{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}</th>
@endif
@stack('name_th_end')
@stack('quantity_th_start')
@if (!$hideQuantity)
<th class="quantity text-white">{{ $textQuantity }}</th>
<th class="quantity text-white">{{ trans($textQuantity) }}</th>
@endif
@stack('quantity_th_end')
@stack('price_th_start')
@if (!$hidePrice)
<th class="price text-white">{{ $textPrice }}</th>
<th class="price text-white">{{ trans($textPrice) }}</th>
@endif
@stack('price_th_end')
@@ -168,7 +168,7 @@
@stack('total_th_start')
@if (!$hideAmount)
<th class="total text-white">{{ $textAmount }}</th>
<th class="total text-white">{{ trans($textAmount) }}</th>
@endif
@stack('total_th_end')
</tr>