Merge branch 'develop'

Author: samberrry

src/Controllers/BinshopsReaderController.php

@@ -151,13 +151,19 @@ public function viewSinglePost(Request $request, $locale, $blogPostSlug)
             $captcha->runCaptchaBeforeShowingPosts($request, $blog_post);
         }
 
+        $categories = $blog_post->post->categories()->with([ 'categoryTranslations' => function($query) use ($request){
+            $query->where("lang_id" , '=' , $request->get("lang_id"));
+        }
+        ])->get();
         return view("binshopsblog::single_post", [
             'post' => $blog_post,
             // the default scope only selects approved comments, ordered by id
             'comments' => $blog_post->post->comments()
                 ->with("user")
                 ->get(),
             'captcha' => $captcha,
+            'categories' => $categories,
+            'locale' => $request->get("locale")
         ]);
     }
 

src/Views/binshopsblog/partials/categories.blade.php

@@ -1,7 +1,7 @@
 <div class=''>
-    @foreach($post->categories as $category)
-        <a class='btn btn-outline-secondary btn-sm m-1' href='{{$category->url()}}'>
-            {{$category->category_name}}
-        </a>
-    @endforeach
-</div>
+        @foreach($categories as $category)
+                <a class='btn btn-outline-secondary btn-sm m-1' href='{{$category->categoryTranslations[0]->url($locale)}}'>
+                        {{$category->categoryTranslations[0]->category_name}}
+                </a>
+        @endforeach
+</div>

src/Views/binshopsblog/partials/full_post_details.blade.php

@@ -26,4 +26,4 @@
 Posted <strong>{{$post->post->posted_at->diffForHumans()}}</strong>
 
 @includeWhen($post->author,"binshopsblog::partials.author",['post'=>$post])
-@includeWhen($post->categories,"binshopsblog::partials.categories",['post'=>$post])
+@includeWhen($categories,"binshopsblog::partials.categories",['categories'=>$categories])