Merge remote-tracking branch 'Franciscof-Serfe/improve-success-messages-admin-backend' into AC-10886

Author: wip44850

app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php

@@ -11,11 +11,12 @@
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\State\UserLockedException;
 use Magento\Security\Model\SecurityCookie;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Save extends \Magento\Backend\Controller\Adminhtml\System\Account
+class Save extends \Magento\Backend\Controller\Adminhtml\System\Account implements HttpPostActionInterface
 {
     /**
      * @var SecurityCookie
@@ -25,8 +26,11 @@ class Save extends \Magento\Backend\Controller\Adminhtml\System\Account
     /**
      * Get security cookie
      *
+     * @deprecated 100.1.0 This method is deprecated because dependency injection should be used instead of
+     *                     directly accessing the SecurityCookie instance.
+     *                     Use dependency injection to get an instance of SecurityCookie.
+     * @see \Magento\Backend\Controller\Adminhtml\System\Account::__construct()
      * @return SecurityCookie
-     * @deprecated 100.1.0
      */
     private function getSecurityCookie()
     {
@@ -81,7 +85,39 @@ public function execute()
             } else {
                 $user->save();
                 $user->sendNotificationEmailsIfRequired();
-                $this->messageManager->addSuccessMessage(__('You saved the account.'));
+
+                // Check which fields were modified after saving
+                $modifiedFields = [];
+                $propertiesToCheck = ['password', 'username', 'firstname', 'lastname', 'email'];
+
+                foreach ($propertiesToCheck as $property) {
+                    if ($user->getOrigData($property) !== $user->{'get' . ucfirst($property)}()) {
+                        $modifiedFields[] = $property;
+                    }
+                }
+
+                if (!empty($modifiedFields)) {
+                    $countModifiedFields = count($modifiedFields);
+                    $successMessage = '';
+                    // validate how many fields were modified to display them correctly
+                    if ($countModifiedFields > 1) {
+                        $lastModifiedField = array_pop($modifiedFields);
+                        $modifiedFieldsText = implode(', ', $modifiedFields);
+                        $successMessage = __(
+                            'The %1 and %2 of this account have been modified successfully.',
+                            $modifiedFieldsText,
+                            $lastModifiedField
+                        );
+                    } else {
+                        $successMessage = __(
+                            'The %1 of this account has been modified successfully.',
+                            reset($modifiedFields)
+                        );
+                    }
+                    $this->messageManager->addSuccessMessage($successMessage);
+                } else {
+                    $this->messageManager->addSuccessMessage(__('You saved the account.'));
+                }
             }
         } catch (UserLockedException $e) {
             $this->_auth->logout();

dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/System/AccountTest.php

@@ -72,7 +72,7 @@ public function testSaveAction($password, $passwordConfirmation, $isPasswordChan
 
     public static function saveDataProvider()
     {
-        $password = uniqid('123q');
+        $password = uniqid('1234q');
         return [
             [$password, $password, true],
             [$password, '', false],