Skip to content

Fix Inconsistency #2448

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

Merged
merged 4 commits into from
Mar 23, 2017
Merged

Fix Inconsistency #2448

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bbd9e2a
Fix Inconsistency
srenon Nov 20, 2015
cdda40a
Fix Inconsistency
srenon Nov 25, 2015
ace0b8f
Merge remote-tracking branch 'upstream/develop' into patch-1
srenon Jan 12, 2016
0604459
Merge remote-tracking branch 'upstream/develop' into patch-1
srenon Jan 20, 2016
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
28 changes: 14 additions & 14 deletions app/code/Magento/Sales/Block/Adminhtml/Order/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ protected function _construct()

parent::_construct();

$this->buttonList->remove('delete');
$this->buttonList->remove('reset');
$this->buttonList->remove('save');
$this->removeButton('delete');
$this->removeButton('reset');
$this->removeButton('save');
$this->setId('sales_order_view');
$order = $this->getOrder();

Expand All @@ -92,7 +92,7 @@ protected function _construct()
. $this->getEditMessage($order) . '\', url: \'' . $this->getEditUrl()
. '\'}).orderEditDialog(\'showDialog\');';

$this->buttonList->add(
$this->addButton(
'order_edit',
[
'label' => __('Edit'),
Expand All @@ -106,7 +106,7 @@ protected function _construct()
}

if ($this->_isAllowedAction('Magento_Sales::cancel') && $order->canCancel()) {
$this->buttonList->add(
$this->addButton(
'order_cancel',
[
'label' => __('Cancel'),
Expand Down Expand Up @@ -140,7 +140,7 @@ protected function _construct()
if ($order->getPayment()->getMethodInstance()->isGateway()) {
$onClick = "confirmSetLocation('{$message}', '{$this->getCreditmemoUrl()}')";
}
$this->buttonList->add(
$this->addButton(
'order_creditmemo',
['label' => __('Credit Memo'), 'onclick' => $onClick, 'class' => 'credit-memo']
);
Expand All @@ -159,7 +159,7 @@ protected function _construct()
}

if ($this->_isAllowedAction('Magento_Sales::hold') && $order->canHold()) {
$this->buttonList->add(
$this->addButton(
'order_hold',
[
'label' => __('Hold'),
Expand All @@ -173,7 +173,7 @@ protected function _construct()
}

if ($this->_isAllowedAction('Magento_Sales::unhold') && $order->canUnhold()) {
$this->buttonList->add(
$this->addButton(
'order_unhold',
[
'label' => __('Unhold'),
Expand All @@ -189,15 +189,15 @@ protected function _construct()
if ($this->_isAllowedAction('Magento_Sales::review_payment')) {
if ($order->canReviewPayment()) {
$message = __('Are you sure you want to accept this payment?');
$this->buttonList->add(
$this->addButton(
'accept_payment',
[
'label' => __('Accept Payment'),
'onclick' => "confirmSetLocation('{$message}', '{$this->getReviewPaymentUrl('accept')}')"
]
);
$message = __('Are you sure you want to deny this payment?');
$this->buttonList->add(
$this->addButton(
'deny_payment',
[
'label' => __('Deny Payment'),
Expand All @@ -206,7 +206,7 @@ protected function _construct()
);
}
if ($order->canFetchPaymentReviewUpdate()) {
$this->buttonList->add(
$this->addButton(
'get_review_payment_update',
[
'label' => __('Get Payment Update'),
Expand All @@ -218,7 +218,7 @@ protected function _construct()

if ($this->_isAllowedAction('Magento_Sales::invoice') && $order->canInvoice()) {
$_label = $order->getForcedShipmentWithInvoice() ? __('Invoice and Ship') : __('Invoice');
$this->buttonList->add(
$this->addButton(
'order_invoice',
[
'label' => $_label,
Expand All @@ -232,7 +232,7 @@ protected function _construct()
'Magento_Sales::ship'
) && $order->canShip() && !$order->getForcedShipmentWithInvoice()
) {
$this->buttonList->add(
$this->addButton(
'order_ship',
[
'label' => __('Ship'),
Expand All @@ -248,7 +248,7 @@ protected function _construct()
$order->getStore()
) && $order->canReorderIgnoreSalable()
) {
$this->buttonList->add(
$this->addButton(
'order_reorder',
[
'label' => __('Reorder'),
Expand Down