forked from magento/magento2
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.2-develop' into fix-issue-19328
- Loading branch information
Showing
1,220 changed files
with
56,268 additions
and
19,139 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/PaymentDetails.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
<?php | ||
/** | ||
* Copyright © Magento, Inc. All rights reserved. | ||
* See COPYING.txt for license details. | ||
*/ | ||
declare(strict_types=1); | ||
|
||
namespace Magento\Authorizenet\Block\Adminhtml\Order\View\Info; | ||
|
||
use Magento\Framework\Phrase; | ||
use Magento\Payment\Block\ConfigurableInfo; | ||
|
||
/** | ||
* Payment information block for Authorize.net payment method. | ||
*/ | ||
class PaymentDetails extends ConfigurableInfo | ||
{ | ||
/** | ||
* Returns localized label for payment info block. | ||
* | ||
* @param string $field | ||
* @return string | Phrase | ||
*/ | ||
protected function getLabel($field) | ||
{ | ||
return __($field); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,13 +5,39 @@ | |
*/ | ||
namespace Magento\Backend\Block\System\Store\Delete; | ||
|
||
use Magento\Backup\Helper\Data as BackupHelper; | ||
use Magento\Framework\App\ObjectManager; | ||
|
||
/** | ||
* Adminhtml cms block edit form | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
*/ | ||
class Form extends \Magento\Backend\Block\Widget\Form\Generic | ||
{ | ||
/** | ||
* @var BackupHelper | ||
*/ | ||
private $backup; | ||
|
||
/** | ||
* @param \Magento\Backend\Block\Template\Context $context | ||
* @param \Magento\Framework\Registry $registry | ||
* @param \Magento\Framework\Data\FormFactory $formFactory | ||
* @param array $data | ||
* @param BackupHelper|null $backup | ||
*/ | ||
public function __construct( | ||
\Magento\Backend\Block\Template\Context $context, | ||
\Magento\Framework\Registry $registry, | ||
\Magento\Framework\Data\FormFactory $formFactory, | ||
array $data = [], | ||
BackupHelper $backup = null | ||
) { | ||
parent::__construct($context, $registry, $formFactory, $data); | ||
$this->backup = $backup ?? ObjectManager::getInstance()->get(BackupHelper::class); | ||
} | ||
|
||
/** | ||
* Init form | ||
* | ||
|
@@ -25,7 +51,7 @@ protected function _construct() | |
} | ||
|
||
/** | ||
* {@inheritdoc} | ||
* @inheritDoc | ||
*/ | ||
protected function _prepareForm() | ||
{ | ||
|
@@ -45,15 +71,21 @@ protected function _prepareForm() | |
|
||
$fieldset->addField('item_id', 'hidden', ['name' => 'item_id', 'value' => $dataObject->getId()]); | ||
|
||
$backupOptions = ['0' => __('No')]; | ||
$backupSelected = '0'; | ||
if ($this->backup->isEnabled()) { | ||
$backupOptions['1'] = __('Yes'); | ||
$backupSelected = '1'; | ||
} | ||
$fieldset->addField( | ||
'create_backup', | ||
'select', | ||
[ | ||
'label' => __('Create DB Backup'), | ||
'title' => __('Create DB Backup'), | ||
'name' => 'create_backup', | ||
'options' => ['1' => __('Yes'), '0' => __('No')], | ||
'value' => '1' | ||
'options' => $backupOptions, | ||
'value' => $backupSelected | ||
] | ||
); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,6 +14,7 @@ | |
* Store controller | ||
* | ||
* @author Magento Core Team <[email protected]> | ||
* @SuppressWarnings(PHPMD.AllPurposeAction) | ||
*/ | ||
abstract class Store extends Action | ||
{ | ||
|
@@ -86,6 +87,8 @@ protected function createPage() | |
* Backup database | ||
* | ||
* @return bool | ||
* | ||
* @deprecated Backup module is to be removed. | ||
*/ | ||
protected function _backupDatabase() | ||
{ | ||
|
Oops, something went wrong.