Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
a4650f8710 | ||
|
4b25f97314 |
@@ -2,7 +2,7 @@
|
||||
<aside class="main-sidebar sidebar-dark-primary elevation-4 d-print-none">
|
||||
<!-- Brand Logo -->
|
||||
<a href="{{ url('home') }}" class="brand-link">
|
||||
<img src="{{ asset('img/logo.png') }}" alt="Logo" class="brand-image img-circle elevation-3" style="opacity: .8">
|
||||
<img src="{{ asset('img/logo.png') }}" alt="Logo" class="brand-image">
|
||||
<span class="brand-text font-weight-light">{!! config('app.name_html_long','<b>App</b>Name') !!}</span>
|
||||
</a>
|
||||
|
||||
|
@@ -15,10 +15,13 @@ class Carbon extends CarbonBase
|
||||
|
||||
public function __get($name)
|
||||
{
|
||||
switch (true) {
|
||||
case $name === 'half':
|
||||
switch ($name) {
|
||||
case 'half':
|
||||
return (int) ceil($this->month / static::MONTHS_PER_HALF);
|
||||
|
||||
case 'quarter_string':
|
||||
return sprintf('%dQ%d',$this->year,$this->quarter);
|
||||
|
||||
default:
|
||||
return parent::__get($name);
|
||||
}
|
||||
@@ -35,7 +38,7 @@ class Carbon extends CarbonBase
|
||||
* @return static
|
||||
*/
|
||||
public function startOfHalf($dayOfWeek = null)
|
||||
{
|
||||
{
|
||||
return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF - 5, 1)->firstOfMonth($dayOfWeek);
|
||||
}
|
||||
|
||||
@@ -50,7 +53,7 @@ class Carbon extends CarbonBase
|
||||
* @return static
|
||||
*/
|
||||
public function endOfHalf($dayOfWeek = null)
|
||||
{
|
||||
{
|
||||
return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF, 1)->lastOfMonth($dayOfWeek);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user