Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

admin checkout agreement controllers refactor #16505

Merged
merged 4 commits into from
Aug 1, 2018
Merged

admin checkout agreement controllers refactor #16505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4746315
admin checkout agreement controllers refactor
AnshuMishra17 Jul 3, 2018
c0c5bb6
refactor code
AnshuMishra17 Jul 13, 2018
54bc4e3
fixes as CI issues
AnshuMishra17 Jul 17, 2018
b871f16
Fixed variable name & repository usage
Jul 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@
*/
namespace Magento\CheckoutAgreements\Controller\Adminhtml;

abstract class Agreement extends \Magento\Backend\App\Action
use Magento\Backend\App\Action;
use Magento\Backend\App\Action\Context;
use Magento\Framework\Registry;

abstract class Agreement extends Action
{
/**
* Authorization level of a basic admin session
Expand All @@ -22,12 +26,14 @@ abstract class Agreement extends \Magento\Backend\App\Action
protected $_coreRegistry = null;

/**
* @param \Magento\Backend\App\Action\Context $context
* @param \Magento\Framework\Registry $coreRegistry
* @param Context $context
* @param Registry $coreRegistry
* @codeCoverageIgnore
*/
public function __construct(\Magento\Backend\App\Action\Context $context, \Magento\Framework\Registry $coreRegistry)
{
public function __construct(
Context $context,
Registry $coreRegistry
) {
$this->_coreRegistry = $coreRegistry;
parent::__construct($context);
}
Expand Down
36 changes: 31 additions & 5 deletions app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,53 @@
*/
namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;

class Delete extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
use Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface;
use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
use Magento\Backend\App\Action\Context;
use Magento\Framework\Registry;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\Exception\LocalizedException;

class Delete extends Agreement
{
/**
* @var CheckoutAgreementsRepositoryInterface
*/
private $agreementRepository;

/**
* @param Context $context
* @param Registry $coreRegistry
* @param CheckoutAgreementsRepositoryInterface $agreementRepository
*/
public function __construct(
Context $context,
Registry $coreRegistry,
CheckoutAgreementsRepositoryInterface $agreementRepository = null
) {
$this->agreementRepository = $agreementRepository ?:
ObjectManager::getInstance()->get(CheckoutAgreementsRepositoryInterface::class);
parent::__construct($context, $coreRegistry);
}
/**
* @return void
*/
public function execute()
{
$id = (int)$this->getRequest()->getParam('id');
$model = $this->_objectManager->get(\Magento\CheckoutAgreements\Model\Agreement::class)->load($id);
if (!$model->getId()) {
$agreement = $this->agreementRepository->get($id);
if (!$agreement->getAgreementId()) {
$this->messageManager->addError(__('This condition no longer exists.'));
$this->_redirect('checkout/*/');
return;
}

try {
$model->delete();
$this->agreementRepository->delete($agreement);
$this->messageManager->addSuccess(__('You deleted the condition.'));
$this->_redirect('checkout/*/');
return;
} catch (\Magento\Framework\Exception\LocalizedException $e) {
} catch (LocalizedException $e) {
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addError(__('Something went wrong while deleting this condition.'));
Expand Down
34 changes: 30 additions & 4 deletions app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,42 @@
*/
namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;

class Edit extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
use Magento\CheckoutAgreements\Model\AgreementFactory;
use Magento\Backend\App\Action\Context;
use Magento\Framework\Registry;
use Magento\Framework\App\ObjectManager;
use Magento\CheckoutAgreements\Block\Adminhtml\Agreement\Edit as BlockEdit;

class Edit extends Agreement
{
/**
* @var AgreementFactory
*/
private $agreementFactory;

/**
* @param Context $context
* @param Registry $coreRegistry
* @param AgreementFactory $agreementFactory
*/
public function __construct(
Context $context,
Registry $coreRegistry,
AgreementFactory $agreementFactory = null
) {
$this->agreementFactory = $agreementFactory ?:
ObjectManager::getInstance()->get(AgreementFactory::class);
parent::__construct($context, $coreRegistry);
}
/**
* @return void
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
$id = $this->getRequest()->getParam('id');
$agreementModel = $this->_objectManager->create(\Magento\CheckoutAgreements\Model\Agreement::class);
$agreementModel = $this->agreementFactory->create();

if ($id) {
$agreementModel->load($id);
Expand All @@ -26,7 +52,7 @@ public function execute()
}
}

$data = $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getAgreementData(true);
$data = $this->_session->getAgreementData(true);
if (!empty($data)) {
$agreementModel->setData($data);
}
Expand All @@ -38,7 +64,7 @@ public function execute()
$id ? __('Edit Condition') : __('New Condition')
)->_addContent(
$this->_view->getLayout()->createBlock(
\Magento\CheckoutAgreements\Block\Adminhtml\Agreement\Edit::class
BlockEdit::class
)->setData(
'action',
$this->getUrl('checkout/*/save')
Expand Down
37 changes: 32 additions & 5 deletions app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,47 @@
*/
namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;

class Save extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
use Magento\CheckoutAgreements\Model\AgreementFactory;
use Magento\Backend\App\Action\Context;
use Magento\Framework\Registry;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\DataObject;
use Magento\Framework\Exception\LocalizedException;

class Save extends Agreement
{
/**
* @var AgreementFactory
*/
private $agreementFactory;

/**
* @param Context $context
* @param Registry $coreRegistry
* @param AgreementFactory $agreementFactory
*/
public function __construct(
Context $context,
Registry $coreRegistry,
AgreementFactory $agreementFactory = null
) {
$this->agreementFactory = $agreementFactory ?:
ObjectManager::getInstance()->get(AgreementFactory::class);
parent::__construct($context, $coreRegistry);
}
/**
* @return void
*/
public function execute()
{
$postData = $this->getRequest()->getPostValue();
if ($postData) {
$model = $this->_objectManager->get(\Magento\CheckoutAgreements\Model\Agreement::class);
$model = $this->agreementFactory->create();
$model->setData($postData);

try {
$validationResult = $model->validateData(new \Magento\Framework\DataObject($postData));
$validationResult = $model->validateData(new DataObject($postData));
if ($validationResult !== true) {
foreach ($validationResult as $message) {
$this->messageManager->addError($message);
Expand All @@ -30,13 +57,13 @@ public function execute()
$this->_redirect('checkout/*/');
return;
}
} catch (\Magento\Framework\Exception\LocalizedException $e) {
} catch (LocalizedException $e) {
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addError(__('Something went wrong while saving this condition.'));
}

$this->_objectManager->get(\Magento\Backend\Model\Session::class)->setAgreementData($postData);
$this->_session->setAgreementData($postData);
$this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
}
}
Expand Down