Merge branch 'master' of https://github.com/brkcvn/akaunting into mobile-index-actions
This commit is contained in:
@@ -91,7 +91,7 @@ abstract class Notification extends BaseNotification implements ShouldQueue
|
||||
|
||||
public function getFooter()
|
||||
{
|
||||
$url = 'https://akaunting.com/lp/accounting-software?utm_source=email&utm_medium=footer&utm_campaign=plg&utm_content=' . $this->template->alias;
|
||||
$url = 'https://akaunting.com/accounting-software?utm_source=email&utm_medium=footer&utm_campaign=plg&utm_content=' . $this->template->alias;
|
||||
|
||||
$get_started = '<a href="' . $url . '" style="color: #676ba2; text-decoration: none;">' . trans('footer.get_started') . '</a>';
|
||||
|
||||
|
@@ -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();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user