From 000cf6481aad117b2d4a59c02cea5d171682f5d9 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Thu, 31 Mar 2022 10:20:41 +0530
Subject: [PATCH] Issue #6186 fixed

---
 .../src/Http/Controllers/ReviewController.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php b/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php
index 190e0a499..aeb2d8549 100755
--- a/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php
@@ -82,23 +82,26 @@ class ReviewController extends Controller
             'title'   => 'required',
         ]);
 
-        $data = request()->all();
+        $product = $this->productRepository->find($id);
+
+        $data = array_merge(request()->all(), [
+            'status'     => 'pending',
+            'product_id' => $id,
+        ]);
 
         if (auth()->guard('customer')->user()) {
             $data['customer_id'] = auth()->guard('customer')->user()->id;
+
             $data['name'] = auth()->guard('customer')->user()->first_name . ' ' . auth()->guard('customer')->user()->last_name;
         }
 
-        $data['status'] = 'pending';
-        $data['product_id'] = $id;
-
         $review = $this->productReviewRepository->create($data);
 
         $this->productReviewImageRepository->uploadImages($data, $review);
 
         session()->flash('success', trans('shop::app.response.submit-success', ['name' => 'Product Review']));
 
-        return redirect()->route($this->_config['redirect']);
+        return redirect()->route('shop.productOrCategory.index', $product->url_key);
     }
 
     /**
@@ -147,10 +150,8 @@ class ReviewController extends Controller
     {
         $reviews = auth()->guard('customer')->user()->all_reviews;
 
-        if ($reviews->count() > 0) {
-            foreach ($reviews as $review) {
-                $this->productReviewRepository->delete($review->id);
-            }
+        foreach ($reviews as $review) {
+            $this->productReviewRepository->delete($review->id);
         }
 
         session()->flash('success', trans('shop::app.reviews.delete-all'));