Skip to content

Commit 212cd02

Browse files
committed
add null safe operators to company and csv plain values
1 parent 5daba60 commit 212cd02

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

app/Models/Checkoutable.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static function fromAcceptance(CheckoutAcceptance $unaccepted): self
2626
$acceptance = $unaccepted;
2727

2828
$assignee = $acceptance->assignedTo;
29-
$company = $unaccepted_row->company ? optional($unaccepted_row->company)->present()->nameUrl() : '';
29+
$company = $unaccepted_row?->company?->present()?->nameUrl() ?? '';
3030
$category = $model = $name = $tag = '';
3131
$type = $acceptance->checkoutable_item_type ?? '';
3232

@@ -70,10 +70,10 @@ public static function fromAcceptance(CheckoutAcceptance $unaccepted): self
7070
acceptance: $acceptance,
7171
assignee: $assignee,
7272
//plain text for CSVs
73-
plain_text_category: ($unaccepted_row->model?->category?->name ?? $unaccepted_row->license->category?->name ?? $unaccepted_row->category?->name ?? ''),
74-
plain_text_model: ($unaccepted_row->model?->name ?? $unaccepted_row->model_number ?? ''),
75-
plain_text_name: ($unaccepted_row->name ?? $unaccepted_row->license?->name ?? ''),
76-
plain_text_company: ($unaccepted_row->company)->name ?? $unaccepted_row->license->company?->name ?? '',
73+
plain_text_category: $unaccepted_row?->model?->category?->name ?? $unaccepted_row?->license?->category?->name ?? $unaccepted_row?->category?->name ?? '',
74+
plain_text_model: $unaccepted_row?->model?->name ?? $unaccepted_row?->model_number ?? '',
75+
plain_text_name: $unaccepted_row?->name ?? $unaccepted_row?->license?->name ?? '',
76+
plain_text_company: $unaccepted_row?->company->name ?? $unaccepted_row?->license?->company?->name ?? '',
7777
);
7878
}
7979
}

0 commit comments

Comments
 (0)