Merge pull request #18272 from spencerrlongg/add-null-checks

snipe · web-flow · commit 476bf95edf22 · 2025-12-03T09:48:43.000Z
Adds Null Checks
diff --git a/app/Models/Checkoutable.php b/app/Models/Checkoutable.php
@@ -43,8 +43,8 @@ public static function fromAcceptance(CheckoutAcceptance $unaccepted): self
             $name = optional($unaccepted_row->present())->nameUrl() ?? '';
         }
         if($unaccepted_row instanceof LicenseSeat){
-            $category = optional($unaccepted_row->license->category?->present())->nameUrl() ?? '';
-            $company = optional($unaccepted_row->license->company?->present())?->nameUrl() ?? '';
+            $category = optional($unaccepted_row->license?->category?->present())->nameUrl() ?? '';
+            $company = optional($unaccepted_row->license?->company?->present())?->nameUrl() ?? '';
             $model = '';
             $name = $unaccepted_row->license->present()->nameUrl() ?? '';
         }

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ public static function fromAcceptance(CheckoutAcceptance $unaccepted): self`
`43`	`43`	`$name = optional($unaccepted_row->present())->nameUrl() ?? '';`
`44`	`44`	`}`
`45`	`45`	`if($unaccepted_row instanceof LicenseSeat){`
`46`		`- $category = optional($unaccepted_row->license->category?->present())->nameUrl() ?? '';`
`47`		`- $company = optional($unaccepted_row->license->company?->present())?->nameUrl() ?? '';`
	`46`	`+ $category = optional($unaccepted_row->license?->category?->present())->nameUrl() ?? '';`
	`47`	`+ $company = optional($unaccepted_row->license?->company?->present())?->nameUrl() ?? '';`
`48`	`48`	`$model = '';`
`49`	`49`	`$name = $unaccepted_row->license->present()->nameUrl() ?? '';`
`50`	`50`	`}`