Inventory: show selected image and order alphabetically

app/Http/Controllers/Entity/InventoryController.php

@@ -39,13 +39,7 @@ public function index(Campaign $campaign, Entity $entity)
             );
         }
 
-        $inventory = $entity
-            ->inventories()
-            ->with(['entity', 'item', 'item.entity'])
-            ->get()
-            ->sortBy(function ($model, $key) {
-                return !empty($model->position) ? $model->position : 'zzzz' . $model->itemName();
-            });
+        $inventory = $entity->orderedInventory();
 
         return view('entities.pages.inventory.index', compact(
             'campaign',

app/Models/Entity.php

@@ -22,7 +22,9 @@
 use Exception;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use Collator;
 
 /**
  * Class Entity
@@ -482,17 +484,32 @@ public function export(): array
     /**
      * List of inventory items, group by alphabetical position
      */
-    public function orderedInventory(): array
+    public function orderedInventory(): Collection
     {
         $inventory = [];
-        foreach ($this->inventories as $item) {
+        $items = $this->inventories()->with(['image', 'item', 'item.entity', 'item.entity.image'])->get();
+        foreach ($items as $item) {
             if ($item->item_id && empty($item->item)) {
                 continue;
             }
             $position = $item->position ?: __('entities/inventories.default_position');
             $inventory[$position][] = $item;
         }
 
-        return $inventory;
+        // We want the inventory ordered by position, then by item name
+        $collator = new Collator(app()->getLocale());
+        $positions = array_keys($inventory);
+        $collator->asort($positions);
+
+        $ordered = [];
+        foreach ($positions as $position) {
+            $items = new Collection($inventory[$position]);
+            $ordered[$position] = $items->sortBy(function ($model) {
+                /** @var Inventory $model */
+                return $model->itemName();
+            });
+        }
+
+        return new Collection($ordered);
     }
 }