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

Fix always fallback invoice item column settings

Browse Source
This commit is contained in:
boracakirel 2023-03-11 17:29:40 +03:00
parent 77fb8df96b
commit b9bc0af6a6
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
app/Abstracts/View/Components/Documents/Form.php
View File

@ -867,15 +867,17 @@ abstract class Form extends Component
return $hideItems; return $hideItems;
} }
protected function getHideItemName($type, $hideItemName) protected function getHideItemName($type, $hideItemName): bool
{ {
if (! empty($hideItemName)) { if (! empty($hideItemName)) {
return $hideItemName; return $hideItemName;
} }
$hideItemName = setting($this->getSettingKey($type, 'item_name'), false);
// if you use settting translation // if you use settting translation
if ($hideItemName = setting($this->getSettingKey($type, 'item_name'), false) && $hideItemName == 'hide') { if ($hideItemName === 'hide') {
return $hideItemName; return true;
} }
$hide = $this->getHideFromConfig($type, 'name'); $hide = $this->getHideFromConfig($type, 'name');
@ -884,8 +886,7 @@ abstract class Form extends Component
return $hide; return $hide;
} }
// @todo what return value invoice or always false?? return false;
return setting('invoice.item_name', $hideItemName) == 'hide' ? true : false;
} }
protected function getTextItemName($type, $textItemName) protected function getTextItemName($type, $textItemName)
@ -918,15 +919,17 @@ abstract class Form extends Component
return 'general.items'; return 'general.items';
} }
protected function getHideItemDescription($type, $hideItemDescription) protected function getHideItemDescription($type, $hideItemDescription): bool
{ {
if (! empty($hideItemDescription)) { if (! empty($hideItemDescription)) {
return $hideItemDescription; return $hideItemDescription;
} }
// if you use settting translation // if you use settting translation
if ($hideItemDescription = setting($this->getSettingKey($type, 'hide_item_description'), false) && $hideItemDescription == 'hide') { if (setting($this->getSettingKey($type, 'hide_item_description'), false)) {
return $hideItemDescription; return true;
} }
$hide = $this->getHideFromConfig($type, 'description'); $hide = $this->getHideFromConfig($type, 'description');
@ -935,8 +938,7 @@ abstract class Form extends Component
return $hide; return $hide;
} }
// @todo what return value invoice or always false?? return false;
return setting('invoice.hide_item_description', $hideItemDescription);
} }
protected function getTextItemDescription($type, $textItemDescription) protected function getTextItemDescription($type, $textItemDescription)
@ -954,15 +956,17 @@ abstract class Form extends Component
return 'general.description'; return 'general.description';
} }
protected function getHideItemQuantity($type, $hideItemQuantity) protected function getHideItemQuantity($type, $hideItemQuantity): bool
{ {
if (! empty($hideItemQuantity)) { if (! empty($hideItemQuantity)) {
return $hideItemQuantity; return $hideItemQuantity;
} }
$hideItemQuantity = setting($this->getSettingKey($type, 'quantity_name'), false);
// if you use settting translation // if you use settting translation
if ($hideItemQuantity = setting($this->getSettingKey($type, 'hide_quantity'), false) && $hideItemQuantity == 'hide') { if ($hideItemQuantity === 'hide') {
return $hideItemQuantity; return true;
} }
$hide = $this->getHideFromConfig($type, 'quantity'); $hide = $this->getHideFromConfig($type, 'quantity');
@ -971,8 +975,7 @@ abstract class Form extends Component
return $hide; return $hide;
} }
// @todo what return value invoice or always false?? return false;
return setting('invoice.quantity_name', $hideItemQuantity) == 'hide' ? true : false;
} }
protected function getTextItemQuantity($type, $textItemQuantity) protected function getTextItemQuantity($type, $textItemQuantity)
@ -1005,15 +1008,17 @@ abstract class Form extends Component
return 'invoices.quantity'; return 'invoices.quantity';
} }
protected function getHideItemPrice($type, $hideItemPrice) protected function getHideItemPrice($type, $hideItemPrice): bool
{ {
if (! empty($hideItemPrice)) { if (! empty($hideItemPrice)) {
return $hideItemPrice; return $hideItemPrice;
} }
$hideItemPrice = setting($this->getSettingKey($type, 'price_name'), false);
// if you use settting translation // if you use settting translation
if ($hideItemPrice = setting($this->getSettingKey($type, 'hide_price'), false) && $hideItemPrice == 'hide') { if ($hideItemPrice === 'hide') {
return $hideItemPrice; return true;
} }
$hide = $this->getHideFromConfig($type, 'price'); $hide = $this->getHideFromConfig($type, 'price');
@ -1022,8 +1027,7 @@ abstract class Form extends Component
return $hide; return $hide;
} }
// @todo what return value invoice or always false?? return false;
return setting('invoice.price_name', $hideItemPrice) == 'hide' ? true : false;
} }
protected function getTextItemPrice($type, $textItemPrice) protected function getTextItemPrice($type, $textItemPrice)
@ -1056,15 +1060,15 @@ abstract class Form extends Component
return 'invoices.price'; return 'invoices.price';
} }
protected function getHideItemAmount($type, $hideItemAmount) protected function getHideItemAmount($type, $hideItemAmount): bool
{ {
if (! empty($hideItemAmount)) { if (! empty($hideItemAmount)) {
return $hideItemAmount; return $hideItemAmount;
} }
// if you use settting translation // if you use settting translation
if ($hideAmount = setting($this->getSettingKey($type, 'hide_amount'), false)) { if (setting($this->getSettingKey($type, 'hide_amount'), false)) {
return $hideAmount; return true;
} }
$hide = $this->getHideFromConfig($type, 'amount'); $hide = $this->getHideFromConfig($type, 'amount');
@ -1073,8 +1077,7 @@ abstract class Form extends Component
return $hide; return $hide;
} }
// @todo what return value invoice or always false?? return false;
return setting('invoice.hide_amount', $hideAmount);
} }
protected function getTextItemAmount($type, $textItemAmount) protected function getTextItemAmount($type, $textItemAmount)