tweak function docs and sales comments checks

ScuffedNewt · Dec 7, 2023 · 49776ac · 49776ac
1 parent 576a33b
commit 49776ac
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/app/Models/Character/CharacterDesignUpdate.php b/app/Models/Character/CharacterDesignUpdate.php
@@ -179,7 +179,7 @@ public function scopeCharacters($query) {
     }
 
     /**
-     * Scope a query to sort submissions oldest first.
+     * Scope a query to sort updates by oldest first.
      *
      * @param \Illuminate\Database\Eloquent\Builder $query
      *
@@ -190,7 +190,7 @@ public function scopeSortOldest($query) {
     }
 
     /**
-     * Scope a query to sort submissions by newest first.
+     * Scope a query to sort updates by newest first.
      *
      * @param \Illuminate\Database\Eloquent\Builder $query
      *

diff --git a/app/Models/Character/CharacterTransfer.php b/app/Models/Character/CharacterTransfer.php
@@ -97,7 +97,7 @@ public function scopeCompleted($query) {
     }
 
     /**
-     * Scope a query to sort submissions oldest first.
+     * Scope a query to sort transfers by oldest first.
      *
      * @param \Illuminate\Database\Eloquent\Builder $query
      *
@@ -108,7 +108,7 @@ public function scopeSortOldest($query) {
     }
 
     /**
-     * Scope a query to sort submissions by newest first.
+     * Scope a query to sort transfers by newest first.
      *
      * @param \Illuminate\Database\Eloquent\Builder $query
      *

diff --git a/app/Models/Report/Report.php b/app/Models/Report/Report.php
@@ -122,7 +122,7 @@ public function scopeViewable($query, $user) {
     }
 
     /**
-     * Scope a query to sort submissions oldest first.
+     * Scope a query to sort reports by oldest first.
      *
      * @param \Illuminate\Database\Eloquent\Builder $query
      *
@@ -133,7 +133,7 @@ public function scopeSortOldest($query) {
     }
 
     /**
-     * Scope a query to sort submissions by newest first.
+     * Scope a query to sort reports by newest first.
      *
      * @param \Illuminate\Database\Eloquent\Builder $query
      *

diff --git a/app/Models/User/User.php b/app/Models/User/User.php
@@ -182,7 +182,7 @@ public function bookmarks() {
      * Gets all of a user's liked / disliked comments.
      */
     public function commentLikes() {
-        return $this->hasMany('App\Models\Comment\CommentLike;');
+        return $this->hasMany('App\Models\Comment\CommentLike');
     }
 
     /**********************************************************************************************

diff --git a/resources/views/sales/_sales.blade.php b/resources/views/sales/_sales.blade.php
@@ -39,7 +39,9 @@
         </div>
     </div>
 
-    @if ((isset($sales->comments_open_at) && $sales->comments_open_at < Carbon\Carbon::now()) || (Auth::check() && Auth::user()->hasPower('edit_pages')) || !isset($sales->comments_open_at))
+    @if ((isset($sales->comments_open_at) && $sales->comments_open_at < Carbon\Carbon::now())
+        || (Auth::check() && (Auth::user()->hasPower('manage_sales') || Auth::user()->hasPower('comment_on_sales'))) 
+        || !isset($sales->comments_open_at))
         <?php $commentCount = App\Models\Comment\Comment::where('commentable_type', 'App\Models\Sales\Sales')
             ->where('commentable_id', $sales->id)
             ->count(); ?>

diff --git a/resources/views/sales/sales.blade.php b/resources/views/sales/sales.blade.php
@@ -9,10 +9,9 @@
     @include('sales._sales', ['sales' => $sales, 'page' => true])
 
     @if (
-        (isset($sales->comments_open_at) && $sales->comments_open_at < Carbon\Carbon::now()) ||
-            (Auth::check() && Auth::user()->hasPower('manage_sales')) ||
-            (Auth::check() && Auth::user()->hasPower('comment_on_sales')) ||
-            !isset($sales->comments_open_at))
+        (isset($sales->comments_open_at) && $sales->comments_open_at < Carbon\Carbon::now())
+        || (Auth::check() && (Auth::user()->hasPower('manage_sales') || Auth::user()->hasPower('comment_on_sales')))
+        || !isset($sales->comments_open_at))
         <hr class="mb-5" />
         @comments(['model' => $sales, 'perPage' => 5])
     @else