From 65e3e9c77671b5a6ab1664fd30867f531bc96d61 Mon Sep 17 00:00:00 2001
From: "Christopher C. Wells" <git@chris-wells.net>
Date: Mon, 8 Mar 2021 15:06:21 -0800
Subject: [PATCH] Set formatted serving size to null when empty

---
 app/Models/Food.php                  | 8 ++++++--
 resources/views/foods/edit.blade.php | 9 +--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/Models/Food.php b/app/Models/Food.php
index fdd894d..07a831d 100644
--- a/app/Models/Food.php
+++ b/app/Models/Food.php
@@ -156,8 +156,12 @@ final class Food extends Model
     /**
      * Get the serving size as a formatted string (e.g. 0.5 = 1/2).
      */
-    public function getServingSizeFormattedAttribute(): string {
-        return Number::fractionStringFromFloat($this->serving_size);
+    public function getServingSizeFormattedAttribute(): ?string {
+        $result = null;
+        if (!empty($this->serving_size)) {
+            $result = Number::fractionStringFromFloat($this->serving_size);
+        }
+        return $result;
     }
 
     /**
diff --git a/resources/views/foods/edit.blade.php b/resources/views/foods/edit.blade.php
index 2f39ddc..faf1aa1 100644
--- a/resources/views/foods/edit.blade.php
+++ b/resources/views/foods/edit.blade.php
@@ -46,13 +46,6 @@
 
                             <div class="flex flex-col space-y-4 sm:flex-row sm:space-x-4 sm:space-y-0">
                                 <!-- Serving size -->
-                                @php
-                                if (!empty($food->serving_size)) {
-                                  $old_value = \App\Support\Number::fractionStringFromFloat($food->serving_size);
-                                } else {
-                                  $old_value = null;
-                                }
-                                @endphp
                                 <div>
                                     <x-inputs.label for="serving_size" value="Serving size"/>
 
@@ -61,7 +54,7 @@
                                                     type="text"
                                                     name="serving_size"
                                                     size="10"
-                                                    :value="old('serving_size', $old_value)"
+                                                    :value="old('serving_size', $food->serving_size_formatted)"
                                                     required/>
                                 </div>