Merge branch 'master' of https://github.com/brkcvn/akaunting into two-column-header
This commit is contained in:
commit
cabcdcb7df
@ -188,7 +188,11 @@ trait Recurring
|
||||
return false;
|
||||
}
|
||||
|
||||
return $schedule->current()->getStart();
|
||||
if (! $current = $schedule->current()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $current->getStart();
|
||||
}
|
||||
|
||||
public function getNextRecurring()
|
||||
@ -210,7 +214,11 @@ trait Recurring
|
||||
return false;
|
||||
}
|
||||
|
||||
return $schedule->first()->getStart();
|
||||
if (! $first = $schedule->first()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $first->getStart();
|
||||
}
|
||||
|
||||
public function getLastRecurring()
|
||||
@ -219,6 +227,10 @@ trait Recurring
|
||||
return false;
|
||||
}
|
||||
|
||||
return $schedule->last()->getStart();
|
||||
if (! $last = $schedule->last()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $last->getStart();
|
||||
}
|
||||
}
|
||||
|
2
public/css/app.css
vendored
2
public/css/app.css
vendored
@ -1399,7 +1399,7 @@ input[type=file]::file-selector-button:hover{
|
||||
background-color: #DCE2F9;
|
||||
}
|
||||
|
||||
.menu-list svg {
|
||||
.menu-list ul svg {
|
||||
width: 22px;
|
||||
height: 24px;
|
||||
fill: none;
|
||||
|
2
resources/assets/sass/app.css
vendored
2
resources/assets/sass/app.css
vendored
@ -98,7 +98,7 @@
|
||||
background-color: #DCE2F9;
|
||||
}
|
||||
|
||||
.menu-list svg {
|
||||
.menu-list ul svg {
|
||||
width: 22px;
|
||||
height: 24px;
|
||||
fill: none;
|
||||
|
Loading…
x
Reference in New Issue
Block a user