zilong 4 år sedan
förälder
incheckning
72e4d995b4
2 ändrade filer med 6 tillägg och 4 borttagningar
  1. 1 1
      app/Exceptions/Handler.php
  2. 5 3
      app/Models/Order.php

+ 1 - 1
app/Exceptions/Handler.php

xqd
@@ -43,7 +43,7 @@ class Handler extends ExceptionHandler
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function render($request, Exception $exception)
     {

+ 5 - 3
app/Models/Order.php

xqd
@@ -96,10 +96,12 @@ class Order extends BaseModel
 
     public function getIsEvaluateAttribute()
     {
-        $user = User::getUserByToken();
         $is_evaluate = 0;
-        if (Evaluate::where('order_id', $this->id)->where('user_id', $user['id'])->exists()) {
-            $is_evaluate = 1;
+        $user = User::getUserByToken(false);
+        if (!empty($user)) {
+            if (Evaluate::where('order_id', $this->id)->where('user_id', $user['id'])->exists()) {
+                $is_evaluate = 1;
+            }
         }
 
         return $is_evaluate;