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

Document column select custom and empty column issue solved..

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-01-27 19:14:48 +03:00
parent 86205c5a18
commit 8c2907fafc
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Abstracts/View/Components/DocumentForm.php
View File

@ -691,7 +691,11 @@ abstract class DocumentForm extends Base
// if you use settting translation // if you use settting translation
if (setting($type . '.item_name', 'items') == 'custom') { if (setting($type . '.item_name', 'items') == 'custom') {
return setting($type . '.item_name_input'); if (empty($textItems = setting($type . '.item_name_input'))) {
$textItems = 'general.items';
}
return $textItems;
} }
$translation = $this->getTextFromConfig($type, 'items'); $translation = $this->getTextFromConfig($type, 'items');
@ -711,7 +715,11 @@ abstract class DocumentForm extends Base
// if you use settting translation // if you use settting translation
if (setting($type . '.quantity_name', 'quantity') == 'custom') { if (setting($type . '.quantity_name', 'quantity') == 'custom') {
return setting($type . '.quantity_name_input'); if (empty($textQuantity = setting($type . '.quantity_name_input'))) {
$textQuantity = 'invoices.quantity';
}
return $textQuantity;
} }
$translation = $this->getTextFromConfig($type, 'quantity'); $translation = $this->getTextFromConfig($type, 'quantity');
@ -731,7 +739,11 @@ abstract class DocumentForm extends Base
// if you use settting translation // if you use settting translation
if (setting($type . '.price_name', 'price') == 'custom') { if (setting($type . '.price_name', 'price') == 'custom') {
return setting($type . '.price_name_input'); if (empty($textPrice = setting($type . '.price_name_input'))) {
$textPrice = 'invoices.price';
}
return $textPrice;
} }
$translation = $this->getTextFromConfig($type, 'price'); $translation = $this->getTextFromConfig($type, 'price');

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

@ -348,7 +348,11 @@ abstract class DocumentTemplate extends Base
// if you use settting translation // if you use settting translation
if (setting($type . '.item_name', 'items') == 'custom') { if (setting($type . '.item_name', 'items') == 'custom') {
return setting($type . '.item_name_input'); if (empty($textItems = setting($type . '.item_name_input'))) {
$textItems = 'general.items';
}
return $textItems;
} }
$translation = $this->getTextFromConfig($type, 'items'); $translation = $this->getTextFromConfig($type, 'items');
@ -368,7 +372,11 @@ abstract class DocumentTemplate extends Base
// if you use settting translation // if you use settting translation
if (setting($type . '.quantity_name', 'quantity') == 'custom') { if (setting($type . '.quantity_name', 'quantity') == 'custom') {
return setting($type . '.quantity_name_input'); if (empty($textQuantity = setting($type . '.quantity_name_input'))) {
$textQuantity = 'invoices.quantity';
}
return $textQuantity;
} }
$translation = $this->getTextFromConfig($type, 'quantity'); $translation = $this->getTextFromConfig($type, 'quantity');
@ -388,7 +396,11 @@ abstract class DocumentTemplate extends Base
// if you use settting translation // if you use settting translation
if (setting($type . '.price_name', 'price') == 'custom') { if (setting($type . '.price_name', 'price') == 'custom') {
return setting($type . '.price_name_input'); if (empty($textPrice = setting($type . '.price_name_input'))) {
$textPrice = 'invoices.price';
}
return $textPrice;
} }
$translation = $this->getTextFromConfig($type, 'price'); $translation = $this->getTextFromConfig($type, 'price');