Merge branch 'akaunting:master' into master
This commit is contained in:
commit
3393c84633
@ -80,6 +80,10 @@ class Tips extends Component
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (Str::contains($tip->action, '{company_id}')) {
|
||||||
|
$tip->action = Str::replace('{company_id}', company_id(), $tip->action);
|
||||||
|
}
|
||||||
|
|
||||||
$this->tips->push($tip);
|
$this->tips->push($tip);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,9 +10,9 @@
|
|||||||
{{ $item->title }}
|
{{ $item->title }}
|
||||||
</h2>
|
</h2>
|
||||||
|
|
||||||
<p class="text-sm mb-2">
|
<div class="text-sm mb-2">
|
||||||
{!! $item->description !!}
|
{!! $item->description !!}
|
||||||
</p>
|
</div>
|
||||||
|
|
||||||
<x-link href="{{ $item->action }}" class="font-light text-sm" override="class" target="_blank">
|
<x-link href="{{ $item->action }}" class="font-light text-sm" override="class" target="_blank">
|
||||||
<x-link.hover>
|
<x-link.hover>
|
||||||
|
@ -10,9 +10,9 @@
|
|||||||
{{ $item->title }}
|
{{ $item->title }}
|
||||||
</h2>
|
</h2>
|
||||||
|
|
||||||
<p class="text-sm mb-2">
|
<div class="text-sm mb-2">
|
||||||
{!! $item->description !!}
|
{!! $item->description !!}
|
||||||
</p>
|
</div>
|
||||||
|
|
||||||
<x-link href="{{ $item->action }}" class="font-light text-sm" override="class" target="_blank">
|
<x-link href="{{ $item->action }}" class="font-light text-sm" override="class" target="_blank">
|
||||||
<x-link.hover>
|
<x-link.hover>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user