From f47f06de316675f1d1a635a457b1538ea2d0b6e3 Mon Sep 17 00:00:00 2001
From: shaiv-webkul <shaiv.roy361@webkul.com>
Date: Fri, 7 Feb 2020 15:48:20 +0530
Subject: [PATCH] #2180 fixed

---
 packages/Webkul/Admin/src/Resources/lang/en/app.php   |  4 ++--
 .../src/Http/Controllers/AttributeController.php      | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index ee3abea98..c736075a8 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -139,9 +139,9 @@ return [
     'datagrid' => [
         'mass-ops' => [
             'method-error' => 'Error! Wrong method detected, please check mass action configuration',
-            'delete-success' => 'System :resource were successfully deleted',
+            'delete-success' => 'Selected :resource were successfully deleted',
             'partial-action' => 'Some actions were not performed due restricted system constraints on :resource',
-            'update-success' => 'System :resource were successfully updated',
+            'update-success' => 'Selected :resource were successfully updated',
             'no-resource' => 'The resource provided for insufficient for the action'
         ],
 
diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
index d5230fca4..c80c3f841 100755
--- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
+++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
@@ -153,7 +153,6 @@ class AttributeController extends Controller
     public function massDestroy()
     {
         $suppressFlash = false;
-
         if (request()->isMethod('post')) {
             $indexes = explode(',', request()->input('indexes'));
 
@@ -161,10 +160,12 @@ class AttributeController extends Controller
                 $attribute = $this->attributeRepository->find($value);
 
                 try {
-                    if (! $attribute->is_user_defined) {
-                        continue;
-                    } else {
+                    if ($attribute->is_user_defined) {
+                        $suppressFlash = true;
                         $this->attributeRepository->delete($value);
+                       
+                    } else {
+                        session()->flash('error', trans('admin::app.response.user-define-error', ['name' => 'Attribute']));
                     }
                 } catch (\Exception $e) {
                     report($e);
@@ -174,7 +175,7 @@ class AttributeController extends Controller
                 }
             }
 
-            if (! $suppressFlash)
+            if ($suppressFlash)
                 session()->flash('success', trans('admin::app.datagrid.mass-ops.delete-success', ['resource' => 'attributes']));
             else
                 session()->flash('info', trans('admin::app.datagrid.mass-ops.partial-action', ['resource' => 'attributes']));