From aa8ae3a01034f35b29de68e8776fd7bcaad8e5f2 Mon Sep 17 00:00:00 2001
From: RRS <ramirors@gmail.com>
Date: Wed, 19 Nov 2025 09:38:09 -0600
Subject: [PATCH 1/2] Fix variable naming overwriting collection name in
 UserController processing loop

---
 .../src/Http/Controllers/Settings/UserController.php   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/Webkul/Admin/src/Http/Controllers/Settings/UserController.php b/packages/Webkul/Admin/src/Http/Controllers/Settings/UserController.php
index ef41c4bc87..e371c83bf4 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Settings/UserController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Settings/UserController.php
@@ -197,18 +197,18 @@ public function massUpdate(MassUpdateRequest $massDestroyRequest): JsonResponse
 
         $users = $this->userRepository->findWhereIn('id', $massDestroyRequest->input('indices'));
 
-        foreach ($users as $users) {
-            if (auth()->guard('user')->user()->id == $users->id) {
+        foreach ($users as $user) {
+            if (auth()->guard('user')->user()->id == $user->id) {
                 continue;
             }
 
-            Event::dispatch('settings.user.update.before', $users->id);
+            Event::dispatch('settings.user.update.before', $user->id);
 
             $this->userRepository->update([
                 'status' => $massDestroyRequest->input('value'),
-            ], $users->id);
+            ], $user->id);
 
-            Event::dispatch('settings.user.update.after', $users->id);
+            Event::dispatch('settings.user.update.after', $user->id);
 
             $count++;
         }

From d764795258f6cf3de04e98ebb0f73943ec08d76e Mon Sep 17 00:00:00 2001
From: RRS <ramirors@gmail.com>
Date: Wed, 19 Nov 2025 10:34:46 -0600
Subject: [PATCH 2/2] Remove redundant alias for Illuminate\Mail\Mailable

---
 packages/Webkul/Marketing/src/Mail/CampaignMail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/Marketing/src/Mail/CampaignMail.php b/packages/Webkul/Marketing/src/Mail/CampaignMail.php
index f5058c0355..882167d73f 100644
--- a/packages/Webkul/Marketing/src/Mail/CampaignMail.php
+++ b/packages/Webkul/Marketing/src/Mail/CampaignMail.php
@@ -2,7 +2,7 @@
 
 namespace Webkul\Marketing\Mail;
 
-use Illuminate\Mail\Mailable as Mailable;
+use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;