cautious user assignment

craftcms · Sep 30, 2024 · be857b5 · be857b5
1 parent 3c60752
commit be857b5
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/services/OrderHistories.php b/src/services/OrderHistories.php
@@ -120,10 +120,16 @@ public function createOrderHistoryFromOrder(Order $order, ?int $oldStatusId): bo
  $userId = $currentUser->id;
  }
 
- $user = Craft::$app->getUsers()->getUserById($userId);
+ if ($userId) {
+ $user = Craft::$app->getUsers()->getUserById($userId);
+ if($user) {
+ $orderHistoryModel->userId = $userId;
+ $orderHistoryModel->userName = $user->fullName ?? $user->getEmail();
+ }else{
+ $orderHistoryModel->userName = $order->getEmail();
+ }
+ }
 
- $orderHistoryModel->userId = $userId;
- $orderHistoryModel->userName = $user?->fullName ?? $user?->email;
  $orderHistoryModel->message = $order->message;
 
  if (!$this->saveOrderHistory($orderHistoryModel)) {