Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 13:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes. (#3430)

Browse Source 
* Fix for pdf_variables

* Fixes for notification

* Fixes for viewing invoice with NO company custom_fields
This commit is contained in:
David Bomba 2020-03-06 07:30:12 +11:00 committed by GitHub
parent ff5a850e8d
commit 20c818cf97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Designs/Designer.php
View File

@ -361,7 +361,7 @@ class Designer {
$custom_fields = $company->custom_fields; $custom_fields = $company->custom_fields;
if (!$custom_fields) { if (!$custom_fields) {
return []; return $data;
} }
foreach (self::$custom_fields as $cf) { foreach (self::$custom_fields as $cf) {
@ -385,7 +385,7 @@ class Designer {
foreach ($matches as $match) { foreach ($matches as $match) {
if (!property_exists($custom_fields, $match) || (strlen($custom_fields->{ $match}) == 0)) { if (!property_exists($custom_fields, $match) || (strlen($custom_fields->{$match}) == 0)) {
foreach ($variables as $key => $value) { foreach ($variables as $key => $value) {
if ($value == $match) { if ($value == $match) {
unset($variables[$key]); unset($variables[$key]);