diff --git a/app/Abstracts/Notification.php b/app/Abstracts/Notification.php index 367af653f..196e2a917 100644 --- a/app/Abstracts/Notification.php +++ b/app/Abstracts/Notification.php @@ -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 = '' . trans('footer.get_started') . ''; diff --git a/app/Traits/Recurring.php b/app/Traits/Recurring.php index ad347f6b2..73db91340 100644 --- a/app/Traits/Recurring.php +++ b/app/Traits/Recurring.php @@ -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(); } } diff --git a/public/css/app.css b/public/css/app.css index 69ff04e17..f51fdbdc0 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -1399,7 +1399,7 @@ input[type=file]::file-selector-button:hover{ background-color: #DCE2F9; } -.menu-list a svg { +.menu-list ul svg { width: 22px; height: 24px; fill: none; @@ -54059,6 +54059,14 @@ html[dir="rtl"] .lines-radius-border thead td:last-child { } /* responsive for role mobile */ +/* full-width for mobile. Some component use inline styling for width */ +@media only screen and (max-width: 991px) { + .full-width-mobile { + width: 100% !important; + } + } + /* full-width for mobile. Some component use inline styling for width */ + [dir="ltr"] .ltr\:-right-57 { right: -14.5rem; } diff --git a/resources/assets/sass/app.css b/resources/assets/sass/app.css index bab3e1785..14cac23fe 100644 --- a/resources/assets/sass/app.css +++ b/resources/assets/sass/app.css @@ -93,7 +93,7 @@ background-color: #DCE2F9; } - .menu-list a svg { + .menu-list ul svg { width: 22px; height: 24px; fill: none; @@ -572,6 +572,14 @@ html[dir="rtl"] .lines-radius-border thead td:last-child { } /* responsive for role mobile */ +/* full-width for mobile. Some component use inline styling for width */ +@media only screen and (max-width: 991px) { + .full-width-mobile { + width: 100% !important; + } + } + /* full-width for mobile. Some component use inline styling for width */ + [dir="ltr"] .ltr\:-right-57 { right: -14.5rem; } diff --git a/resources/views/components/layouts/portal/finish/content.blade.php b/resources/views/components/layouts/portal/finish/content.blade.php index a3fe90a2c..d7b299d12 100644 --- a/resources/views/components/layouts/portal/finish/content.blade.php +++ b/resources/views/components/layouts/portal/finish/content.blade.php @@ -7,7 +7,7 @@