From 4ec816b3ff425e0d2fab8be96c5f1c3ca1a8a2e0 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 21 Apr 2026 10:01:19 +0200
Subject: [PATCH 01/26] update buttons

---
 .../Block/Catalog/Product/Attribute/Edit.php  | 12 ++--
 .../Mage/Adminhtml/Block/Cms/Block/Edit.php   | 10 +--
 .../Mage/Adminhtml/Block/Cms/Page/Edit.php    | 10 +--
 .../Mage/Adminhtml/Block/Customer/Edit.php    | 11 ++--
 .../Adminhtml/Block/Promo/Catalog/Edit.php    | 11 ++--
 .../Mage/Adminhtml/Block/Promo/Quote/Edit.php | 11 ++--
 .../Block/Sales/Transactions/Detail.php       |  9 ++-
 .../Block/System/Convert/Gui/Edit.php         | 11 ++--
 .../Block/System/Convert/Profile/Edit.php     | 11 ++--
 .../Adminhtml/Block/System/Variable/Edit.php  | 11 ++--
 .../core/Mage/Adminhtml/Block/Tag/Edit.php    | 11 ++--
 .../Mage/Adminhtml/Block/Tax/Rule/Edit.php    | 10 +--
 .../Mage/Adminhtml/Block/Urlrewrite/Edit.php  | 10 +--
 .../Mage/Adminhtml/Block/Widget/Container.php | 66 +++++++++++++++++++
 .../Adminhtml/Block/Widget/Form/Container.php | 31 ++++-----
 .../Adminhtml/Block/Widget/Grid/Container.php |  9 ++-
 .../Adminhtml/Block/Widget/View/Container.php |  9 ++-
 .../Block/Adminhtml/Oauth/Consumer/Edit.php   | 10 +--
 .../Adminhtml/Billing/Agreement/View.php      |  9 ++-
 .../Adminhtml/Recurring/Profile/View.php      |  6 +-
 .../Block/Adminhtml/Widget/Instance/Edit.php  | 12 ++--
 21 files changed, 167 insertions(+), 123 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php
index a68510d0aca..0a8d40d7e29 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php
@@ -33,14 +33,10 @@ public function __construct()
                 ],
             );
         } else {
-            $this->_addButton(
-                'save_and_edit_button',
-                [
-                    'label'     => Mage::helper('catalog')->__('Save and Continue Edit'),
-                    'onclick'   => 'saveAndContinueEdit()',
-                    'class'     => 'save continue',
-                ],
-                100,
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_SAVE_EDIT,
+                level: 100,
+                module: 'catalog',
             );
         }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php
index 17caa2c615e..8da4b665567 100644
--- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php
@@ -22,11 +22,11 @@ public function __construct()
         parent::__construct();
 
         if ($this->_isAllowedAction('save')) {
-            $this->_addButton('saveandcontinue', [
-                'label'     => Mage::helper('adminhtml')->__('Save and Continue Edit'),
-                'onclick'   => 'saveAndContinueEdit()',
-                'class'     => 'save continue',
-            ], -100);
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_SAVE_EDIT,
+                level: -100,
+                module: 'catalog',
+            );
         } else {
             $this->_removeButton('save');
         }
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php
index 22706d008a9..3f0681727a6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php
@@ -26,11 +26,11 @@ public function __construct()
         parent::__construct();
 
         if ($this->_isAllowedAction('save')) {
-            $this->_addButton('saveandcontinue', [
-                'label'     => Mage::helper('adminhtml')->__('Save and Continue Edit'),
-                'onclick'   => Mage::helper('core/js')->getSaveAndContinueEditJs($this->_getSaveAndContinueUrl()),
-                'class'     => 'save continue',
-            ], -100);
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_SAVE_EDIT,
+                level: -100,
+                onClick: Mage::helper('core/js')->getSaveAndContinueEditJs($this->_getSaveAndContinueUrl()),
+            );
         } else {
             $this->_removeButton('save');
         }
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php
index e4af46c1b1a..24e1489a9da 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php
@@ -95,11 +95,12 @@ public function getValidationUrl()
     protected function _prepareLayout()
     {
         if (!Mage::registry('current_customer')->isReadonly()) {
-            $this->_addButton('save_and_continue', [
-                'label'     => Mage::helper('customer')->__('Save and Continue Edit'),
-                'onclick'   => Mage::helper('core/js')->getSaveAndContinueEditJs($this->_getSaveAndContinueUrl()),
-                'class'     => 'save continue',
-            ], 10);
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_SAVE_EDIT,
+                level: 10,
+                module: 'customer',
+                onClick: Mage::helper('core/js')->getSaveAndContinueEditJs($this->_getSaveAndContinueUrl()),
+            );
         }
 
         return parent::_prepareLayout();
diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php
index 0febd38ee5f..8cd9bcde163 100644
--- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php
@@ -33,11 +33,12 @@ public function __construct()
             'onclick' => "$('rule_auto_apply').value=1; editForm.submit()",
         ]);
 
-        $this->_addButton('save_and_continue_edit', [
-            'class'   => 'save continue',
-            'label'   => Mage::helper('catalogrule')->__('Save and Continue Edit'),
-            'onclick' => 'editForm.submit($(\'edit_form\').action + \'back/edit/\')',
-        ], 10);
+        $this->_addPreparedButton(
+            id: self::BUTTON_TYPE_SAVE_EDIT,
+            level: 10,
+            module: 'catalogrule',
+            onClick: 'editForm.submit($(\'edit_form\').action + \'back/edit/\')',
+        );
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php
index 64238b0c040..3bd8b5e1de7 100644
--- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php
@@ -26,11 +26,12 @@ public function __construct()
 
         parent::__construct();
 
-        $this->_addButton('save_and_continue_edit', [
-            'class'   => 'save continue',
-            'label'   => Mage::helper('salesrule')->__('Save and Continue Edit'),
-            'onclick' => 'editForm.submit($(\'edit_form\').action + \'back/edit/\')',
-        ], 10);
+        $this->_addPreparedButton(
+            id: self::BUTTON_TYPE_SAVE_EDIT,
+            level: 10,
+            module: 'salesrule',
+            onClick: 'editForm.submit($(\'edit_form\').action + \'back/edit/\')',
+        );
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php
index 3af47b3c771..fe0cbfbebbc 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php
@@ -50,11 +50,10 @@ public function __construct()
         $this->_txn = Mage::registry('current_transaction');
 
         $backUrl = ($this->_txn->getOrderUrl()) ? $this->_txn->getOrderUrl() : $this->getUrl('*/*/');
-        $this->_addButton('back', [
-            'label'   => Mage::helper('sales')->__('Back'),
-            'onclick' => Mage::helper('core/js')->getSetLocationJs($backUrl),
-            'class'   => 'back',
-        ]);
+        $this->_addPreparedButton(
+            id: self::BUTTON_TYPE_BACK,
+            onClick: Mage::helper('core/js')->getSetLocationJs($backUrl),
+        );
 
         if (Mage::getSingleton('admin/session')->isAllowed('sales/transactions/fetch')
             && $this->_txn->getOrderPaymentObject()->getMethodInstance()->canFetchTransactionInfo()
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php
index 9ae5785d1c1..dedeacd1b2e 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php
@@ -23,11 +23,12 @@ public function __construct()
 
         $this->_updateButton('save', 'label', Mage::helper('adminhtml')->__('Save Profile'));
         $this->_updateButton('delete', 'label', Mage::helper('adminhtml')->__('Delete Profile'));
-        $this->_addButton('savecontinue', [
-            'label'     => Mage::helper('adminhtml')->__('Save and Continue Edit'),
-            'onclick'   => "$('edit_form').action += 'continue/true/'; editForm.submit();",
-            'class'     => 'save continue',
-        ], -100);
+
+        $this->_addPreparedButton(
+            id: self::BUTTON_TYPE_SAVE_EDIT,
+            level: -100,
+            onClick: "$('edit_form').action += 'continue/true/'; editForm.submit();",
+        );
     }
 
     public function getProfileId()
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php
index 1d3608e93c7..8fd152c370d 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php
@@ -23,11 +23,12 @@ public function __construct()
 
         $this->_updateButton('save', 'label', Mage::helper('adminhtml')->__('Save Profile'));
         $this->_updateButton('delete', 'label', Mage::helper('adminhtml')->__('Delete Profile'));
-        $this->_addButton('savecontinue', [
-            'label'     => Mage::helper('adminhtml')->__('Save and Continue Edit'),
-            'onclick'   => "$('edit_form').action += 'continue/true/'; editForm.submit();",
-            'class'     => 'save continue',
-        ], -100);
+
+        $this->_addPreparedButton(
+            id: self::BUTTON_TYPE_SAVE_EDIT,
+            level: -100,
+            onClick: "$('edit_form').action += 'continue/true/'; editForm.submit();",
+        );
     }
 
     public function getProfileId()
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php
index 1ba30b5b516..634a44b7ab7 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php
@@ -39,11 +39,12 @@ public function getVariable()
     #[Override]
     protected function _prepareLayout()
     {
-        $this->_addButton('save_and_edit', [
-            'label'     => Mage::helper('adminhtml')->__('Save and Continue Edit'),
-            'class'     => 'save continue',
-            'onclick'   => "editForm.submit('" . $this->getSaveAndContinueUrl() . "');",
-        ], 100);
+        $this->_addPreparedButton(
+            id: self::BUTTON_TYPE_SAVE_EDIT,
+            level: 100,
+            onClick: "editForm.submit('" . $this->getSaveAndContinueUrl() . "');",
+        );
+
         if (!$this->getVariable()->getId()) {
             $this->removeButton('delete');
         }
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php
index 78bfafa9e6d..e41865558f5 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php
@@ -28,11 +28,12 @@ public function __construct()
         $this->_updateButton('save', 'label', Mage::helper('tag')->__('Save Tag'));
         $this->_updateButton('delete', 'label', Mage::helper('tag')->__('Delete Tag'));
 
-        $this->addButton('save_and_edit_button', [
-            'label'   => Mage::helper('tag')->__('Save and Continue Edit'),
-            'onclick' => Mage::helper('core/js')->getSaveAndContinueEditJs($this->getSaveAndContinueUrl()),
-            'class'   => 'save continue',
-        ], 1);
+        $this->_addPreparedButton(
+            id: self::BUTTON_TYPE_SAVE_EDIT,
+            level: 1,
+            module: 'tag',
+            onClick: Mage::helper('core/js')->getSaveAndContinueEditJs($this->getSaveAndContinueUrl()),
+        );
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php
index 499d207823d..b0cf559c0a5 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php
@@ -27,11 +27,11 @@ public function __construct()
     #[Override]
     protected function _prepareLayout()
     {
-        $this->_addButton('save_and_continue', [
-            'label'     => Mage::helper('tax')->__('Save and Continue Edit'),
-            'onclick'   => 'saveAndContinueEdit()',
-            'class'     => 'save continue',
-        ], 10);
+        $this->_addPreparedButton(
+            id: self::BUTTON_TYPE_SAVE_EDIT,
+            level: 10,
+            module: 'tax',
+        );
 
         $this->_formScripts[] = " function saveAndContinueEdit(){ editForm.submit($('edit_form').action + 'back/edit/') } ";
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
index 698704df42a..1563925bed8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
@@ -36,12 +36,8 @@ class Mage_Adminhtml_Block_Urlrewrite_Edit extends Mage_Adminhtml_Block_Widget_C
     protected function _prepareLayout()
     {
         $this->setTemplate('urlrewrite/edit.phtml');
-        $this->_addButton('back', [
-            'label'   => Mage::helper('adminhtml')->__('Back'),
-            'onclick' => Mage::helper('core/js')->getSetLocationJs(Mage::helper('adminhtml')::getUrl('*/*/')),
-            'class'   => 'back',
-            'level'   => -1,
-        ]);
+
+        $this->_addPreparedButton(id: self::BUTTON_TYPE_BACK);
 
         // links to products/categories (if any) selectors
         if ($this->getProductId()) {
@@ -96,7 +92,7 @@ protected function _prepareLayout()
                     ]),
                 );
                 $this->_updateButton(
-                    'back',
+                    self::BUTTON_TYPE_BACK,
                     'onclick',
                     Mage::helper('core/js')->getSetLocationJs(Mage::helper('adminhtml')::getUrl('*/*/edit') . 'product'),
                 );
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
index e997e8cf61e..7768932855b 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
@@ -14,6 +14,16 @@
  */
 class Mage_Adminhtml_Block_Widget_Container extends Mage_Adminhtml_Block_Template
 {
+    public const BUTTON_TYPE_BACK       = 'back';
+
+    public const BUTTON_TYPE_DELETE     = 'delete';
+
+    public const BUTTON_TYPE_RESET      = 'reset';
+
+    public const BUTTON_TYPE_SAVE       = 'save';
+
+    public const BUTTON_TYPE_SAVE_EDIT  = 'save-edit';
+
     /**
      * So-called "container controller" to specify group of blocks participating in some action
      *
@@ -62,6 +72,62 @@ protected function _addButton($id, $data, $level = 0, $sortOrder = 0, $area = 'h
         return $this;
     }
 
+    /**
+     * @param  self::BUTTON_TYPE_* $id
+     * @return $this
+     */
+    protected function _addPreparedButton(
+        string $id,
+        array  $data,
+        int    $level = 0,
+        int    $sortOrder = 0,
+        string $area = 'header',
+        string $module = 'adminhtml',
+        ?string $onClick = null
+    ) {
+        if (is_null($onClick)) {
+            $onClick = match ($id) {
+                self::BUTTON_TYPE_BACK      => Mage::helper('core/js')->getSetLocationJs(Mage::helper('adminhtml')::getUrl('*/*/')),
+                self::BUTTON_TYPE_RESET     => 'setLocation(window.location.href)',
+                self::BUTTON_TYPE_SAVE      => 'editForm.submit();',
+                self::BUTTON_TYPE_SAVE_EDIT => 'saveAndContinueEdit()',
+                default => '',
+            };
+        }
+
+        match ($id) {
+            self::BUTTON_TYPE_BACK => $data = array_merge([
+                'label'     => Mage::helper($module)->__('Back'),
+                'class'     => 'back',
+                'onclick'   => $onClick,
+                'level'     => -1,
+            ], $data),
+            self::BUTTON_TYPE_DELETE => $data = array_merge([
+                'label' => Mage::helper($module)->__('Delete'),
+                'class' => 'delete',
+            ], $data),
+            self::BUTTON_TYPE_RESET => $data = array_merge([
+                'label'     => Mage::helper($module)->__('Reset'),
+                'class'     => 'reset',
+                'onclick'   => $onClick,
+                'level'     => -1,
+            ], $data),
+            self::BUTTON_TYPE_SAVE => $data = array_merge([
+                'label'     => Mage::helper($module)->__('Save'),
+                'class'     => 'save',
+                'onclick'   => $onClick,
+                'level'     => 1,
+            ], $data),
+            self::BUTTON_TYPE_SAVE_EDIT => $data = array_merge([
+                'label'     => Mage::helper($module)->__('Save and Continue Edit'),
+                'class'     => 'save continue',
+                'onclick'   => $onClick,
+            ], $data),
+        };
+
+        return $this->_addButton($id, $data);
+    }
+
     /**
      * Public wrapper for protected _addButton method
      *
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php
index dab09877809..da43a8d41e3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php
@@ -33,32 +33,23 @@ public function __construct()
             $this->setTemplate('widget/form/container.phtml');
         }
 
-        $this->_addButton('back', [
-            'label'     => Mage::helper('adminhtml')->__('Back'),
-            'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getBackUrl()),
-            'class'     => 'back',
-        ], -1);
-        $this->_addButton('reset', [
-            'label'     => Mage::helper('adminhtml')->__('Reset'),
-            'onclick'   => 'setLocation(window.location.href)',
-            'class'     => 'reset',
-        ], -1);
+        $this->_addPreparedButton(
+            id: self::BUTTON_TYPE_BACK,
+            onClick: Mage::helper('core/js')->getSetLocationJs($this->getBackUrl()),
+        );
+
+        $this->_addPreparedButton(id: self::BUTTON_TYPE_RESET);
 
         $objId = $this->getRequest()->getParam($this->_objectId);
 
         if (!empty($objId)) {
-            $this->_addButton('delete', [
-                'label'     => Mage::helper('adminhtml')->__('Delete'),
-                'class'     => 'delete',
-                'onclick'   => Mage::helper('core/js')->getDeleteConfirmJs($this->getDeleteUrl()),
-            ]);
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_DELETE,
+                onClick: Mage::helper('core/js')->getDeleteConfirmJs($this->getDeleteUrl()),
+            );
         }
 
-        $this->_addButton('save', [
-            'label'     => Mage::helper('adminhtml')->__('Save'),
-            'onclick'   => 'editForm.submit();',
-            'class'     => 'save',
-        ], 1);
+        $this->_addPreparedButton(id: self::BUTTON_TYPE_SAVE);
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php
index 766d9afdb38..24a7ff8be9e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php
@@ -103,11 +103,10 @@ protected function getBackButtonLabel()
 
     protected function _addBackButton()
     {
-        $this->_addButton('back', [
-            'label'     => $this->getBackButtonLabel(),
-            'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getBackUrl()),
-            'class'     => 'back',
-        ]);
+        $this->_addPreparedButton(
+            id: self::BUTTON_TYPE_BACK,
+            onClick: Mage::helper('core/js')->getSetLocationJs($this->getBackUrl()),
+        );
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php
index c86b28ef8af..8d0326e65f0 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php
@@ -22,11 +22,10 @@ public function __construct()
 
         $this->setTemplate('widget/view/container.phtml');
 
-        $this->_addButton('back', [
-            'label'     => Mage::helper('adminhtml')->__('Back'),
-            'onclick'   => "window.location.href='" . $this->getUrl('*/*/') . "'",
-            'class'     => 'back',
-        ]);
+        $this->_addPreparedButton(
+            id: self::BUTTON_TYPE_BACK,
+            onClick: "window.location.href='" . $this->getUrl('*/*/') . "'",
+        );
 
         $this->_addButton('edit', [
             'label'     => Mage::helper('adminhtml')->__('Edit'),
diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php
index 98d5c7762c7..83eb6af84e4 100644
--- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php
+++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php
@@ -45,11 +45,11 @@ public function __construct()
         $this->_controller = 'adminhtml_oauth_consumer';
         $this->_mode = 'edit';
 
-        $this->_addButton('save_and_continue', [
-            'label'     => Mage::helper('oauth')->__('Save and Continue Edit'),
-            'onclick'   => 'saveAndContinueEdit()',
-            'class'     => 'save continue',
-        ], 100);
+        $this->_addPreparedButton(
+            id: self::BUTTON_TYPE_SAVE_EDIT,
+            level: 100,
+            module: 'oauth',
+        );
 
         $this->_formScripts[] = 'function saveAndContinueEdit()'
         . "{editForm.submit($('edit_form').action + 'back/edit/')}";
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php
index f19d07d0c49..6c187408ec1 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php
@@ -35,11 +35,10 @@ public function __construct()
         $this->_removeButton('save');
         $this->setId('billing_agreement_view');
 
-        $this->_addButton('back', [
-            'label'     => Mage::helper('adminhtml')->__('Back'),
-            'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getBackUrl()),
-            'class'     => 'back',
-        ], -1);
+        $this->_addPreparedButton(
+            id: self::BUTTON_TYPE_BACK,
+            onClick: Mage::helper('core/js')->getSetLocationJs($this->getBackUrl())
+        );
 
         if ($this->_getBillingAgreement()->canCancel() && $this->_isAllowed('sales/billing_agreement/actions/manage')) {
             $this->_addButton('cancel', [
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php
index 240c26ca11a..ac28b893876 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php
@@ -26,11 +26,7 @@ class Mage_Sales_Block_Adminhtml_Recurring_Profile_View extends Mage_Adminhtml_B
     #[Override]
     protected function _prepareLayout()
     {
-        $this->_addButton('back', [
-            'label'     => Mage::helper('adminhtml')->__('Back'),
-            'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/')),
-            'class'     => 'back',
-        ]);
+        $this->_addPreparedButton(id: self::BUTTON_TYPE_BACK);
 
         $profile = Mage::registry('current_recurring_profile');
 
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php
index e71d6b7a440..6848ab5b968 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php
@@ -46,14 +46,10 @@ public function getWidgetInstance()
     protected function _prepareLayout()
     {
         if ($this->getWidgetInstance()->isCompleteToCreate()) {
-            $this->_addButton(
-                'save_and_edit_button',
-                [
-                    'label'     => Mage::helper('widget')->__('Save and Continue Edit'),
-                    'class'     => 'save continue',
-                    'onclick'   => 'saveAndContinueEdit()',
-                ],
-                100,
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_SAVE_EDIT,
+                level: 100,
+                module: 'widget',
             );
         } else {
             $this->removeButton('save');

From d1f8b99ef4fcfdf2b79355ff45c243a7fe7dd52d Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 21 Apr 2026 11:08:45 +0200
Subject: [PATCH 02/26] added data-test id to login.

---
 app/design/adminhtml/base/default/template/login.phtml     | 4 ++--
 app/design/adminhtml/openmage/default/template/login.phtml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/design/adminhtml/base/default/template/login.phtml b/app/design/adminhtml/base/default/template/login.phtml
index d50f9dd5e2c..70a63064aca 100644
--- a/app/design/adminhtml/base/default/template/login.phtml
+++ b/app/design/adminhtml/base/default/template/login.phtml
@@ -35,11 +35,11 @@
                     </div>
                     <div class="input-box input-left">
                         <label for="username"><?php echo Mage::helper('adminhtml')->__('User Name:') ?></label><br />
-                        <input type="text" id="username" name="login[username]" value="" class="required-entry input-text" autofocus="autofocus" />
+                        <input type="text" id="username" name="login[username]" value="" class="required-entry input-text" autofocus="autofocus" data-test="input-login-username" />
                     </div>
                     <div class="input-box input-right">
                         <label for="login"><?php echo Mage::helper('adminhtml')->__('Password:') ?></label><br />
-                        <input type="password" id="login" name="login[password]" value="" class="required-entry input-text" />
+                        <input type="password" id="login" name="login[password]" value="" class="required-entry input-text" data-test="input-login-password" />
                     </div>
                     <?php echo $this->getChildHtml('form.additional.info') ?>
                     <div class="clear"></div>
diff --git a/app/design/adminhtml/openmage/default/template/login.phtml b/app/design/adminhtml/openmage/default/template/login.phtml
index 10d25b8cc4f..fbd02c92237 100644
--- a/app/design/adminhtml/openmage/default/template/login.phtml
+++ b/app/design/adminhtml/openmage/default/template/login.phtml
@@ -34,11 +34,11 @@
                     </div>
                     <div class="input-box input-left">
                         <label for="username"><?php echo Mage::helper('adminhtml')->__('User Name:') ?></label><br />
-                        <input type="text" id="username" name="login[username]" value="" class="required-entry input-text" autofocus="autofocus" />
+                        <input type="text" id="username" name="login[username]" value="" class="required-entry input-text" autofocus="autofocus" data-test="input-login-username" />
                     </div>
                     <div class="input-box input-right">
                         <label for="login"><?php echo Mage::helper('adminhtml')->__('Password:') ?></label><br />
-                        <input type="password" id="login" name="login[password]" value="" class="required-entry input-text" />
+                        <input type="password" id="login" name="login[password]" value="" class="required-entry input-text" data-test="input-login-password" />
                     </div>
                     <?php echo $this->getChildHtml('form.additional.info') ?>
                     <div class="clear"></div>

From b5003899d6a8be76ea3a8f5c6d8aac48dea13195 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 21 Apr 2026 11:25:11 +0200
Subject: [PATCH 03/26] update

---
 .../Block/Catalog/Product/Attribute/Edit.php  | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php
index 0a8d40d7e29..493c606edf5 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php
@@ -22,15 +22,10 @@ public function __construct()
         parent::__construct();
 
         if ($this->getRequest()->getParam('popup')) {
-            $this->_removeButton('back');
-            $this->_addButton(
-                'close',
-                [
-                    'label'     => Mage::helper('catalog')->__('Close Window'),
-                    'class'     => 'cancel',
-                    'onclick'   => 'window.close()',
-                    'level'     => -1,
-                ],
+            $this->_removeButton(self::BUTTON_TYPE_BACK);
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_CLOSE,
+                module: 'catalog',
             );
         } else {
             $this->_addPreparedButton(
@@ -40,13 +35,13 @@ public function __construct()
             );
         }
 
-        $this->_updateButton('save', 'label', Mage::helper('catalog')->__('Save Attribute'));
-        $this->_updateButton('save', 'onclick', 'saveAttribute()');
+        $this->_updateButton(self::BUTTON_TYPE_SAVE, 'label', Mage::helper('catalog')->__('Save Attribute'));
+        $this->_updateButton(self::BUTTON_TYPE_SAVE, 'onclick', 'saveAttribute()');
 
         if (!Mage::registry('entity_attribute')->getIsUserDefined()) {
-            $this->_removeButton('delete');
+            $this->_removeButton(self::BUTTON_TYPE_DELETE);
         } else {
-            $this->_updateButton('delete', 'label', Mage::helper('catalog')->__('Delete Attribute'));
+            $this->_updateButton(self::BUTTON_TYPE_DELETE, 'label', Mage::helper('catalog')->__('Delete Attribute'));
         }
     }
 

From 7e3263732ed9cfc4c23150f007b88519fcb68294 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 21 Apr 2026 11:43:21 +0200
Subject: [PATCH 04/26] update

---
 .../Mage/Adminhtml/Block/Cms/Block/Edit.php     |  4 ++--
 .../core/Mage/Adminhtml/Block/Cms/Page/Edit.php |  4 ++--
 .../Adminhtml/Block/System/Convert/Gui/Edit.php |  4 ++--
 .../Block/System/Convert/Profile/Edit.php       |  4 ++--
 .../Adminhtml/Block/System/Variable/Edit.php    |  2 +-
 app/code/core/Mage/Adminhtml/Block/Tag/Edit.php |  4 ++--
 .../Mage/Adminhtml/Block/Widget/Container.php   | 17 +++++++++++++++++
 .../Block/Adminhtml/Oauth/Consumer/Edit.php     |  8 ++++----
 .../Block/Adminhtml/Billing/Agreement/View.php  | 17 ++++++++---------
 .../Block/Adminhtml/Recurring/Profile/View.php  | 10 +++++-----
 .../Block/Adminhtml/Widget/Instance/Edit.php    |  2 +-
 11 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php
index 8da4b665567..4df8244ebeb 100644
--- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php
@@ -28,11 +28,11 @@ public function __construct()
                 module: 'catalog',
             );
         } else {
-            $this->_removeButton('save');
+            $this->_removeButton(self::BUTTON_TYPE_SAVE);
         }
 
         if (!$this->_isAllowedAction('delete')) {
-            $this->_removeButton('delete');
+            $this->_removeButton(self::BUTTON_TYPE_DELETE);
         }
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php
index 3f0681727a6..0b7fcf86a02 100644
--- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php
@@ -32,11 +32,11 @@ public function __construct()
                 onClick: Mage::helper('core/js')->getSaveAndContinueEditJs($this->_getSaveAndContinueUrl()),
             );
         } else {
-            $this->_removeButton('save');
+            $this->_removeButton(self::BUTTON_TYPE_SAVE);
         }
 
         if (!$this->_isAllowedAction('delete')) {
-            $this->_removeButton('delete');
+            $this->_removeButton(self::BUTTON_TYPE_DELETE);
         }
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php
index dedeacd1b2e..42af1ffdfed 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php
@@ -21,8 +21,8 @@ public function __construct()
 
         parent::__construct();
 
-        $this->_updateButton('save', 'label', Mage::helper('adminhtml')->__('Save Profile'));
-        $this->_updateButton('delete', 'label', Mage::helper('adminhtml')->__('Delete Profile'));
+        $this->_updateButton(self::BUTTON_TYPE_SAVE, 'label', Mage::helper('adminhtml')->__('Save Profile'));
+        $this->_updateButton(self::BUTTON_TYPE_DELETE, 'label', Mage::helper('adminhtml')->__('Delete Profile'));
 
         $this->_addPreparedButton(
             id: self::BUTTON_TYPE_SAVE_EDIT,
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php
index 8fd152c370d..91c67729de1 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php
@@ -21,8 +21,8 @@ public function __construct()
 
         parent::__construct();
 
-        $this->_updateButton('save', 'label', Mage::helper('adminhtml')->__('Save Profile'));
-        $this->_updateButton('delete', 'label', Mage::helper('adminhtml')->__('Delete Profile'));
+        $this->_updateButton(self::BUTTON_TYPE_SAVE, 'label', Mage::helper('adminhtml')->__('Save Profile'));
+        $this->_updateButton(self::BUTTON_TYPE_DELETE, 'label', Mage::helper('adminhtml')->__('Delete Profile'));
 
         $this->_addPreparedButton(
             id: self::BUTTON_TYPE_SAVE_EDIT,
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php
index 634a44b7ab7..6da70ac215a 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php
@@ -46,7 +46,7 @@ protected function _prepareLayout()
         );
 
         if (!$this->getVariable()->getId()) {
-            $this->removeButton('delete');
+            $this->removeButton(self::BUTTON_TYPE_DELETE);
         }
 
         return parent::_prepareLayout();
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php
index e41865558f5..1307fa99543 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php
@@ -25,8 +25,8 @@ public function __construct()
 
         parent::__construct();
 
-        $this->_updateButton('save', 'label', Mage::helper('tag')->__('Save Tag'));
-        $this->_updateButton('delete', 'label', Mage::helper('tag')->__('Delete Tag'));
+        $this->_updateButton(self::BUTTON_TYPE_SAVE, 'label', Mage::helper('tag')->__('Save Tag'));
+        $this->_updateButton(self::BUTTON_TYPE_DELETE, 'label', Mage::helper('tag')->__('Delete Tag'));
 
         $this->_addPreparedButton(
             id: self::BUTTON_TYPE_SAVE_EDIT,
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
index 7768932855b..c2afd46dfd2 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
@@ -16,6 +16,10 @@ class Mage_Adminhtml_Block_Widget_Container extends Mage_Adminhtml_Block_Templat
 {
     public const BUTTON_TYPE_BACK       = 'back';
 
+    public const BUTTON_TYPE_CANCEL     = 'cancel';
+
+    public const BUTTON_TYPE_CLOSE      = 'close';
+
     public const BUTTON_TYPE_DELETE     = 'delete';
 
     public const BUTTON_TYPE_RESET      = 'reset';
@@ -88,6 +92,7 @@ protected function _addPreparedButton(
         if (is_null($onClick)) {
             $onClick = match ($id) {
                 self::BUTTON_TYPE_BACK      => Mage::helper('core/js')->getSetLocationJs(Mage::helper('adminhtml')::getUrl('*/*/')),
+                self::BUTTON_TYPE_CLOSE     => 'window.close()',
                 self::BUTTON_TYPE_RESET     => 'setLocation(window.location.href)',
                 self::BUTTON_TYPE_SAVE      => 'editForm.submit();',
                 self::BUTTON_TYPE_SAVE_EDIT => 'saveAndContinueEdit()',
@@ -102,6 +107,18 @@ protected function _addPreparedButton(
                 'onclick'   => $onClick,
                 'level'     => -1,
             ], $data),
+            self::BUTTON_TYPE_CANCEL => $data = array_merge([
+                'label'     => Mage::helper($module)->__('Cancel'),
+                'class'     => 'cancel',
+                'onclick'   => $onClick,
+                'level'     => -1,
+            ], $data),
+            self::BUTTON_TYPE_CLOSE => $data = array_merge([
+                'label'     => Mage::helper($module)->__('Close Window'),
+                'class'     => 'cancel',
+                'onclick'   => $onClick,
+                'level'     => -1,
+            ], $data),
             self::BUTTON_TYPE_DELETE => $data = array_merge([
                 'label' => Mage::helper($module)->__('Delete'),
                 'class' => 'delete',
diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php
index 83eb6af84e4..0c19c213517 100644
--- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php
+++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php
@@ -54,10 +54,10 @@ public function __construct()
         $this->_formScripts[] = 'function saveAndContinueEdit()'
         . "{editForm.submit($('edit_form').action + 'back/edit/')}";
 
-        $this->_updateButton('save', 'label', $this->__('Save'));
-        $this->_updateButton('save', 'id', 'save_button');
-        $this->_updateButton('delete', 'label', $this->__('Delete'));
-        $this->_updateButton('delete', 'onclick', "if(confirm('" . Mage::helper('core')->jsQuoteEscape(
+        $this->_updateButton(self::BUTTON_TYPE_SAVE, 'label', $this->__('Save'));
+        $this->_updateButton(self::BUTTON_TYPE_SAVE, 'id', 'save_button');
+        $this->_updateButton(self::BUTTON_TYPE_DELETE, 'label', $this->__('Delete'));
+        $this->_updateButton(self::BUTTON_TYPE_DELETE, 'onclick', "if(confirm('" . Mage::helper('core')->jsQuoteEscape(
             Mage::helper('adminhtml')->__('Are you sure you want to do this?'),
         ) . "')) editForm.submit('" . $this->getUrl('*/*/delete') . "'); return false;");
 
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php
index 6c187408ec1..be14cfc89a9 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php
@@ -28,24 +28,23 @@ public function __construct()
         parent::__construct();
 
         if (!$this->_isAllowed('sales/billing_agreement/actions/manage')) {
-            $this->_removeButton('delete');
+            $this->_removeButton(self::BUTTON_TYPE_DELETE);
         }
 
-        $this->_removeButton('reset');
-        $this->_removeButton('save');
+        $this->_removeButton(self::BUTTON_TYPE_RESET);
+        $this->_removeButton(self::BUTTON_TYPE_SAVE);
         $this->setId('billing_agreement_view');
 
         $this->_addPreparedButton(
             id: self::BUTTON_TYPE_BACK,
-            onClick: Mage::helper('core/js')->getSetLocationJs($this->getBackUrl())
+            onClick: Mage::helper('core/js')->getSetLocationJs($this->getBackUrl()),
         );
 
         if ($this->_getBillingAgreement()->canCancel() && $this->_isAllowed('sales/billing_agreement/actions/manage')) {
-            $this->_addButton('cancel', [
-                'label'     => Mage::helper('adminhtml')->__('Cancel'),
-                'onclick'   => Mage::helper('core/js')->getConfirmSetLocationJs($this->_getCancelUrl()),
-                'class'     => 'cancel',
-            ], -1);
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_CANCEL,
+                onClick: Mage::helper('core/js')->getConfirmSetLocationJs($this->_getCancelUrl()),
+            );
         }
     }
 
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php
index ac28b893876..12a0c6dc34d 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php
@@ -32,13 +32,13 @@ protected function _prepareLayout()
 
         // cancel
         if ($profile->canCancel()) {
-            $this->_addButton('cancel', [
-                'label'     => Mage::helper('sales')->__('Cancel'),
-                'onclick'   => Mage::helper('core/js')->getConfirmSetLocationJs(
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_CANCEL,
+                module: 'sales',
+                onClick: Mage::helper('core/js')->getConfirmSetLocationJs(
                     $this->getUrl('*/*/updateState', ['profile' => $profile->getId(), 'action' => 'cancel']),
                 ),
-                'class'     => 'delete',
-            ]);
+            );
         }
 
         // suspend
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php
index 6848ab5b968..babb7805a95 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php
@@ -52,7 +52,7 @@ protected function _prepareLayout()
                 module: 'widget',
             );
         } else {
-            $this->removeButton('save');
+            $this->removeButton(self::BUTTON_TYPE_SAVE);
         }
 
         return parent::_prepareLayout();

From 15b428904e664d5aa3bcf141315bad198eaa2a88 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 21 Apr 2026 12:09:00 +0200
Subject: [PATCH 05/26] update

---
 .../Block/Sales/Order/Creditmemo/View.php     | 37 +++++++++----------
 .../Block/Sales/Order/Invoice/View.php        | 36 +++++++++---------
 .../Adminhtml/Block/System/Store/Delete.php   | 19 ++++++----
 .../Mage/Adminhtml/Block/Widget/Container.php | 17 ++++++++-
 4 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php
index 2c190b954cf..873505ffd44 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php
@@ -26,16 +26,16 @@ public function __construct()
 
         parent::__construct();
 
-        $this->_removeButton('save');
-        $this->_removeButton('reset');
-        $this->_removeButton('delete');
+        $this->_removeButton(self::BUTTON_TYPE_SAVE);
+        $this->_removeButton(self::BUTTON_TYPE_RESET);
+        $this->_removeButton(self::BUTTON_TYPE_DELETE);
 
         if ($this->getCreditmemo()->canCancel()) {
-            $this->_addButton('cancel', [
-                'label'     => Mage::helper('sales')->__('Cancel'),
-                'class'     => 'delete',
-                'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getCancelUrl()),
-            ]);
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_CANCEL,
+                module: 'sales',
+                onClick: Mage::helper('core/js')->getSetLocationJs($this->getCancelUrl()),
+            );
         }
 
         if ($this->_isAllowedAction('emails')) {
@@ -58,20 +58,19 @@ public function __construct()
         }
 
         if ($this->getCreditmemo()->canVoid()) {
-            $this->_addButton('void', [
-                'label'     => Mage::helper('sales')->__('Void'),
-                'class'     => 'save void',
-                'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getVoidUrl()),
-
-            ]);
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_VOID,
+                module: 'sales',
+                onClick: Mage::helper('core/js')->getSetLocationJs($this->getVoidUrl()),
+            );
         }
 
         if ($this->getCreditmemo()->getId()) {
-            $this->_addButton('print', [
-                'label'     => Mage::helper('sales')->__('Print'),
-                'class'     => 'save print',
-                'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getPrintUrl()),
-            ]);
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_PRINT,
+                module: 'sales',
+                onClick: Mage::helper('core/js')->getSetLocationJs($this->getPrintUrl()),
+            );
         }
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php
index 722b9a3f764..5103305d25a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php
@@ -34,16 +34,16 @@ public function __construct()
 
         parent::__construct();
 
-        $this->_removeButton('save');
-        $this->_removeButton('reset');
-        $this->_removeButton('delete');
+        $this->_removeButton(self::BUTTON_TYPE_SAVE);
+        $this->_removeButton(self::BUTTON_TYPE_RESET);
+        $this->_removeButton(self::BUTTON_TYPE_DELETE);
 
         if ($this->_isAllowedAction('cancel') && $this->getInvoice()->canCancel()) {
-            $this->_addButton('cancel', [
-                'label'     => Mage::helper('sales')->__('Cancel'),
-                'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getCancelUrl()),
-                'class'     => 'delete',
-            ]);
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_CANCEL,
+                module: 'sales',
+                onClick: Mage::helper('core/js')->getSetLocationJs($this->getCancelUrl()),
+            );
         }
 
         if ($this->_isAllowedAction('emails')) {
@@ -83,19 +83,19 @@ public function __construct()
         }
 
         if ($this->getInvoice()->canVoid()) {
-            $this->_addButton('void', [
-                'label'     => Mage::helper('sales')->__('Void'),
-                'class'     => 'save void',
-                'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getVoidUrl()),
-            ]);
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_VOID,
+                module: 'sales',
+                onClick: Mage::helper('core/js')->getSetLocationJs($this->getVoidUrl()),
+            );
         }
 
         if ($this->getInvoice()->getId()) {
-            $this->_addButton('print', [
-                'label'     => Mage::helper('sales')->__('Print'),
-                'class'     => 'save print',
-                'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getPrintUrl()),
-            ]);
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_PRINT,
+                module: 'sales',
+                onClick: Mage::helper('core/js')->getSetLocationJs($this->getPrintUrl()),
+            );
         }
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php
index 673de4ca1ce..d3b7314aca3 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php
@@ -28,16 +28,19 @@ public function __construct()
 
         parent::__construct();
 
-        $this->_removeButton('save');
-        $this->_removeButton('reset');
+        $this->_removeButton(self::BUTTON_TYPE_SAVE);
+        $this->_removeButton(self::BUTTON_TYPE_RESET);
 
-        $this->_updateButton('delete', 'area', 'footer');
-        $this->_updateButton('delete', 'onclick', 'editForm.submit();');
+        $this->_updateButton(self::BUTTON_TYPE_DELETE, 'area', 'footer');
+        $this->_updateButton(self::BUTTON_TYPE_DELETE, 'onclick', 'editForm.submit();');
 
-        $this->_addButton('cancel', [
-            'label'     => Mage::helper('adminhtml')->__('Cancel'),
-            'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getBackUrl()),
-        ], 2, 100, 'footer');
+        $this->_addPreparedButton(
+            id: self::BUTTON_TYPE_CANCEL,
+            level: 2,
+            sortOrder: 100,
+            area: 'footer',
+            onClick: Mage::helper('core/js')->getSetLocationJs($this->getBackUrl()),
+        );
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
index c2afd46dfd2..c8f78d4e32c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
@@ -22,12 +22,16 @@ class Mage_Adminhtml_Block_Widget_Container extends Mage_Adminhtml_Block_Templat
 
     public const BUTTON_TYPE_DELETE     = 'delete';
 
+    public const BUTTON_TYPE_PRINT      = 'print';
+
     public const BUTTON_TYPE_RESET      = 'reset';
 
     public const BUTTON_TYPE_SAVE       = 'save';
 
     public const BUTTON_TYPE_SAVE_EDIT  = 'save-edit';
 
+    public const BUTTON_TYPE_VOID       = 'void';
+
     /**
      * So-called "container controller" to specify group of blocks participating in some action
      *
@@ -109,7 +113,7 @@ protected function _addPreparedButton(
             ], $data),
             self::BUTTON_TYPE_CANCEL => $data = array_merge([
                 'label'     => Mage::helper($module)->__('Cancel'),
-                'class'     => 'cancel',
+                'class'     => 'cancel delete',
                 'onclick'   => $onClick,
                 'level'     => -1,
             ], $data),
@@ -123,6 +127,10 @@ protected function _addPreparedButton(
                 'label' => Mage::helper($module)->__('Delete'),
                 'class' => 'delete',
             ], $data),
+            self::BUTTON_TYPE_PRINT => $data = array_merge([
+                'label' => Mage::helper($module)->__('Print'),
+                'class' => 'save print',
+            ], $data),
             self::BUTTON_TYPE_RESET => $data = array_merge([
                 'label'     => Mage::helper($module)->__('Reset'),
                 'class'     => 'reset',
@@ -140,9 +148,14 @@ protected function _addPreparedButton(
                 'class'     => 'save continue',
                 'onclick'   => $onClick,
             ], $data),
+            self::BUTTON_TYPE_VOID => $data = array_merge([
+                'label'     => Mage::helper($module)->__('Void'),
+                'class'     => 'save void',
+                'onclick'   => $onClick,
+            ], $data),
         };
 
-        return $this->_addButton($id, $data);
+        return $this->_addButton($id, $data, $level, $sortOrder, $area);
     }
 
     /**

From 21798c7a588fb8e385deea4087c30545624533be Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 21 Apr 2026 12:25:02 +0200
Subject: [PATCH 06/26] update

---
 .../core/Mage/Adminhtml/Block/Customer/Edit.php  |  6 +++---
 .../Mage/Adminhtml/Block/Customer/Group/Edit.php |  2 +-
 .../Mage/Adminhtml/Block/Sales/Order/Address.php |  4 ++--
 .../Block/Sales/Order/Creditmemo/Create.php      |  4 ++--
 .../Block/Sales/Order/Invoice/Create.php         |  4 ++--
 .../Block/Sales/Order/Shipment/Create.php        |  4 ++--
 .../Block/Sales/Order/Shipment/View.php          | 16 ++++++++--------
 .../Block/Sales/Order/Status/Assign.php          |  4 ++--
 .../Adminhtml/Block/Sales/Order/Status/New.php   |  4 ++--
 .../Mage/Adminhtml/Block/Sales/Order/View.php    |  6 +++---
 .../Mage/Adminhtml/Block/System/Account/Edit.php |  2 +-
 .../Mage/Adminhtml/Block/System/Store/Edit.php   | 11 ++++++-----
 .../Mage/Index/Block/Adminhtml/Process/Edit.php  |  6 +++---
 .../Block/Adminhtml/Oauth/Consumer/Edit.php      |  2 +-
 14 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php
index 24e1489a9da..68d57a39425 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php
@@ -33,12 +33,12 @@ public function __construct()
         parent::__construct();
 
         if (Mage::registry('current_customer')->isReadonly()) {
-            $this->_removeButton('save');
-            $this->_removeButton('reset');
+            $this->_removeButton(self::BUTTON_TYPE_SAVE);
+            $this->_removeButton(self::BUTTON_TYPE_RESET);
         }
 
         if (!Mage::registry('current_customer')->isDeleteable()) {
-            $this->_removeButton('delete');
+            $this->_removeButton(self::BUTTON_TYPE_DELETE);
         }
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php
index a9041ed4f74..c099e331dfd 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php
@@ -22,7 +22,7 @@ public function __construct()
         $this->_controller = 'customer_group';
 
         if (!Mage::registry('current_group')->getId() || Mage::registry('current_group')->usesAsDefault()) {
-            $this->_removeButton('delete');
+            $this->_removeButton(self::BUTTON_TYPE_DELETE);
         }
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address.php
index 69f8ca8aee2..a7e37dfc8e3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address.php
@@ -19,8 +19,8 @@ public function __construct()
         $this->_controller = 'sales_order';
         $this->_mode       = 'address';
         parent::__construct();
-        $this->_updateButton('save', 'label', Mage::helper('sales')->__('Save Order Address'));
-        $this->_removeButton('delete');
+        $this->_updateButton(self::BUTTON_TYPE_SAVE, 'label', Mage::helper('sales')->__('Save Order Address'));
+        $this->_removeButton(self::BUTTON_TYPE_DELETE);
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php
index 61a045bd61f..f510a4df31a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php
@@ -22,8 +22,8 @@ public function __construct()
 
         parent::__construct();
 
-        $this->_removeButton('delete');
-        $this->_removeButton('save');
+        $this->_removeButton(self::BUTTON_TYPE_DELETE);
+        $this->_removeButton(self::BUTTON_TYPE_SAVE);
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php
index 4b281bd7dc5..016185bf87a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php
@@ -22,8 +22,8 @@ public function __construct()
 
         parent::__construct();
 
-        $this->_removeButton('save');
-        $this->_removeButton('delete');
+        $this->_removeButton(self::BUTTON_TYPE_SAVE);
+        $this->_removeButton(self::BUTTON_TYPE_DELETE);
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php
index 44d8381d328..fe7072a7c76 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php
@@ -22,8 +22,8 @@ public function __construct()
 
         parent::__construct();
 
-        $this->_removeButton('save');
-        $this->_removeButton('delete');
+        $this->_removeButton(self::BUTTON_TYPE_SAVE);
+        $this->_removeButton(self::BUTTON_TYPE_DELETE);
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php
index 964b21c1fbe..404be0180ac 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php
@@ -26,13 +26,13 @@ public function __construct()
 
         parent::__construct();
 
-        $this->_removeButton('reset');
-        $this->_removeButton('delete');
+        $this->_removeButton(self::BUTTON_TYPE_RESET);
+        $this->_removeButton(self::BUTTON_TYPE_DELETE);
         if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/emails')) {
             $this->_updateButton('save', 'label', Mage::helper('sales')->__('Send Tracking Information'));
             $this->_updateButton('save', 'class', 'save send-email');
             $this->_updateButton(
-                'save',
+                self::BUTTON_TYPE_SAVE,
                 'onclick',
                 Mage::helper('core/js')->getDeleteConfirmJs(
                     $this->getEmailUrl(),
@@ -42,11 +42,11 @@ public function __construct()
         }
 
         if ($this->getShipment()->getId()) {
-            $this->_addButton('print', [
-                'label'     => Mage::helper('sales')->__('Print'),
-                'class'     => 'save print',
-                'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getPrintUrl()),
-            ]);
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_PRINT,
+                module: 'sales',
+                onClick: Mage::helper('core/js')->getSetLocationJs($this->getPrintUrl()),
+            );
         }
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign.php
index e16409a8a20..a2c01c5f9fc 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign.php
@@ -17,8 +17,8 @@ public function __construct()
         $this->_controller = 'sales_order_status';
         $this->_mode       = 'assign';
         parent::__construct();
-        $this->_updateButton('save', 'label', Mage::helper('sales')->__('Save Status Assignment'));
-        $this->_removeButton('delete');
+        $this->_updateButton(self::BUTTON_TYPE_SAVE, 'label', Mage::helper('sales')->__('Save Status Assignment'));
+        $this->_removeButton(self::BUTTON_TYPE_DELETE);
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New.php
index 2f63598349f..cfed3af9cd9 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New.php
@@ -19,8 +19,8 @@ public function __construct()
         $this->_mode = 'new';
 
         parent::__construct();
-        $this->_updateButton('save', 'label', Mage::helper('sales')->__('Save Status'));
-        $this->_removeButton('delete');
+        $this->_updateButton(self::BUTTON_TYPE_SAVE, 'label', Mage::helper('sales')->__('Save Status'));
+        $this->_removeButton(self::BUTTON_TYPE_DELETE);
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php
index ed86dba60a6..8e1df1e9a34 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php
@@ -26,9 +26,9 @@ public function __construct()
 
         parent::__construct();
 
-        $this->_removeButton('delete');
-        $this->_removeButton('reset');
-        $this->_removeButton('save');
+        $this->_removeButton(self::BUTTON_TYPE_DELETE);
+        $this->_removeButton(self::BUTTON_TYPE_RESET);
+        $this->_removeButton(self::BUTTON_TYPE_SAVE);
         $this->setId('sales_order_view');
         $order = $this->getOrder();
         $coreHelper = Mage::helper('core');
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php
index 37534d8749b..b7a702d25aa 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php
@@ -19,7 +19,7 @@ public function __construct()
         parent::__construct();
 
         $this->_controller = 'system_account';
-        $this->_removeButton('delete');
+        $this->_removeButton(self::BUTTON_TYPE_DELETE);
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php
index 43c3eff927b..621524a5ea8 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php
@@ -51,16 +51,17 @@ public function __construct()
 
         parent::__construct();
 
-        $this->_updateButton('save', 'label', $saveLabel);
-        $this->_updateButton('delete', 'label', $deleteLabel);
-        $this->_updateButton('delete', 'onclick', Mage::helper('core/js')->getConfirmSetLocationJs($deleteUrl));
+        $this->_updateButton(self::BUTTON_TYPE_SAVE, 'label', $saveLabel);
+        $this->_updateButton(self::BUTTON_TYPE_DELETE, 'label', $deleteLabel);
+        $this->_updateButton(self::BUTTON_TYPE_DELETE, 'onclick', Mage::helper('core/js')->getConfirmSetLocationJs($deleteUrl));
 
         if (!Mage::registry('store_data')->isCanDelete()) {
-            $this->_removeButton('delete');
+            $this->_removeButton(self::BUTTON_TYPE_DELETE);
         }
 
         if (Mage::registry('store_data')->isReadOnly()) {
-            $this->_removeButton('save')->_removeButton('reset');
+            $this->_removeButton(self::BUTTON_TYPE_SAVE)
+                ->_removeButton(self::BUTTON_TYPE_RESET);
         }
     }
 
diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php
index 24d3f80db2c..038da5c3b16 100644
--- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php
+++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php
@@ -24,13 +24,13 @@ public function __construct()
 
         parent::__construct();
 
-        $this->_updateButton('save', 'label', Mage::helper('cms')->__('Save Process'));
+        $this->_updateButton(self::BUTTON_TYPE_SAVE, 'label', Mage::helper('cms')->__('Save Process'));
         $this->_addButton('reindex', [
             'label'     => Mage::helper('index')->__('Reindex Data'),
             'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getRunUrl()),
         ]);
-        $this->_removeButton('reset');
-        $this->_removeButton('delete');
+        $this->_removeButton(self::BUTTON_TYPE_RESET);
+        $this->_removeButton(self::BUTTON_TYPE_DELETE);
     }
 
     /**
diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php
index 0c19c213517..00350fb0218 100644
--- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php
+++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php
@@ -64,7 +64,7 @@ public function __construct()
         /** @var Mage_Admin_Model_Session $session */
         $session = Mage::getSingleton('admin/session');
         if (!$this->getModel() || !$this->getModel()->getId() || !$session->isAllowed('system/oauth/consumer/delete')) {
-            $this->_removeButton('delete');
+            $this->_removeButton(self::BUTTON_TYPE_DELETE);
         }
     }
 

From df96102cf0d5b9bce23c2f9343dbe4bb14b5c163 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 21 Apr 2026 12:35:14 +0200
Subject: [PATCH 07/26] update

---
 app/code/core/Mage/Adminhtml/Block/Widget/Container.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
index c8f78d4e32c..2af41f337ee 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
@@ -86,7 +86,7 @@ protected function _addButton($id, $data, $level = 0, $sortOrder = 0, $area = 'h
      */
     protected function _addPreparedButton(
         string $id,
-        array  $data,
+        array  $data = [],
         int    $level = 0,
         int    $sortOrder = 0,
         string $area = 'header',

From 0b450d87b043510d9ef2bec8b346ef006cb621f8 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 21 Apr 2026 12:48:03 +0200
Subject: [PATCH 08/26] varien elements

---
 lib/Varien/Data/Form/Element/Abstract.php    | 13 +++++++++++--
 lib/Varien/Data/Form/Element/Date.php        |  3 ++-
 lib/Varien/Data/Form/Element/Editor.php      |  1 +
 lib/Varien/Data/Form/Element/Multiselect.php |  8 ++++++--
 lib/Varien/Data/Form/Element/Select.php      |  6 +++++-
 lib/Varien/Data/Form/Element/Textarea.php    |  6 +++++-
 6 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/lib/Varien/Data/Form/Element/Abstract.php b/lib/Varien/Data/Form/Element/Abstract.php
index b3765005ee1..20da3762c2c 100644
--- a/lib/Varien/Data/Form/Element/Abstract.php
+++ b/lib/Varien/Data/Form/Element/Abstract.php
@@ -239,13 +239,22 @@ public function getRenderer()
         return $this->_renderer;
     }
 
+    public function getTestId(): string
+    {
+        return 'input-' . str_replace('_', '-', $this->getHtmlId());
+    }
+
     /**
      * @return string
      */
     public function getElementHtml()
     {
-        $html = '<input id="' . $this->getHtmlId() . '" name="' . $this->getName()
-             . '" value="' . $this->getEscapedValue() . '" ' . $this->serialize($this->getHtmlAttributes()) . '/>' . "\n";
+        $html = '<input id="' . $this->getHtmlId()
+            . '" name="' . $this->getName()
+            . '" value="' . $this->getEscapedValue()
+            . '" ' . $this->serialize($this->getHtmlAttributes())
+            . ' data-test="' . $this->getTestId()
+            . '"/>' . "\n";
         return $html . $this->getAfterElementHtml();
     }
 
diff --git a/lib/Varien/Data/Form/Element/Date.php b/lib/Varien/Data/Form/Element/Date.php
index 15e676dc593..db265a7dd9b 100644
--- a/lib/Varien/Data/Form/Element/Date.php
+++ b/lib/Varien/Data/Form/Element/Date.php
@@ -155,12 +155,13 @@ public function getElementHtml()
         $this->addClass('input-text');
 
         $html = sprintf(
-            '<input name="%s" id="%s" value="%s" %s style="width:110px !important;" />'
+            '<input name="%s" id="%s" value="%s" %s data-test="%s" style="width:110px !important;" />'
             . ' <img src="%s" alt="" class="v-middle" id="%s_trig" title="%s" style="%s" />',
             $this->getName(),
             $this->getHtmlId(),
             $this->_escape($this->getValue()),
             $this->serialize($this->getHtmlAttributes()),
+            $this->getTestId(),
             $this->getImage(),
             $this->getHtmlId(),
             'Select Date',
diff --git a/lib/Varien/Data/Form/Element/Editor.php b/lib/Varien/Data/Form/Element/Editor.php
index 9601939223b..a5cf4ddbbc9 100644
--- a/lib/Varien/Data/Form/Element/Editor.php
+++ b/lib/Varien/Data/Form/Element/Editor.php
@@ -89,6 +89,7 @@ public function getElementHtml()
                 . '<textarea name="' . $this->getName() . '" title="' . $this->getTitle()
                 . '" id="' . $this->getHtmlId() . '"'
                 . ' class="textarea ' . $this->getClass() . '" '
+                . ' data-test="' . $this->getTestId() . '"'
                 . $this->serialize($this->getHtmlAttributes()) . ' >' . $this->getEscapedValue() . '</textarea>'
                 . $str . '
                 <script type="text/javascript">
diff --git a/lib/Varien/Data/Form/Element/Multiselect.php b/lib/Varien/Data/Form/Element/Multiselect.php
index c0817b0d64c..f016ac35abd 100644
--- a/lib/Varien/Data/Form/Element/Multiselect.php
+++ b/lib/Varien/Data/Form/Element/Multiselect.php
@@ -59,8 +59,12 @@ public function getElementHtml()
             $html .= '/>';
         }
 
-        $html .= '<select id="' . $this->getHtmlId() . '" name="' . $this->getName() . '" '
-            . $this->serialize($this->getHtmlAttributes()) . ' multiple="multiple">' . "\n";
+        $html .= '<select id="' . $this->getHtmlId()
+            . '" name="' . $this->getName()
+            . '" ' . $this->serialize($this->getHtmlAttributes())
+            . ' data-test="' . $this->getTestId() . '"'
+            . ' multiple="multiple">'
+            . "\n";
 
         $value = $this->getValue();
         if (!is_array($value)) {
diff --git a/lib/Varien/Data/Form/Element/Select.php b/lib/Varien/Data/Form/Element/Select.php
index dcd2d254ffe..a4df9133abf 100644
--- a/lib/Varien/Data/Form/Element/Select.php
+++ b/lib/Varien/Data/Form/Element/Select.php
@@ -35,7 +35,11 @@ public function __construct($attributes = [])
     public function getElementHtml()
     {
         $this->addClass('select');
-        $html = '<select id="' . $this->getHtmlId() . '" name="' . $this->getName() . '" ' . $this->serialize($this->getHtmlAttributes()) . '>' . "\n";
+        $html = '<select id="' . $this->getHtmlId()
+            . '" name="' . $this->getName()
+            . '" ' . $this->serialize($this->getHtmlAttributes())
+            . ' data-test="' . $this->getTestId()
+            . '">' . "\n";
 
         $value = $this->getValue();
         if (!is_array($value)) {
diff --git a/lib/Varien/Data/Form/Element/Textarea.php b/lib/Varien/Data/Form/Element/Textarea.php
index a3f4b00c3d8..77c736087d6 100644
--- a/lib/Varien/Data/Form/Element/Textarea.php
+++ b/lib/Varien/Data/Form/Element/Textarea.php
@@ -46,7 +46,11 @@ public function getHtmlAttributes()
     public function getElementHtml()
     {
         $this->addClass('textarea');
-        $html = '<textarea id="' . $this->getHtmlId() . '" name="' . $this->getName() . '" ' . $this->serialize($this->getHtmlAttributes()) . ' >';
+        $html = '<textarea id="' . $this->getHtmlId();
+        $html .= '" name="' . $this->getName();
+        $html .= '" ' . $this->serialize($this->getHtmlAttributes());
+        $html .= ' data-test="' . $this->getTestId() . '"';
+        $html .= ' >';
         $html .= $this->getEscapedValue();
         $html .= '</textarea>';
         return $html . $this->getAfterElementHtml();

From 7f3afd9e6e1b5ad3442540679dacfa8ebd7755b0 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 21 Apr 2026 12:50:29 +0200
Subject: [PATCH 09/26] update

---
 app/code/core/Mage/Adminhtml/Block/Widget/Button.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
index b8c45285328..c9a48f8d656 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
@@ -38,6 +38,11 @@ public function getOnClick()
         return $this->getDataByKey('on_click');
     }
 
+    public function getTestId(): string
+    {
+        return 'admin-' . $this->getType() . '-' . str_replace([' ', '_'], '-', (string) $this->getClass());
+    }
+
     #[Override]
     protected function _toHtml()
     {
@@ -51,6 +56,7 @@ protected function _toHtml()
             . ' class="scalable ' . $this->getClass() . ($this->getDisabled() ? ' disabled' : '') . '"'
             . ' onclick="' . $this->getOnClick() . '"'
             . ' style="' . $this->getStyle() . '"'
+            . ' data-test="' . $this->getTestId() . '"'
             . ($this->getValue() ? ' value="' . $this->getValue() . '"' : '')
             . ($this->getDisabled() ? ' disabled="disabled"' : '')
             . '><span><span><span>' . $this->getLabel() . '</span></span></span></button>' . $this->getAfterHtml();

From f2c84af8365b1fab0623c11475a711898a413f11 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 21 Apr 2026 12:51:18 +0200
Subject: [PATCH 10/26] update

---
 app/code/core/Mage/Adminhtml/Block/Widget/Button.php | 2 +-
 lib/Varien/Data/Form/Element/Abstract.php            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
index c9a48f8d656..eebd340cbc8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
@@ -38,7 +38,7 @@ public function getOnClick()
         return $this->getDataByKey('on_click');
     }
 
-    public function getTestId(): string
+    final public function getTestId(): string
     {
         return 'admin-' . $this->getType() . '-' . str_replace([' ', '_'], '-', (string) $this->getClass());
     }
diff --git a/lib/Varien/Data/Form/Element/Abstract.php b/lib/Varien/Data/Form/Element/Abstract.php
index 20da3762c2c..0cd20fa750b 100644
--- a/lib/Varien/Data/Form/Element/Abstract.php
+++ b/lib/Varien/Data/Form/Element/Abstract.php
@@ -239,7 +239,7 @@ public function getRenderer()
         return $this->_renderer;
     }
 
-    public function getTestId(): string
+    final public function getTestId(): string
     {
         return 'input-' . str_replace('_', '-', $this->getHtmlId());
     }

From 69c4791da2d0cfda4b7b3d23212ce358dc76b74c Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 21 Apr 2026 12:52:34 +0200
Subject: [PATCH 11/26] update

---
 app/code/core/Mage/Adminhtml/Block/Widget/Button.php | 2 +-
 lib/Varien/Data/Form/Element/Abstract.php            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
index eebd340cbc8..9e6be7417f5 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
@@ -38,7 +38,7 @@ public function getOnClick()
         return $this->getDataByKey('on_click');
     }
 
-    final public function getTestId(): string
+    private function getTestId(): string
     {
         return 'admin-' . $this->getType() . '-' . str_replace([' ', '_'], '-', (string) $this->getClass());
     }
diff --git a/lib/Varien/Data/Form/Element/Abstract.php b/lib/Varien/Data/Form/Element/Abstract.php
index 0cd20fa750b..4d7c012a7ca 100644
--- a/lib/Varien/Data/Form/Element/Abstract.php
+++ b/lib/Varien/Data/Form/Element/Abstract.php
@@ -239,7 +239,7 @@ public function getRenderer()
         return $this->_renderer;
     }
 
-    final public function getTestId(): string
+    private function getTestId(): string
     {
         return 'input-' . str_replace('_', '-', $this->getHtmlId());
     }

From 0949b09a9eb55b9b1f349f073c411c6d3a8ed2a8 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 21 Apr 2026 12:59:25 +0200
Subject: [PATCH 12/26] update

---
 app/code/core/Mage/Adminhtml/Block/Widget/Button.php | 2 +-
 lib/Varien/Data/Form/Element/Abstract.php            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
index 9e6be7417f5..eebd340cbc8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
@@ -38,7 +38,7 @@ public function getOnClick()
         return $this->getDataByKey('on_click');
     }
 
-    private function getTestId(): string
+    final public function getTestId(): string
     {
         return 'admin-' . $this->getType() . '-' . str_replace([' ', '_'], '-', (string) $this->getClass());
     }
diff --git a/lib/Varien/Data/Form/Element/Abstract.php b/lib/Varien/Data/Form/Element/Abstract.php
index 4d7c012a7ca..0cd20fa750b 100644
--- a/lib/Varien/Data/Form/Element/Abstract.php
+++ b/lib/Varien/Data/Form/Element/Abstract.php
@@ -239,7 +239,7 @@ public function getRenderer()
         return $this->_renderer;
     }
 
-    private function getTestId(): string
+    final public function getTestId(): string
     {
         return 'input-' . str_replace('_', '-', $this->getHtmlId());
     }

From 47d27307f80e17a9115282c6812da488d9e544f3 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 21 Apr 2026 13:27:01 +0200
Subject: [PATCH 13/26] update

---
 app/code/core/Mage/Adminhtml/Block/Widget/Button.php    | 5 -----
 app/code/core/Mage/Adminhtml/Block/Widget/Container.php | 7 +++++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
index eebd340cbc8..9c3bc428523 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
@@ -38,11 +38,6 @@ public function getOnClick()
         return $this->getDataByKey('on_click');
     }
 
-    final public function getTestId(): string
-    {
-        return 'admin-' . $this->getType() . '-' . str_replace([' ', '_'], '-', (string) $this->getClass());
-    }
-
     #[Override]
     protected function _toHtml()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
index 2af41f337ee..6feec509a01 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
@@ -73,6 +73,8 @@ protected function _addButton($id, $data, $level = 0, $sortOrder = 0, $area = 'h
             $this->_buttons[$level] = [];
         }
 
+        $data['test_id'] = $this->getTestIdentifier($id);
+
         $this->_buttons[$level][$id] = $data;
         $this->_buttons[$level][$id]['area'] = $area;
         $this->_buttons[$level][$id]['sort_order'] = $sortOrder ? $sortOrder : count($this->_buttons[$level]) * 10;
@@ -80,6 +82,11 @@ protected function _addButton($id, $data, $level = 0, $sortOrder = 0, $area = 'h
         return $this;
     }
 
+    private function getTestIdentifier(string $id): string
+    {
+        return 'admin-button-' . str_replace([' ', '_'], '-', $id);
+    }
+
     /**
      * @param  self::BUTTON_TYPE_* $id
      * @return $this

From b5051ed67b756a969a8070963afcf0a388b0be5b Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 22 Apr 2026 16:01:23 +0200
Subject: [PATCH 14/26] update

---
 .../Mage/Adminhtml/Block/Catalog/Product.php  | 10 ++---
 .../Block/Sales/Order/Creditmemo/View.php     |  2 +-
 .../Block/Sales/Order/Invoice/View.php        |  2 +-
 .../Block/Sales/Order/Shipment/View.php       |  2 +-
 .../Block/Sales/Transactions/Detail.php       |  2 +-
 .../Adminhtml/Block/System/Store/Delete.php   |  2 +-
 .../Mage/Adminhtml/Block/Widget/Container.php | 39 ++++++++++++++-----
 .../Adminhtml/Block/Widget/Form/Container.php |  2 +-
 .../Adminhtml/Block/Widget/Grid/Container.php | 12 +++---
 .../Adminhtml/Billing/Agreement/View.php      |  4 +-
 10 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php
index 17cc472fd3f..628fbf33eb3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php
@@ -30,11 +30,11 @@ public function __construct()
     #[Override]
     protected function _prepareLayout()
     {
-        $this->_addButton('add_new', [
-            'label'   => Mage::helper('catalog')->__('Add Product'),
-            'onclick' => Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/new')),
-            'class'   => 'add',
-        ]);
+        $this->_addPreparedButton(
+            id: self::BUTTON_TYPE_ADD,
+            label: Mage::helper('catalog')->__('Add Product'),
+            onClickUrl: $this->getUrl('*/*/new'),
+        );
 
         $this->setChild('grid', $this->getLayout()->createBlock('adminhtml/catalog_product_grid', 'product.grid'));
         return parent::_prepareLayout();
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php
index 873505ffd44..92aaeae3beb 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php
@@ -69,7 +69,7 @@ public function __construct()
             $this->_addPreparedButton(
                 id: self::BUTTON_TYPE_PRINT,
                 module: 'sales',
-                onClick: Mage::helper('core/js')->getSetLocationJs($this->getPrintUrl()),
+                onClickUrl: $this->getPrintUrl(),
             );
         }
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php
index 5103305d25a..12f3640cb8c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php
@@ -42,7 +42,7 @@ public function __construct()
             $this->_addPreparedButton(
                 id: self::BUTTON_TYPE_CANCEL,
                 module: 'sales',
-                onClick: Mage::helper('core/js')->getSetLocationJs($this->getCancelUrl()),
+                onClickUrl: $this->getCancelUrl(),
             );
         }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php
index 404be0180ac..b67e643c6db 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php
@@ -45,7 +45,7 @@ public function __construct()
             $this->_addPreparedButton(
                 id: self::BUTTON_TYPE_PRINT,
                 module: 'sales',
-                onClick: Mage::helper('core/js')->getSetLocationJs($this->getPrintUrl()),
+                onClickUrl: $this->getPrintUrl(),
             );
         }
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php
index fe0cbfbebbc..d5e790bc367 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php
@@ -52,7 +52,7 @@ public function __construct()
         $backUrl = ($this->_txn->getOrderUrl()) ? $this->_txn->getOrderUrl() : $this->getUrl('*/*/');
         $this->_addPreparedButton(
             id: self::BUTTON_TYPE_BACK,
-            onClick: Mage::helper('core/js')->getSetLocationJs($backUrl),
+            onClickUrl: $backUrl,
         );
 
         if (Mage::getSingleton('admin/session')->isAllowed('sales/transactions/fetch')
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php
index d3b7314aca3..dfe4d44505f 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php
@@ -39,7 +39,7 @@ public function __construct()
             level: 2,
             sortOrder: 100,
             area: 'footer',
-            onClick: Mage::helper('core/js')->getSetLocationJs($this->getBackUrl()),
+            onClickUrl: $this->getBackUrl(),
         );
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
index 6feec509a01..146c79bc4a2 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
@@ -14,6 +14,8 @@
  */
 class Mage_Adminhtml_Block_Widget_Container extends Mage_Adminhtml_Block_Template
 {
+    public const BUTTON_TYPE_ADD        = 'add';
+
     public const BUTTON_TYPE_BACK       = 'back';
 
     public const BUTTON_TYPE_CANCEL     = 'cancel';
@@ -93,13 +95,25 @@ private function getTestIdentifier(string $id): string
      */
     protected function _addPreparedButton(
         string $id,
+        string $label = '',
         array  $data = [],
         int    $level = 0,
         int    $sortOrder = 0,
         string $area = 'header',
         string $module = 'adminhtml',
-        ?string $onClick = null
+        ?string $onClick = null,
+        ?string $onClickUrl = null,
+        ?string $onClickConfirmUrl = null,
     ) {
+        if (is_string($onClickUrl) && $onClickUrl !== '') {
+            $onClick = Mage::helper('core/js')->getSetLocationJs($onClickUrl);
+        }
+
+        if (is_string($onClickConfirmUrl) && $onClickConfirmUrl !== '') {
+            $onClick = Mage::helper('core/js')->getConfirmSetLocationJs($onClickConfirmUrl);
+        }
+
+        # ... todo
         if (is_null($onClick)) {
             $onClick = match ($id) {
                 self::BUTTON_TYPE_BACK      => Mage::helper('core/js')->getSetLocationJs(Mage::helper('adminhtml')::getUrl('*/*/')),
@@ -112,51 +126,56 @@ protected function _addPreparedButton(
         }
 
         match ($id) {
+            self::BUTTON_TYPE_ADD => $data = array_merge([
+                'label'     => $label ? $label : Mage::helper($module)->__('Add'),
+                'class'     => 'add',
+                'onclick'   => $onClick,
+            ], $data),
             self::BUTTON_TYPE_BACK => $data = array_merge([
-                'label'     => Mage::helper($module)->__('Back'),
+                'label'     => $label ? $label : Mage::helper($module)->__('Back'),
                 'class'     => 'back',
                 'onclick'   => $onClick,
                 'level'     => -1,
             ], $data),
             self::BUTTON_TYPE_CANCEL => $data = array_merge([
-                'label'     => Mage::helper($module)->__('Cancel'),
+                'label'     => $label ? $label : Mage::helper($module)->__('Cancel'),
                 'class'     => 'cancel delete',
                 'onclick'   => $onClick,
                 'level'     => -1,
             ], $data),
             self::BUTTON_TYPE_CLOSE => $data = array_merge([
-                'label'     => Mage::helper($module)->__('Close Window'),
+                'label'     => $label ? $label : Mage::helper($module)->__('Close Window'),
                 'class'     => 'cancel',
                 'onclick'   => $onClick,
                 'level'     => -1,
             ], $data),
             self::BUTTON_TYPE_DELETE => $data = array_merge([
-                'label' => Mage::helper($module)->__('Delete'),
+                'label' => $label ? $label : Mage::helper($module)->__('Delete'),
                 'class' => 'delete',
             ], $data),
             self::BUTTON_TYPE_PRINT => $data = array_merge([
-                'label' => Mage::helper($module)->__('Print'),
+                'label' => $label ? $label : Mage::helper($module)->__('Print'),
                 'class' => 'save print',
             ], $data),
             self::BUTTON_TYPE_RESET => $data = array_merge([
-                'label'     => Mage::helper($module)->__('Reset'),
+                'label'     => $label ? $label : Mage::helper($module)->__('Reset'),
                 'class'     => 'reset',
                 'onclick'   => $onClick,
                 'level'     => -1,
             ], $data),
             self::BUTTON_TYPE_SAVE => $data = array_merge([
-                'label'     => Mage::helper($module)->__('Save'),
+                'label'     => $label ? $label : Mage::helper($module)->__('Save'),
                 'class'     => 'save',
                 'onclick'   => $onClick,
                 'level'     => 1,
             ], $data),
             self::BUTTON_TYPE_SAVE_EDIT => $data = array_merge([
-                'label'     => Mage::helper($module)->__('Save and Continue Edit'),
+                'label'     => $label ? $label : Mage::helper($module)->__('Save and Continue Edit'),
                 'class'     => 'save continue',
                 'onclick'   => $onClick,
             ], $data),
             self::BUTTON_TYPE_VOID => $data = array_merge([
-                'label'     => Mage::helper($module)->__('Void'),
+                'label'     => $label ? $label : Mage::helper($module)->__('Void'),
                 'class'     => 'save void',
                 'onclick'   => $onClick,
             ], $data),
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php
index da43a8d41e3..0abcb348242 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php
@@ -35,7 +35,7 @@ public function __construct()
 
         $this->_addPreparedButton(
             id: self::BUTTON_TYPE_BACK,
-            onClick: Mage::helper('core/js')->getSetLocationJs($this->getBackUrl()),
+            onClickUrl: $this->getBackUrl(),
         );
 
         $this->_addPreparedButton(id: self::BUTTON_TYPE_RESET);
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php
index 24a7ff8be9e..2a5fe09afdf 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php
@@ -46,11 +46,11 @@ public function __construct()
 
         $this->setTemplate('widget/grid/container.phtml');
 
-        $this->_addButton('add', [
-            'label'     => $this->getAddButtonLabel(),
-            'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getCreateUrl()),
-            'class'     => 'add',
-        ]);
+        $this->_addPreparedButton(
+            id: self::BUTTON_TYPE_ADD,
+            label: $this->getAddButtonLabel(),
+            onClickUrl: $this->getCreateUrl(),
+        );
     }
 
     /**
@@ -105,7 +105,7 @@ protected function _addBackButton()
     {
         $this->_addPreparedButton(
             id: self::BUTTON_TYPE_BACK,
-            onClick: Mage::helper('core/js')->getSetLocationJs($this->getBackUrl()),
+            onClickUrl: $this->getBackUrl(),
         );
     }
 
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php
index be14cfc89a9..244a06d84c6 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php
@@ -37,13 +37,13 @@ public function __construct()
 
         $this->_addPreparedButton(
             id: self::BUTTON_TYPE_BACK,
-            onClick: Mage::helper('core/js')->getSetLocationJs($this->getBackUrl()),
+            onClickUrl: $this->getBackUrl(),
         );
 
         if ($this->_getBillingAgreement()->canCancel() && $this->_isAllowed('sales/billing_agreement/actions/manage')) {
             $this->_addPreparedButton(
                 id: self::BUTTON_TYPE_CANCEL,
-                onClick: Mage::helper('core/js')->getConfirmSetLocationJs($this->_getCancelUrl()),
+                onClickConfirmUrl: $this->_getCancelUrl(),
             );
         }
     }

From 4c3f40f347c6e5b4965fc95e177c6a3da7b64d9e Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 22 Apr 2026 18:25:37 +0200
Subject: [PATCH 15/26] Apply suggestion from @sreichel

---
 app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php
index 4df8244ebeb..7dab8dc8503 100644
--- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php
@@ -25,7 +25,6 @@ public function __construct()
             $this->_addPreparedButton(
                 id: self::BUTTON_TYPE_SAVE_EDIT,
                 level: -100,
-                module: 'catalog',
             );
         } else {
             $this->_removeButton(self::BUTTON_TYPE_SAVE);

From a0b2c522d812dae65b679912dbfc7c4f1606d575 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 22 Apr 2026 19:05:33 +0200
Subject: [PATCH 16/26] fix level

---
 .../Mage/Adminhtml/Block/Widget/Container.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
index 146c79bc4a2..2c2efc2d003 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
@@ -97,7 +97,7 @@ protected function _addPreparedButton(
         string $id,
         string $label = '',
         array  $data = [],
-        int    $level = 0,
+        ?int   $level = null,
         int    $sortOrder = 0,
         string $area = 'header',
         string $module = 'adminhtml',
@@ -125,6 +125,18 @@ protected function _addPreparedButton(
             };
         }
 
+        if (is_null($level)) {
+            $level = match ($id) {
+                self::BUTTON_TYPE_BACK      => -1,
+                self::BUTTON_TYPE_CANCEL    => -1,
+                self::BUTTON_TYPE_CLOSE     => -1,
+                self::BUTTON_TYPE_RESET     => -1,
+                self::BUTTON_TYPE_SAVE      => 1,
+                self::BUTTON_TYPE_SAVE_EDIT => 1,
+                default => 0,
+            };
+        }
+
         match ($id) {
             self::BUTTON_TYPE_ADD => $data = array_merge([
                 'label'     => $label ? $label : Mage::helper($module)->__('Add'),
@@ -135,19 +147,16 @@ protected function _addPreparedButton(
                 'label'     => $label ? $label : Mage::helper($module)->__('Back'),
                 'class'     => 'back',
                 'onclick'   => $onClick,
-                'level'     => -1,
             ], $data),
             self::BUTTON_TYPE_CANCEL => $data = array_merge([
                 'label'     => $label ? $label : Mage::helper($module)->__('Cancel'),
                 'class'     => 'cancel delete',
                 'onclick'   => $onClick,
-                'level'     => -1,
             ], $data),
             self::BUTTON_TYPE_CLOSE => $data = array_merge([
                 'label'     => $label ? $label : Mage::helper($module)->__('Close Window'),
                 'class'     => 'cancel',
                 'onclick'   => $onClick,
-                'level'     => -1,
             ], $data),
             self::BUTTON_TYPE_DELETE => $data = array_merge([
                 'label' => $label ? $label : Mage::helper($module)->__('Delete'),
@@ -161,13 +170,11 @@ protected function _addPreparedButton(
                 'label'     => $label ? $label : Mage::helper($module)->__('Reset'),
                 'class'     => 'reset',
                 'onclick'   => $onClick,
-                'level'     => -1,
             ], $data),
             self::BUTTON_TYPE_SAVE => $data = array_merge([
                 'label'     => $label ? $label : Mage::helper($module)->__('Save'),
                 'class'     => 'save',
                 'onclick'   => $onClick,
-                'level'     => 1,
             ], $data),
             self::BUTTON_TYPE_SAVE_EDIT => $data = array_merge([
                 'label'     => $label ? $label : Mage::helper($module)->__('Save and Continue Edit'),

From 39f6367111eba8cb535b0590a34918f57d3573d1 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 22 Apr 2026 19:14:05 +0200
Subject: [PATCH 17/26] phpmd

---
 app/code/core/Mage/Adminhtml/Block/Widget/Container.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
index 2c2efc2d003..fb0471d1ebb 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
@@ -92,6 +92,8 @@ private function getTestIdentifier(string $id): string
     /**
      * @param  self::BUTTON_TYPE_* $id
      * @return $this
+     *
+     * @SuppressWarnings("PHPMD.ExcessiveParameterList")
      */
     protected function _addPreparedButton(
         string $id,

From dd36ca816eb82115bcbe61dffa26211c2cd539ed Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 22 Apr 2026 22:06:45 +0200
Subject: [PATCH 18/26] rector

---
 dev/rector/Migration/Mage/Adminhtml.php | 47 +++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/dev/rector/Migration/Mage/Adminhtml.php b/dev/rector/Migration/Mage/Adminhtml.php
index 8fc42dcb935..659a7570057 100644
--- a/dev/rector/Migration/Mage/Adminhtml.php
+++ b/dev/rector/Migration/Mage/Adminhtml.php
@@ -15,6 +15,7 @@
 use Mage_Adminhtml_Block_Page_Footer;
 use Mage_Adminhtml_Block_Sales_Order_Create_Form_Account;
 use Mage_Adminhtml_Block_Template;
+use Mage_Adminhtml_Block_Widget_Container;
 use Mage_Adminhtml_Block_Widget_Form;
 use Mage_Adminhtml_Block_Widget_Grid;
 use Mage_Adminhtml_Controller_Action;
@@ -41,12 +42,58 @@ public static function renameMethod(): array
         ];
     }
 
+    public const BUTTON_TYPE_ADD        = 'add';
+
+    public const BUTTON_TYPE_BACK       = 'back';
+
+    public const BUTTON_TYPE_CANCEL     = 'cancel';
+
+    public const BUTTON_TYPE_CLOSE      = 'close';
+
+    public const BUTTON_TYPE_DELETE     = 'delete';
+
+    public const BUTTON_TYPE_PRINT      = 'print';
+
+    public const BUTTON_TYPE_RESET      = 'reset';
+
+    public const BUTTON_TYPE_SAVE       = 'save';
+
+    public const BUTTON_TYPE_SAVE_EDIT  = 'save-edit';
+
+    public const BUTTON_TYPE_VOID       = 'void';
+
     /**
      * @return ReplaceArgumentDefaultValue[]
      */
     public static function replaceArgumentDefaultValue(): array
     {
         return [
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_removeButton', 0, 'add', 'self::BUTTON_TYPE_ADD'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_removeButton', 0, 'back', 'self::BUTTON_TYPE_BACK'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_removeButton', 0, 'cancel', 'self::BUTTON_TYPE_CANCEL'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_removeButton', 0, 'close', 'self::BUTTON_TYPE_CLOSE'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_removeButton', 0, 'delete', 'self::BUTTON_TYPE_DELETE'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_removeButton', 0, 'print', 'self::BUTTON_TYPE_PRINT'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_removeButton', 0, 'reset', 'self::BUTTON_TYPE_RESET'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_removeButton', 0, 'save', 'self::BUTTON_TYPE_SAVE'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_removeButton', 0, 'savecontinue', 'self::BUTTON_TYPE_SAVE_EDIT'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_removeButton', 0, 'saveandcontinue', 'self::BUTTON_TYPE_SAVE_EDIT'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_removeButton', 0, 'save_and_continue', 'self::BUTTON_TYPE_SAVE_EDIT'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_removeButton', 0, 'save_and_edit', 'self::BUTTON_TYPE_SAVE_EDIT'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_removeButton', 0, 'void', 'self::BUTTON_TYPE_VOID'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_updateButton', 0, 'add', 'self::BUTTON_TYPE_ADD'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_updateButton', 0, 'back', 'self::BUTTON_TYPE_BACK'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_updateButton', 0, 'cancel', 'self::BUTTON_TYPE_CANCEL'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_updateButton', 0, 'close', 'self::BUTTON_TYPE_CLOSE'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_updateButton', 0, 'delete', 'self::BUTTON_TYPE_DELETE'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_updateButton', 0, 'print', 'self::BUTTON_TYPE_PRINT'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_updateButton', 0, 'reset', 'self::BUTTON_TYPE_RESET'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_updateButton', 0, 'save', 'self::BUTTON_TYPE_SAVE'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_updateButton', 0, 'savecontinue', 'self::BUTTON_TYPE_SAVE_EDIT'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_updateButton', 0, 'saveandcontinue', 'self::BUTTON_TYPE_SAVE_EDIT'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_updateButton', 0, 'save_and_continue', 'self::BUTTON_TYPE_SAVE_EDIT'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_updateButton', 0, 'save_and_edit', 'self::BUTTON_TYPE_SAVE_EDIT'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_updateButton', 0, 'void', 'self::BUTTON_TYPE_VOID'),
             new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Grid::class, 'setDefaultDir', 0, 'asc', 'ASC'),
             new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Grid::class, 'setDefaultDir', 0, 'desc', 'DESC'),
         ];

From b4aebca7003f2f205df327605eafdbfeb3fff50f Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Thu, 23 Apr 2026 03:34:26 +0200
Subject: [PATCH 19/26] minor

---
 app/code/core/Mage/Adminhtml/Block/Widget/Container.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
index fb0471d1ebb..596fc29cdf3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
@@ -107,18 +107,20 @@ protected function _addPreparedButton(
         ?string $onClickUrl = null,
         ?string $onClickConfirmUrl = null,
     ) {
+        $jsHelper = Mage::helper('core/js');
+
         if (is_string($onClickUrl) && $onClickUrl !== '') {
-            $onClick = Mage::helper('core/js')->getSetLocationJs($onClickUrl);
+            $onClick = $jsHelper->getSetLocationJs($onClickUrl);
         }
 
         if (is_string($onClickConfirmUrl) && $onClickConfirmUrl !== '') {
-            $onClick = Mage::helper('core/js')->getConfirmSetLocationJs($onClickConfirmUrl);
+            $onClick = $jsHelper->getConfirmSetLocationJs($onClickConfirmUrl);
         }
 
         # ... todo
         if (is_null($onClick)) {
             $onClick = match ($id) {
-                self::BUTTON_TYPE_BACK      => Mage::helper('core/js')->getSetLocationJs(Mage::helper('adminhtml')::getUrl('*/*/')),
+                self::BUTTON_TYPE_BACK      => $jsHelper->getSetLocationJs(Mage::helper('adminhtml')::getUrl('*/*/')),
                 self::BUTTON_TYPE_CLOSE     => 'window.close()',
                 self::BUTTON_TYPE_RESET     => 'setLocation(window.location.href)',
                 self::BUTTON_TYPE_SAVE      => 'editForm.submit();',

From 4dc677f4dbad07b5da7ce4cdf03c84d114ddd343 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Thu, 23 Apr 2026 03:59:04 +0200
Subject: [PATCH 20/26] minor

---
 .../Mage/Adminhtml/Block/System/Store/Store.php     |  2 +-
 app/code/core/Mage/Adminhtml/Block/Tag/Edit.php     |  1 -
 .../ImportExport/Block/Adminhtml/Export/Edit.php    |  6 +++---
 .../ImportExport/Block/Adminhtml/Import/Edit.php    |  4 ++--
 .../core/Mage/Widget/Block/Adminhtml/Widget.php     |  4 ++--
 dev/rector/Migration/Mage/Adminhtml.php             | 13 +++++++++++++
 6 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php
index 0ae5c87b529..321406127f6 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php
@@ -30,7 +30,7 @@ public function __construct()
     protected function _prepareLayout()
     {
         /* Add website button */
-        $this->_addButton(self::BUTTON_TYPE_ADD, [
+        $this->_addButton('add_website', [
             'label'     => Mage::helper('core')->__('Create Website'),
             'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/newWebsite')),
             'class'     => 'add website',
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php
index 1307fa99543..b633245cebf 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php
@@ -30,7 +30,6 @@ public function __construct()
 
         $this->_addPreparedButton(
             id: self::BUTTON_TYPE_SAVE_EDIT,
-            level: 1,
             module: 'tag',
             onClick: Mage::helper('core/js')->getSaveAndContinueEditJs($this->getSaveAndContinueUrl()),
         );
diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php
index 416ff57c8d3..d134dbc2fb8 100644
--- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php
+++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php
@@ -18,9 +18,9 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->removeButton('back')
-            ->removeButton('reset')
-            ->removeButton('save');
+        $this->removeButton(self::BUTTON_TYPE_BACK)
+            ->removeButton(self::BUTTON_TYPE_RESET)
+            ->removeButton(self::BUTTON_TYPE_SAVE);
     }
 
     /**
diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php
index 106b599d327..446d20965bc 100644
--- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php
+++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php
@@ -18,8 +18,8 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->removeButton('back')
-            ->removeButton('reset')
+        $this->removeButton(self::BUTTON_TYPE_BACK)
+            ->removeButton(self::BUTTON_TYPE_RESET)
             ->_updateButton(self::BUTTON_TYPE_SAVE, 'label', $this->__('Check Data'))
             ->_updateButton(self::BUTTON_TYPE_SAVE, 'id', 'upload_button')
             ->_updateButton(self::BUTTON_TYPE_SAVE, 'onclick', 'editForm.postToFrame();');
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php
index 59d06090c2d..d4adda860a8 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php
@@ -23,8 +23,8 @@ public function __construct()
         $this->_mode = 'widget';
         $this->_headerText = $this->helper('widget')->__('Widget Insertion');
 
-        $this->removeButton('reset');
-        $this->removeButton('back');
+        $this->removeButton(self::BUTTON_TYPE_RESET);
+        $this->removeButton(self::BUTTON_TYPE_BACK);
         $this->_updateButton(self::BUTTON_TYPE_SAVE, 'label', $this->helper('widget')->__('Insert Widget'));
         $this->_updateButton(self::BUTTON_TYPE_SAVE, 'class', 'add-widget');
         $this->_updateButton(self::BUTTON_TYPE_SAVE, 'id', 'insert_button');
diff --git a/dev/rector/Migration/Mage/Adminhtml.php b/dev/rector/Migration/Mage/Adminhtml.php
index dd22a2cc45f..9e2da16deb5 100644
--- a/dev/rector/Migration/Mage/Adminhtml.php
+++ b/dev/rector/Migration/Mage/Adminhtml.php
@@ -48,6 +48,19 @@ public static function renameMethod(): array
     public static function replaceArgumentDefaultValue(): array
     {
         return [
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, 'removeButton', 0, 'add', 'self::BUTTON_TYPE_ADD'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, 'removeButton', 0, 'back', 'self::BUTTON_TYPE_BACK'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, 'removeButton', 0, 'cancel', 'self::BUTTON_TYPE_CANCEL'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, 'removeButton', 0, 'close', 'self::BUTTON_TYPE_CLOSE'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, 'removeButton', 0, 'delete', 'self::BUTTON_TYPE_DELETE'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, 'removeButton', 0, 'print', 'self::BUTTON_TYPE_PRINT'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, 'removeButton', 0, 'reset', 'self::BUTTON_TYPE_RESET'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, 'removeButton', 0, 'save', 'self::BUTTON_TYPE_SAVE'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, 'removeButton', 0, 'savecontinue', 'self::BUTTON_TYPE_SAVE_EDIT'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, 'removeButton', 0, 'saveandcontinue', 'self::BUTTON_TYPE_SAVE_EDIT'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, 'removeButton', 0, 'save_and_continue', 'self::BUTTON_TYPE_SAVE_EDIT'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, 'removeButton', 0, 'save_and_edit', 'self::BUTTON_TYPE_SAVE_EDIT'),
+            new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, 'removeButton', 0, 'void', 'self::BUTTON_TYPE_VOID'),
             new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_addButton', 0, 'add', 'self::BUTTON_TYPE_ADD'),
             new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_addButton', 0, 'back', 'self::BUTTON_TYPE_BACK'),
             new ReplaceArgumentDefaultValue(Mage_Adminhtml_Block_Widget_Container::class, '_addButton', 0, 'cancel', 'self::BUTTON_TYPE_CANCEL'),

From 23deac6ff606d497718f76482a70147072a76d2a Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Thu, 23 Apr 2026 04:22:57 +0200
Subject: [PATCH 21/26] minor

---
 .../Mage/Adminhtml/Block/Urlrewrite/Edit.php  | 44 +++++++++----------
 .../Mage/Adminhtml/Block/Widget/Container.php | 25 ++++++-----
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
index d3888dfbfc3..471541fff0e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
@@ -126,32 +126,28 @@ protected function _setFormChild()
     {
         $this->setChild('form', Mage::getBlockSingleton('adminhtml/urlrewrite_edit_form'));
         if ($this->getUrlrewriteId()) {
-            $this->_addButton(self::BUTTON_TYPE_RESET, [
-                'label'   => Mage::helper('adminhtml')->__('Reset'),
-                'onclick' => '$(\'edit_form\').reset()',
-                'class'   => 'scalable reset',
-                'level'   => -1,
-            ]);
-            $this->_addButton(self::BUTTON_TYPE_DELETE, [
-                'label'   => Mage::helper('adminhtml')->__('Delete'),
-                'onclick' => "deleteConfirm('"
-                    . Mage::helper('core')->jsQuoteEscape(
-                        Mage::helper('adminhtml')->__('Are you sure you want to do this?'),
-                    )
-                    . "', '"
-                    . Mage::helper('adminhtml')::getUrl('*/*/delete', ['id' => $this->getUrlrewriteId()])
-                    . "')",
-                'class'   => 'scalable delete',
-                'level'   => -1,
-            ]);
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_RESET,
+                class: 'scalable reset',
+                onClick: '$(\'edit_form\').reset()', #todo
+            );
+
+            $onClick = "deleteConfirm('"
+                . Mage::helper('core')->jsQuoteEscape(
+                    Mage::helper('adminhtml')->__('Are you sure you want to do this?'),
+                )
+                . "', '"
+                . Mage::helper('adminhtml')::getUrl('*/*/delete', ['id' => $this->getUrlrewriteId()])
+                . "')";
+
+            $this->_addPreparedButton(
+                id: self::BUTTON_TYPE_DELETE,
+                class: 'scalable delete',
+                onClick: $onClick,
+            );
         }
 
-        $this->_addButton(self::BUTTON_TYPE_SAVE, [
-            'label'   => Mage::helper('adminhtml')->__('Save'),
-            'onclick' => 'editForm.submit()',
-            'class'   => 'save',
-            'level'   => -1,
-        ]);
+        $this->_addPreparedButton(id: self::BUTTON_TYPE_SAVE);
 
         // update back button link
         $params = [];
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
index 596fc29cdf3..1a26e684bbd 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
@@ -98,6 +98,7 @@ private function getTestIdentifier(string $id): string
     protected function _addPreparedButton(
         string $id,
         string $label = '',
+        string $class = '',
         array  $data = [],
         ?int   $level = null,
         int    $sortOrder = 0,
@@ -144,50 +145,50 @@ protected function _addPreparedButton(
         match ($id) {
             self::BUTTON_TYPE_ADD => $data = array_merge([
                 'label'     => $label ? $label : Mage::helper($module)->__('Add'),
-                'class'     => 'add',
+                'class'     => $class ? $class : 'add',
                 'onclick'   => $onClick,
             ], $data),
             self::BUTTON_TYPE_BACK => $data = array_merge([
                 'label'     => $label ? $label : Mage::helper($module)->__('Back'),
-                'class'     => 'back',
+                'class'     => $class ? $class : 'back',
                 'onclick'   => $onClick,
             ], $data),
             self::BUTTON_TYPE_CANCEL => $data = array_merge([
                 'label'     => $label ? $label : Mage::helper($module)->__('Cancel'),
-                'class'     => 'cancel delete',
+                'class'     => $class ? $class : 'cancel delete',
                 'onclick'   => $onClick,
             ], $data),
             self::BUTTON_TYPE_CLOSE => $data = array_merge([
                 'label'     => $label ? $label : Mage::helper($module)->__('Close Window'),
-                'class'     => 'cancel',
+                'class'     => $class ? $class : 'cancel',
                 'onclick'   => $onClick,
             ], $data),
             self::BUTTON_TYPE_DELETE => $data = array_merge([
-                'label' => $label ? $label : Mage::helper($module)->__('Delete'),
-                'class' => 'delete',
+                'label'     => $label ? $label : Mage::helper($module)->__('Delete'),
+                'class'     => $class ? $class : 'delete',
             ], $data),
             self::BUTTON_TYPE_PRINT => $data = array_merge([
-                'label' => $label ? $label : Mage::helper($module)->__('Print'),
-                'class' => 'save print',
+                'label'     => $label ? $label : Mage::helper($module)->__('Print'),
+                'class'     => $class ? $class : 'save print',
             ], $data),
             self::BUTTON_TYPE_RESET => $data = array_merge([
                 'label'     => $label ? $label : Mage::helper($module)->__('Reset'),
-                'class'     => 'reset',
+                'class'     => $class ? $class : 'reset',
                 'onclick'   => $onClick,
             ], $data),
             self::BUTTON_TYPE_SAVE => $data = array_merge([
                 'label'     => $label ? $label : Mage::helper($module)->__('Save'),
-                'class'     => 'save',
+                'class'     => $class ? $class : 'save',
                 'onclick'   => $onClick,
             ], $data),
             self::BUTTON_TYPE_SAVE_EDIT => $data = array_merge([
                 'label'     => $label ? $label : Mage::helper($module)->__('Save and Continue Edit'),
-                'class'     => 'save continue',
+                'class'     => $class ? $class : 'save continue',
                 'onclick'   => $onClick,
             ], $data),
             self::BUTTON_TYPE_VOID => $data = array_merge([
                 'label'     => $label ? $label : Mage::helper($module)->__('Void'),
-                'class'     => 'save void',
+                'class'     => $class ? $class : 'save void',
                 'onclick'   => $onClick,
             ], $data),
         };

From cbeb2b578dd087cda921f8d49e11bfdf467a5e0e Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Fri, 24 Apr 2026 00:13:03 +0200
Subject: [PATCH 22/26] cleanup

---
 .../Mage/Adminhtml/Block/Widget/Container.php | 96 +++++++++----------
 1 file changed, 47 insertions(+), 49 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
index 1a26e684bbd..3096588e68d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
@@ -142,57 +142,55 @@ protected function _addPreparedButton(
             };
         }
 
-        match ($id) {
-            self::BUTTON_TYPE_ADD => $data = array_merge([
-                'label'     => $label ? $label : Mage::helper($module)->__('Add'),
-                'class'     => $class ? $class : 'add',
-                'onclick'   => $onClick,
-            ], $data),
-            self::BUTTON_TYPE_BACK => $data = array_merge([
-                'label'     => $label ? $label : Mage::helper($module)->__('Back'),
-                'class'     => $class ? $class : 'back',
-                'onclick'   => $onClick,
-            ], $data),
-            self::BUTTON_TYPE_CANCEL => $data = array_merge([
-                'label'     => $label ? $label : Mage::helper($module)->__('Cancel'),
-                'class'     => $class ? $class : 'cancel delete',
-                'onclick'   => $onClick,
-            ], $data),
-            self::BUTTON_TYPE_CLOSE => $data = array_merge([
-                'label'     => $label ? $label : Mage::helper($module)->__('Close Window'),
-                'class'     => $class ? $class : 'cancel',
-                'onclick'   => $onClick,
-            ], $data),
-            self::BUTTON_TYPE_DELETE => $data = array_merge([
-                'label'     => $label ? $label : Mage::helper($module)->__('Delete'),
-                'class'     => $class ? $class : 'delete',
-            ], $data),
-            self::BUTTON_TYPE_PRINT => $data = array_merge([
-                'label'     => $label ? $label : Mage::helper($module)->__('Print'),
-                'class'     => $class ? $class : 'save print',
-            ], $data),
-            self::BUTTON_TYPE_RESET => $data = array_merge([
-                'label'     => $label ? $label : Mage::helper($module)->__('Reset'),
-                'class'     => $class ? $class : 'reset',
-                'onclick'   => $onClick,
-            ], $data),
-            self::BUTTON_TYPE_SAVE => $data = array_merge([
-                'label'     => $label ? $label : Mage::helper($module)->__('Save'),
-                'class'     => $class ? $class : 'save',
-                'onclick'   => $onClick,
-            ], $data),
-            self::BUTTON_TYPE_SAVE_EDIT => $data = array_merge([
-                'label'     => $label ? $label : Mage::helper($module)->__('Save and Continue Edit'),
-                'class'     => $class ? $class : 'save continue',
-                'onclick'   => $onClick,
-            ], $data),
-            self::BUTTON_TYPE_VOID => $data = array_merge([
-                'label'     => $label ? $label : Mage::helper($module)->__('Void'),
-                'class'     => $class ? $class : 'save void',
-                'onclick'   => $onClick,
-            ], $data),
+        $prefData = match ($id) {
+            self::BUTTON_TYPE_ADD => [
+                'label'     => Mage::helper($module)->__('Add'),
+                'class'     => 'add',
+            ],
+            self::BUTTON_TYPE_BACK => [
+                'label'     => Mage::helper($module)->__('Back'),
+                'class'     => 'back',
+            ],
+            self::BUTTON_TYPE_CANCEL => [
+                'label'     => Mage::helper($module)->__('Cancel'),
+                'class'     => 'cancel delete',
+            ],
+            self::BUTTON_TYPE_CLOSE => [
+                'label'     => Mage::helper($module)->__('Close Window'),
+                'class'     => 'cancel',
+            ],
+            self::BUTTON_TYPE_DELETE => [
+                'label'     => Mage::helper($module)->__('Delete'),
+                'class'     => 'delete',
+            ],
+            self::BUTTON_TYPE_PRINT => [
+                'label'     => Mage::helper($module)->__('Print'),
+                'class'     => 'save print',
+            ],
+            self::BUTTON_TYPE_RESET => [
+                'label'     => Mage::helper($module)->__('Reset'),
+                'class'     => 'reset',
+            ],
+            self::BUTTON_TYPE_SAVE => [
+                'label'     => Mage::helper($module)->__('Save'),
+                'class'     => 'save',
+            ],
+            self::BUTTON_TYPE_SAVE_EDIT => [
+                'label'     => Mage::helper($module)->__('Save and Continue Edit'),
+                'class'     => 'save continue',
+            ],
+            self::BUTTON_TYPE_VOID => [
+                'label'     => Mage::helper($module)->__('Void'),
+                'class'     => 'save void',
+            ],
         };
 
+        $data = array_merge($prefData, array_filter([
+            'label'     => $label,
+            'class'     => $class,
+            'onclick'   => $onClick,
+        ]), $data);
+
         return $this->_addButton($id, $data, $level, $sortOrder, $area);
     }
 

From 6a26f5c5a645068daf3f06523f8d140a77aa2a48 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Fri, 24 Apr 2026 05:15:33 +0200
Subject: [PATCH 23/26] update buttons

---
 .../Block/Sales/Order/Creditmemo/View.php     | 34 +++++++-------
 .../Block/Sales/Order/Invoice/View.php        | 45 ++++++++++---------
 .../Mage/Adminhtml/Block/Widget/Container.php |  9 +++-
 3 files changed, 52 insertions(+), 36 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php
index ab896be3c4f..e4534d1d226 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php
@@ -34,34 +34,38 @@ public function __construct()
             $this->_addPreparedButton(
                 id: self::BUTTON_TYPE_CANCEL,
                 module: 'sales',
-                onClick: Mage::helper('core/js')->getSetLocationJs($this->getCancelUrl()),
+                onClickUrl: $this->getCancelUrl(),
             );
         }
 
         if ($this->_isAllowedAction('emails')) {
-            $this->addButton('send_notification', [
-                'label'     => Mage::helper('sales')->__('Send Email'),
-                'onclick'   => Mage::helper('core/js')->getConfirmSetLocationJs(
-                    $this->getEmailUrl(),
-                    Mage::helper('sales')->__('Are you sure you want to send Creditmemo email to customer?'),
-                ),
-                'class'     => 'send-email',
-            ]);
+            $onClick = Mage::helper('core/js')->getConfirmSetLocationJs(
+                $this->getEmailUrl(),
+                Mage::helper('sales')->__('Are you sure you want to send Creditmemo email to customer?'),
+            );
+
+            $this->_addPreparedButton(
+                id: 'send_notification',
+                label: Mage::helper('sales')->__('Send Email'),
+                class: 'send-email',
+                onClick: $onClick,
+            );
         }
 
         if ($this->getCreditmemo()->canRefund()) {
-            $this->_addButton('refund', [
-                'label'     => Mage::helper('sales')->__('Refund'),
-                'class'     => 'save refund',
-                'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getRefundUrl()),
-            ]);
+            $this->_addPreparedButton(
+                id: 'refund',
+                label: Mage::helper('sales')->__('Refund'),
+                class: 'save refund',
+                onClickUrl: $this->getRefundUrl(),
+            );
         }
 
         if ($this->getCreditmemo()->canVoid()) {
             $this->_addPreparedButton(
                 id: self::BUTTON_TYPE_VOID,
                 module: 'sales',
-                onClick: Mage::helper('core/js')->getSetLocationJs($this->getVoidUrl()),
+                onClickUrl: $this->getVoidUrl(),
             );
         }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php
index 4c5a430b044..60dbc6b236f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php
@@ -47,14 +47,17 @@ public function __construct()
         }
 
         if ($this->_isAllowedAction('emails')) {
-            $this->addButton('send_notification', [
-                'label'     => Mage::helper('sales')->__('Send Email'),
-                'onclick'   => Mage::helper('core/js')->getConfirmSetLocationJs(
-                    $this->getEmailUrl(),
-                    Mage::helper('sales')->__('Are you sure you want to send Invoice email to customer?'),
-                ),
-                'class'     => 'send-email',
-            ]);
+            $onClick = Mage::helper('core/js')->getConfirmSetLocationJs(
+                $this->getEmailUrl(),
+                Mage::helper('sales')->__('Are you sure you want to send Invoice email to customer?'),
+            );
+
+            $this->_addPreparedButton(
+                id: 'send_notification',
+                label: Mage::helper('sales')->__('Send Email'),
+                class: 'send-email',
+                onClick: $onClick,
+            );
         }
 
         $orderPayment = $this->getInvoice()->getOrder()->getPayment();
@@ -67,26 +70,28 @@ public function __construct()
                 || $orderPayment->canRefund()
                 && !$this->getInvoice()->getIsUsedForRefund())
         ) {
-            $this->_addButton('capture', [ // capture?
-                'label'     => Mage::helper('sales')->__('Credit Memo'),
-                'class'     => 'go',
-                'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getCreditMemoUrl()),
-            ]);
+            $this->_addPreparedButton(
+                id: 'capture', // capture?
+                label: Mage::helper('sales')->__('Credit Memo'),
+                class: 'go',
+                onClickUrl: $this->getCreditMemoUrl(),
+            );
         }
 
         if ($this->_isAllowedAction('capture') && $this->getInvoice()->canCapture()) {
-            $this->_addButton('capture', [
-                'label'     => Mage::helper('sales')->__('Capture'),
-                'class'     => 'save capture',
-                'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getCaptureUrl()),
-            ]);
+            $this->_addPreparedButton(
+                id: 'capture',
+                label: Mage::helper('sales')->__('Capture'),
+                class: 'save capture',
+                onClickUrl: $this->getCaptureUrl(),
+            );
         }
 
         if ($this->getInvoice()->canVoid()) {
             $this->_addPreparedButton(
                 id: self::BUTTON_TYPE_VOID,
                 module: 'sales',
-                onClick: Mage::helper('core/js')->getSetLocationJs($this->getVoidUrl()),
+                onClickUrl: $this->getVoidUrl(),
             );
         }
 
@@ -94,7 +99,7 @@ public function __construct()
             $this->_addPreparedButton(
                 id: self::BUTTON_TYPE_PRINT,
                 module: 'sales',
-                onClick: Mage::helper('core/js')->getSetLocationJs($this->getPrintUrl()),
+                onClickUrl: $this->getPrintUrl(),
             );
         }
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
index 3096588e68d..672471ccf5a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
@@ -90,7 +90,10 @@ private function getTestIdentifier(string $id): string
     }
 
     /**
-     * @param  self::BUTTON_TYPE_* $id
+     * @param  string|self::BUTTON_TYPE_* $id
+     * @param  null|string                $onClick Url or JS code to be executed on click
+     * @param  null|string                $onClickUrl Url to be executed on click, using getSetLocationJs()
+     * @param  null|string                $onClickConfirmUrl Url to be executed on click with confirmation, using getConfirmSetLocationJs()
      * @return $this
      *
      * @SuppressWarnings("PHPMD.ExcessiveParameterList")
@@ -183,6 +186,10 @@ protected function _addPreparedButton(
                 'label'     => Mage::helper($module)->__('Void'),
                 'class'     => 'save void',
             ],
+            default => [
+                'label'     => $label,
+                'class'     => $class,
+            ],
         };
 
         $data = array_merge($prefData, array_filter([

From fa2059071b6d16a904fb55af94c7b1c713811c82 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Fri, 24 Apr 2026 05:16:14 +0200
Subject: [PATCH 24/26] cs

---
 app/code/core/Mage/Adminhtml/Block/Widget/Container.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
index 672471ccf5a..ef9dd4161ec 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
@@ -90,9 +90,9 @@ private function getTestIdentifier(string $id): string
     }
 
     /**
-     * @param  string|self::BUTTON_TYPE_* $id
-     * @param  null|string                $onClick Url or JS code to be executed on click
-     * @param  null|string                $onClickUrl Url to be executed on click, using getSetLocationJs()
+     * @param  self::BUTTON_TYPE_*|string $id
+     * @param  null|string                $onClick           Url or JS code to be executed on click
+     * @param  null|string                $onClickUrl        Url to be executed on click, using getSetLocationJs()
      * @param  null|string                $onClickConfirmUrl Url to be executed on click with confirmation, using getConfirmSetLocationJs()
      * @return $this
      *

From 1307305b347687805dd70a6a91e5283eda76a201 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Fri, 24 Apr 2026 06:07:29 +0200
Subject: [PATCH 25/26] update buttons

---
 app/code/core/Mage/Adminhtml/Block/Cache.php  | 33 +++++++++++--------
 .../Mage/Adminhtml/Block/Customer/Edit.php    | 11 ++++---
 .../Mage/Adminhtml/Block/Promo/Catalog.php    | 11 ++++---
 .../Adminhtml/Block/Promo/Catalog/Edit.php    | 11 ++++---
 .../Adminhtml/Block/Sales/Order/Status.php    | 11 ++++---
 .../Mage/Adminhtml/Block/Sales/Order/View.php | 11 ++++---
 .../Block/Sales/Transactions/Detail.php       | 11 ++++---
 .../Mage/Adminhtml/Block/Sitemap/Edit.php     | 11 ++++---
 .../Adminhtml/Block/System/Store/Store.php    | 33 ++++++++++---------
 .../Adminhtml/Block/Widget/View/Container.php | 11 ++++---
 .../Index/Block/Adminhtml/Process/Edit.php    |  9 ++---
 .../Block/Adminhtml/Settlement/Report.php     | 20 ++++++-----
 .../Adminhtml/Recurring/Profile/View.php      | 17 ++++++----
 13 files changed, 113 insertions(+), 87 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Cache.php b/app/code/core/Mage/Adminhtml/Block/Cache.php
index 5d8b72bee7c..06ed78d20db 100644
--- a/app/code/core/Mage/Adminhtml/Block/Cache.php
+++ b/app/code/core/Mage/Adminhtml/Block/Cache.php
@@ -22,20 +22,25 @@ public function __construct()
         $this->_headerText = Mage::helper('core')->__('Cache Storage Management');
         parent::__construct();
         $this->_removeButton(self::BUTTON_TYPE_ADD);
-        $this->_addButton('flush_magento', [
-            'label'     => Mage::helper('core')->__('Flush & Apply Updates'),
-            'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getFlushSystemUrl()),
-            'class'     => 'delete cache',
-        ]);
-
-        $this->_addButton('flush_system', [
-            'label'     => Mage::helper('core')->__('Flush Cache Storage'),
-            'onclick'   => Mage::helper('core/js')->getConfirmSetLocationJs(
-                $this->getFlushStorageUrl(),
-                Mage::helper('core')->__('Cache storage may contain additional data. Are you sure that you want flush it?'),
-            ),
-            'class'     => 'delete flush',
-        ]);
+
+        $this->_addPreparedButton(
+            id: 'flush_magento',
+            label: Mage::helper('core')->__('Flush & Apply Updates'),
+            class: 'delete cache',
+            onClickUrl: $this->getFlushSystemUrl(),
+        );
+
+        $onClick = Mage::helper('core/js')->getConfirmSetLocationJs(
+            $this->getFlushStorageUrl(),
+            Mage::helper('core')->__('Are you sure you want to flush cache storage?'),
+        );
+
+        $this->_addPreparedButton(
+            id: 'flush_system',
+            label: Mage::helper('core')->__('Flush Cache Storage'),
+            class: 'delete flush',
+            onClick: $onClick,
+        );
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php
index 68d57a39425..86c075aad30 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php
@@ -23,11 +23,12 @@ public function __construct()
         if ($this->getCustomerId()
             && Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/create')
         ) {
-            $this->_addButton('order', [
-                'label'     => Mage::helper('customer')->__('Create Order'),
-                'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getCreateOrderUrl()),
-                'class'     => 'add create-order',
-            ], 0);
+            $this->_addPreparedButton(
+                id: 'order',
+                label: Mage::helper('customer')->__('Create Order'),
+                class: 'add create-order',
+                onClickUrl: $this->getCreateOrderUrl(),
+            );
         }
 
         parent::__construct();
diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php
index c5ac1845939..10d3aaec944 100644
--- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php
+++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php
@@ -16,11 +16,12 @@ class Mage_Adminhtml_Block_Promo_Catalog extends Mage_Adminhtml_Block_Widget_Gri
 {
     public function __construct()
     {
-        $this->_addButton('apply_rules', [
-            'label'     => Mage::helper('catalogrule')->__('Apply Rules'),
-            'onclick'   => "location.href='" . $this->getUrl('*/*/applyRules') . "'",
-            'class'     => 'apply',
-        ]);
+        $this->_addPreparedButton(
+            id: 'apply_rules',
+            label: Mage::helper('catalogrule')->__('Apply Rules'),
+            class: 'apply',
+            onClick: "location.href='" . $this->getUrl('*/*/applyRules') . "'",
+        );
 
         $this->_controller = 'promo_catalog';
         $this->_headerText = Mage::helper('catalogrule')->__('Catalog Price Rules');
diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php
index 8cd9bcde163..4562032fc8d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php
@@ -27,11 +27,12 @@ public function __construct()
 
         parent::__construct();
 
-        $this->_addButton('save_apply', [
-            'class'   => 'save apply',
-            'label'   => Mage::helper('catalogrule')->__('Save and Apply'),
-            'onclick' => "$('rule_auto_apply').value=1; editForm.submit()",
-        ]);
+        $this->_addPreparedButton(
+            id: 'save_apply',
+            label: Mage::helper('catalogrule')->__('Save and Apply'),
+            class: 'save apply',
+            onClick: "$('rule_auto_apply').value=1; editForm.submit()",
+        );
 
         $this->_addPreparedButton(
             id: self::BUTTON_TYPE_SAVE_EDIT,
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php
index 19ea9a8ec9c..bc8f39a3cc8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php
@@ -23,11 +23,12 @@ public function __construct()
         $this->_controller = 'sales_order_status';
         $this->_headerText = Mage::helper('sales')->__('Order Statuses');
         $this->_addButtonLabel = Mage::helper('sales')->__('Create New Status');
-        $this->_addButton('assign', [
-            'label'     => Mage::helper('sales')->__('Assign Status to State'),
-            'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getAssignUrl()),
-            'class'     => 'add',
-        ]);
+        $this->_addPreparedButton(
+            id: 'assign',
+            label: Mage::helper('sales')->__('Assign Status to State'),
+            class: 'add',
+            onClickUrl: $this->getAssignUrl(),
+        );
         parent::__construct();
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php
index 8e1df1e9a34..d89692b701f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php
@@ -38,10 +38,13 @@ public function __construct()
                 $this->getEditUrl(),
                 Mage::helper('sales')->__('Are you sure? This order will be canceled and a new one will be created instead'),
             );
-            $this->_addButton('order_edit', [
-                'label'    => Mage::helper('sales')->__('Edit'),
-                'onclick'  => $onclickJs,
-            ]);
+
+            $this->_addPreparedButton(
+                id: 'order_edit',
+                label: Mage::helper('sales')->__('Edit'),
+                onClick: $onclickJs,
+            );
+
             // see if order has non-editable products as items
             $nonEditableTypes = array_keys($this->getOrder()->getResource()->aggregateProductsByTypes(
                 $order->getId(),
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php
index d5e790bc367..da82967d889 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php
@@ -58,11 +58,12 @@ public function __construct()
         if (Mage::getSingleton('admin/session')->isAllowed('sales/transactions/fetch')
             && $this->_txn->getOrderPaymentObject()->getMethodInstance()->canFetchTransactionInfo()
         ) {
-            $this->_addButton('fetch', [
-                'label'   => Mage::helper('sales')->__('Fetch'),
-                'onclick' => Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/fetch', ['_current' => true])),
-                'class'   => 'button',
-            ]);
+            $this->_addPreparedButton(
+                id: 'fetch',
+                label: Mage::helper('sales')->__('Fetch'),
+                class: 'button',
+                onClickUrl: $this->getUrl('*/*/fetch', ['_current' => true]),
+            );
         }
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php
index db3caecd605..adfb8042453 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php
@@ -24,11 +24,12 @@ public function __construct()
 
         parent::__construct();
 
-        $this->_addButton('generate', [
-            'label'   => Mage::helper('adminhtml')->__('Save & Generate'),
-            'onclick' => "$('generate').value=1; editForm.submit();",
-            'class'   => 'add generate',
-        ]);
+        $this->_addPreparedButton(
+            id: 'generate',
+            label: Mage::helper('adminhtml')->__('Save & Generate'),
+            class: 'add generate',
+            onClick: "$('generate').value=1; editForm.submit();",
+        );
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php
index 321406127f6..1ab6b9238c4 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php
@@ -30,25 +30,28 @@ public function __construct()
     protected function _prepareLayout()
     {
         /* Add website button */
-        $this->_addButton('add_website', [
-            'label'     => Mage::helper('core')->__('Create Website'),
-            'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/newWebsite')),
-            'class'     => 'add website',
-        ]);
+        $this->_addPreparedButton(
+            id: 'add_website',
+            label: Mage::helper('core')->__('Create Website'),
+            class: 'add website',
+            onClickUrl: $this->getUrl('*/*/newWebsite'),
+        );
 
         /* Add Store Group button */
-        $this->_addButton('add_group', [
-            'label'     => Mage::helper('core')->__('Create Store'),
-            'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/newGroup')),
-            'class'     => 'add store',
-        ]);
+        $this->_addPreparedButton(
+            id: 'add_group',
+            label: Mage::helper('core')->__('Create Store'),
+            class: 'add store',
+            onClickUrl: $this->getUrl('*/*/newGroup'),
+        );
 
         /* Add Store button */
-        $this->_addButton('add_store', [
-            'label'     => Mage::helper('core')->__('Create Store View'),
-            'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/newStore')),
-            'class'     => 'add storeview',
-        ]);
+        $this->_addPreparedButton(
+            id: 'add_store',
+            label: Mage::helper('core')->__('Create Store View'),
+            class: 'add storeview',
+            onClickUrl: $this->getUrl('*/*/newStore'),
+        );
 
         return parent::_prepareLayout();
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php
index 8d0326e65f0..3ccf2f8d8a1 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php
@@ -27,11 +27,12 @@ public function __construct()
             onClick: "window.location.href='" . $this->getUrl('*/*/') . "'",
         );
 
-        $this->_addButton('edit', [
-            'label'     => Mage::helper('adminhtml')->__('Edit'),
-            'class'     => 'edit',
-            'onclick'   => "window.location.href='" . $this->getEditUrl() . "'",
-        ]);
+        $this->_addPreparedButton(
+            id: 'edit',
+            label: Mage::helper('adminhtml')->__('Edit'),
+            class: 'edit',
+            onClick: "window.location.href='" . $this->getEditUrl() . "'",
+        );
     }
 
     #[Override]
diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php
index 038da5c3b16..f9a2e64b2eb 100644
--- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php
+++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php
@@ -25,10 +25,11 @@ public function __construct()
         parent::__construct();
 
         $this->_updateButton(self::BUTTON_TYPE_SAVE, 'label', Mage::helper('cms')->__('Save Process'));
-        $this->_addButton('reindex', [
-            'label'     => Mage::helper('index')->__('Reindex Data'),
-            'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getRunUrl()),
-        ]);
+        $this->_addPreparedButton(
+            id: 'reindex',
+            label: Mage::helper('index')->__('Reindex Data'),
+            onClickUrl: $this->getRunUrl(),
+        );
         $this->_removeButton(self::BUTTON_TYPE_RESET);
         $this->_removeButton(self::BUTTON_TYPE_DELETE);
     }
diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report.php b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report.php
index 28efc288f56..b298de1336c 100644
--- a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report.php
+++ b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report.php
@@ -22,14 +22,18 @@ public function __construct()
         $this->_headerText = Mage::helper('paypal')->__('PayPal Settlement Reports');
         parent::__construct();
         $this->_removeButton(self::BUTTON_TYPE_ADD);
-        $this->_addButton('fetch', [
-            'label'   => Mage::helper('paypal')->__('Fetch Updates'),
-            'onclick' => Mage::helper('core/js')->getConfirmSetLocationJs(
-                $this->getUrl('*/*/fetch'),
-                Mage::helper('paypal')->__('Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?'),
-            ),
-            'class'   => 'task',
-        ]);
+
+        $onClick = Mage::helper('core/js')->getConfirmSetLocationJs(
+            $this->getUrl('*/*/fetch'),
+            Mage::helper('paypal')->__('Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?'),
+        );
+
+        $this->_addPreparedButton(
+            id: 'fetch',
+            label: Mage::helper('paypal')->__('Fetch Updates'),
+            class: 'task',
+            onClick: $onClick,
+        );
     }
 
     /**
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php
index 12a0c6dc34d..466e72ae627 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php
@@ -43,13 +43,16 @@ protected function _prepareLayout()
 
         // suspend
         if ($profile->canSuspend()) {
-            $this->_addButton('suspend', [
-                'label'     => Mage::helper('sales')->__('Suspend'),
-                'onclick'   => Mage::helper('core/js')->getConfirmSetLocationJs(
-                    $this->getUrl('*/*/updateState', ['profile' => $profile->getId(), 'action' => 'suspend']),
-                ),
-                'class'     => 'delete',
-            ]);
+            $onClick = Mage::helper('core/js')->getConfirmSetLocationJs(
+                $this->getUrl('*/*/updateState', ['profile' => $profile->getId(), 'action' => 'suspend']),
+            );
+
+            $this->_addPreparedButton(
+                id: 'suspend',
+                label: Mage::helper('sales')->__('Suspend'),
+                class: 'delete',
+                onClick: $onClick,
+            );
         }
 
         // activate

From 84ac5c8269a04d66a8a456fa0efad69863d26d92 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Fri, 24 Apr 2026 17:27:25 +0200
Subject: [PATCH 26/26] update buttons

---
 .../Adminhtml/Recurring/Profile/View.php      | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php
index 466e72ae627..43149b29dcc 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php
@@ -57,24 +57,30 @@ class: 'delete',
 
         // activate
         if ($profile->canActivate()) {
-            $this->_addButton('activate', [
-                'label'     => Mage::helper('sales')->__('Activate'),
-                'onclick'   => Mage::helper('core/js')->getConfirmSetLocationJs(
-                    $this->getUrl('*/*/updateState', ['profile' => $profile->getId(), 'action' => 'activate']),
-                ),
-                'class'     => 'add',
-            ]);
+            $onClick = Mage::helper('core/js')->getConfirmSetLocationJs(
+                $this->getUrl('*/*/updateState', ['profile' => $profile->getId(), 'action' => 'activate']),
+            );
+
+            $this->_addPreparedButton(
+                id: 'activate',
+                label: Mage::helper('sales')->__('Activate'),
+                class: 'add',
+                onClick: $onClick,
+            );
         }
 
         // get update
         if ($profile->canFetchUpdate()) {
-            $this->_addButton('update', [
-                'label'     => Mage::helper('sales')->__('Get Update'),
-                'onclick'   => Mage::helper('core/js')->getConfirmSetLocationJs(
-                    $this->getUrl('*/*/updateProfile', ['profile' => $profile->getId()]),
-                ),
-                'class'     => 'add',
-            ]);
+            $onClick = Mage::helper('core/js')->getConfirmSetLocationJs(
+                $this->getUrl('*/*/updateProfile', ['profile' => $profile->getId()]),
+            );
+
+            $this->_addPreparedButton(
+                id: 'update',
+                label: Mage::helper('sales')->__('Get Update'),
+                class: 'add',
+                onClick: $onClick,
+            );
         }
 
         return parent::_prepareLayout();