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

Fixed document name, quantity and price hide feature..

Browse Source
This commit is contained in:
Cüneyt Şentürk 2022-11-24 18:29:17 +03:00
parent 4b8cfda69c
commit 6f0a77dec8
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -874,8 +874,8 @@ abstract class Form extends Component
}
// if you use settting translation
if ($hideName = setting($this->getSettingKey($type, 'hide_item_name'), false)) {
return $hideName;
if ($hideItemName = setting($this->getSettingKey($type, 'item_name'), false) && $hideItemName == 'hide') {
return $hideItemName;
}
$hide = $this->getHideFromConfig($type, 'name');
@ -885,7 +885,7 @@ abstract class Form extends Component
}
// @todo what return value invoice or always false??
return setting('invoice.hide_item_name', $hideName);
return setting('invoice.item_name', $hideItemName) == 'hide' ? true : false;
}
protected function getTextItemName($type, $textItemName)
@ -925,7 +925,7 @@ abstract class Form extends Component
}
// if you use settting translation
if ($hideItemDescription = setting($this->getSettingKey($type, 'hide_item_description'), false)) {
if ($hideItemDescription = setting($this->getSettingKey($type, 'hide_item_description'), false) && $hideItemDescription == 'hide') {
return $hideItemDescription;
}
@ -961,7 +961,7 @@ abstract class Form extends Component
}
// if you use settting translation
if ($hideItemQuantity = setting($this->getSettingKey($type, 'hide_quantity'), false)) {
if ($hideItemQuantity = setting($this->getSettingKey($type, 'hide_quantity'), false) && $hideItemQuantity == 'hide') {
return $hideItemQuantity;
}
@ -972,7 +972,7 @@ abstract class Form extends Component
}
// @todo what return value invoice or always false??
return setting('invoice.hide_quantity', $hideItemQuantity);
return setting('invoice.quantity_name', $hideItemQuantity) == 'hide' ? true : false;
}
protected function getTextItemQuantity($type, $textItemQuantity)
@ -1012,7 +1012,7 @@ abstract class Form extends Component
}
// if you use settting translation
if ($hideItemPrice = setting($this->getSettingKey($type, 'hide_price'), false)) {
if ($hideItemPrice = setting($this->getSettingKey($type, 'hide_price'), false) && $hideItemPrice == 'hide') {
return $hideItemPrice;
}
@ -1023,7 +1023,7 @@ abstract class Form extends Component
}
// @todo what return value invoice or always false??
return setting('invoice.hide_price', $hideItemPrice);
return setting('invoice.price_name', $hideItemPrice) == 'hide' ? true : false;
}
protected function getTextItemPrice($type, $textItemPrice)

12
app/Abstracts/View/Components/Documents/Show.php
View File

@ -1253,7 +1253,7 @@ abstract class Show extends Component
}
// if you use settting translation
if ($hideName = setting($this->getSettingKey($type, 'hide_item_name'), false)) {
if ($hideName = setting($this->getSettingKey($type, 'item_name'), false) && $hideName == 'hide') {
return $hideName;
}
@ -1264,7 +1264,7 @@ abstract class Show extends Component
}
// @todo what return value invoice or always false??
return setting('invoice.hide_item_name', $hideName);
return setting('invoice.item_name', $hideName) == 'hide' ? true : false;
}
protected function getHideDescription($type, $hideDescription)
@ -1295,7 +1295,7 @@ abstract class Show extends Component
}
// if you use settting translation
if ($hideQuantity = setting($this->getSettingKey($type, 'hide_quantity'), false)) {
if ($hideQuantity = setting($this->getSettingKey($type, 'hide_quantity'), false) && $hideQuantity == 'hide') {
return $hideQuantity;
}
@ -1306,7 +1306,7 @@ abstract class Show extends Component
}
// @todo what return value invoice or always false??
return setting('invoice.hide_quantity', $hideQuantity);
return setting('invoice.quantity_name', $hideQuantity) == 'hide' ? true : false;
}
protected function getHidePrice($type, $hidePrice)
@ -1316,7 +1316,7 @@ abstract class Show extends Component
}
// if you use settting translation
if ($hidePrice = setting($this->getSettingKey($type, 'hide_price'), false)) {
if ($hidePrice = setting($this->getSettingKey($type, 'hide_price'), false) && $hidePrice == 'hide') {
return $hidePrice;
}
@ -1327,7 +1327,7 @@ abstract class Show extends Component
}
// @todo what return value invoice or always false??
return setting('invoice.hide_price', $hidePrice);
return setting('invoice.price_name', $hidePrice) == 'hide' ? true : false;
}
protected function getHideDiscount($type, $hideDiscount)

12
app/Abstracts/View/Components/Documents/Template.php
View File

@ -559,7 +559,7 @@ abstract class Template extends Component
}
// if you use settting translation
if ($hideName = setting($this->getSettingKey($type, 'hide_item_name'), false)) {
if ($hideName = setting($this->getSettingKey($type, 'item_name'), false) && $hideName == 'hide') {
return $hideName;
}
@ -570,7 +570,7 @@ abstract class Template extends Component
}
// @todo what return value invoice or always false??
return setting('invoice.hide_item_name', $hideName);
return setting('invoice.item_name', $hideName) == 'hide' ? true : false;
}
protected function getHideDescription($type, $hideDescription)
@ -601,7 +601,7 @@ abstract class Template extends Component
}
// if you use settting translation
if ($hideQuantity = setting($this->getSettingKey($type, 'hide_quantity'), false)) {
if ($hideQuantity = setting($this->getSettingKey($type, 'hide_quantity'), false) && $hideQuantity == 'hide') {
return $hideQuantity;
}
@ -612,7 +612,7 @@ abstract class Template extends Component
}
// @todo what return value invoice or always false??
return setting('invoice.hide_quantity', $hideQuantity);
return setting('invoice.quantity_name', $hideQuantity) == 'hide' ? true : false;
}
protected function getHidePrice($type, $hidePrice)
@ -622,7 +622,7 @@ abstract class Template extends Component
}
// if you use settting translation
if ($hidePrice = setting($this->getSettingKey($type, 'hide_price'), false)) {
if ($hidePrice = setting($this->getSettingKey($type, 'hide_price'), false) && $hidePrice == 'hide') {
return $hidePrice;
}
@ -633,7 +633,7 @@ abstract class Template extends Component
}
// @todo what return value invoice or always false??
return setting('invoice.hide_price', $hidePrice);
return setting('invoice.price_name', $hidePrice) == 'hide' ? true : false;
}
protected function getHideDiscount($type, $hideDiscount)