Merge remote-tracking branch 'origin/develop'

snipe · May 16, 2024 · 7743b03 · 7743b03
2 parents d691f3b + 84a601f
commit 7743b03
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/app/Models/Labels/FieldOption.php b/app/Models/Labels/FieldOption.php
@@ -27,6 +27,11 @@ public function getValue(Asset $asset) {
 
             return $asset->assignedTo ? $asset->assignedTo->present()->fullName() : null;
         }
+
+        // Handle Laravel's stupid Carbon datetime casting
+        if ($dataPath[0] === 'purchase_date') {
+            return $asset->purchase_date ? $asset->purchase_date->format('Y-m-d') : null;
+        }
 
         return $dataPath->reduce(function ($myValue, $path) {
             try { return $myValue ? $myValue->{$path} : ${$myValue}; }