From a9e7fdfb38efc8cdb315b61cb3f1117984457256 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Mon, 20 Dec 2021 15:56:24 +0530
Subject: [PATCH] Attribute Issue Fixed

---
 .../Http/Controllers/AttributeController.php  | 28 ++++++-------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
index 0eee43efb..f0e17bd95 100755
--- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
+++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
@@ -158,35 +158,25 @@ class AttributeController extends Controller
      */
     public function massDestroy()
     {
-        $suppressFlash = false;
-
         if (request()->isMethod('post')) {
             $indexes = explode(',', request()->input('indexes'));
 
-            foreach ($indexes as $key => $value) {
-                $attribute = $this->attributeRepository->find($value);
+            foreach ($indexes as $index) {
+                $attribute = $this->attributeRepository->find($index);
 
-                try {
-                    if ($attribute->is_user_defined) {
-                        $suppressFlash = true;
+                if (! $attribute->is_user_defined) {
+                    session()->flash('error', trans('admin::app.response.user-define-error', ['name' => 'Attribute']));
 
-                        $this->attributeRepository->delete($value);
-                    }
-                } catch (\Exception $e) {
-                    report($e);
-
-                    $suppressFlash = true;
-
-                    continue;
+                    return redirect()->back();
                 }
             }
 
-            if ($suppressFlash) {
-                session()->flash('success', trans('admin::app.datagrid.mass-ops.delete-success', ['resource' => 'attributes']));
-            } else {
-                session()->flash('error', trans('admin::app.response.user-define-error', ['name' => 'Attribute']));
+            foreach ($indexes as $index) {
+                $this->attributeRepository->delete($index);
             }
 
+            session()->flash('success', trans('admin::app.datagrid.mass-ops.delete-success', ['resource' => 'attributes']));
+
             return redirect()->back();
         } else {
             session()->flash('error', trans('admin::app.datagrid.mass-ops.method-error'));