Merge branch 'akaunting:master' into master

app/View/Components/Tips.php

@@ -57,17 +57,17 @@ class Tips extends Component
 
     protected function setTips($tips)
     {
-        if (!empty($tips)) {
+        if (! empty($tips)) {
             $this->tips = $tips;
         }
 
-        if (!$path = Route::current()->uri()) {
+        if (! $path = Route::current()->uri()) {
             return;
         }
 
         $path = Str::replace('{company_id}/', '', $path);
 
-        if (!$tips = $this->getTips($path)) {
+        if (! $tips = $this->getTips($path)) {
             return;
         }
 
@@ -76,10 +76,14 @@ class Tips extends Component
                 continue;
             }
 
-            if (!empty($tip->alias) && $this->moduleIsEnabled($tip->alias)) {
+            if (! empty($tip->alias) && $this->moduleIsEnabled($tip->alias)) {
                 continue;
             }
 
+            if (Str::contains($tip->action, '{company_id}')) {
+                $tip->action = Str::replace('{company_id}', company_id(), $tip->action);
+            }
+
             $this->tips->push($tip);
         }
     }

resources/views/components/tips/fixed.blade.php

@@ -10,9 +10,9 @@
                 {{ $item->title }}
             </h2>
 
-            <p class="text-sm mb-2">
+            <div class="text-sm mb-2">
                 {!! $item->description !!}
-            </p>
+            </div>
 
             <x-link href="{{ $item->action }}" class="font-light text-sm" override="class" target="_blank">
                 <x-link.hover>

resources/views/components/tips/relative.blade.php

@@ -10,9 +10,9 @@
                 {{ $item->title }}
             </h2>
 
-            <p class="text-sm mb-2">
+            <div class="text-sm mb-2">
                 {!! $item->description !!}
-            </p>
+            </div>
 
             <x-link href="{{ $item->action }}" class="font-light text-sm" override="class" target="_blank">
                 <x-link.hover>