diff --git a/app/code/Magento/Backend/Block/Dashboard/Bar.php b/app/code/Magento/Backend/Block/Dashboard/Bar.php index 29557f12c1093..7ccb2d51ccd1b 100644 --- a/app/code/Magento/Backend/Block/Dashboard/Bar.php +++ b/app/code/Magento/Backend/Block/Dashboard/Bar.php @@ -38,14 +38,6 @@ public function getTotals() */ public function addTotal($label, $value, $isQuantity = false) { - /*if (!$isQuantity) { - $value = $this->format($value); - $decimals = substr($value, -2); - $value = substr($value, 0, -2); - } else { - $value = ($value != '')?$value:0; - $decimals = ''; - }*/ if (!$isQuantity) { $value = $this->format($value); } diff --git a/app/code/Magento/Catalog/Setup/InstallData.php b/app/code/Magento/Catalog/Setup/InstallData.php index b5186559e9b0b..7de1517bd9004 100644 --- a/app/code/Magento/Catalog/Setup/InstallData.php +++ b/app/code/Magento/Catalog/Setup/InstallData.php @@ -123,7 +123,6 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface // update attributes group and sort $attributes = [ 'custom_design' => ['group' => 'design', 'sort' => 10], - // 'custom_design_apply' => array('group' => 'design', 'sort' => 20), 'custom_design_from' => ['group' => 'design', 'sort' => 30], 'custom_design_to' => ['group' => 'design', 'sort' => 40], 'page_layout' => ['group' => 'design', 'sort' => 50], diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php index ce7f601e43878..3bf69ca8aae8f 100644 --- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php +++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php @@ -65,12 +65,6 @@ public function getModel() */ protected function _prepareLayout() { - // Load Wysiwyg on demand and Prepare layout -// $block = $this->getLayout()->getBlock('head'); -// if ($this->_wysiwygConfig->isEnabled() && $block) { -// $block->setCanLoadTinyMce(true); -// } - $this->getToolbar()->addChild( 'back_button', 'Magento\Backend\Block\Widget\Button', diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php index 01d52bc667210..2adbece5d89f4 100644 --- a/app/code/Magento/Sales/Model/Order/Creditmemo.php +++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php @@ -588,13 +588,6 @@ public function getCommentsCollection($reload = false) { $collection = $this->_commentCollectionFactory->create()->setCreditmemoFilter($this->getId()) ->setCreatedAtOrder(); -// -// $this->setComments($comments); -// /** -// * When credit memo created with adding comment, -// * comments collection must be loaded before we added this comment. -// */ -// $this->getComments()->load(); if ($this->getId()) { foreach ($collection as $comment) { diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml index 2781b5b890a22..51c8c25b741a1 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml @@ -7,14 +7,6 @@ // @codingStandardsIgnoreFile ?> -getSource(); ?> -setPriceDataObject($_source) ?> - - - getChildHtml('main'); ?> - getChildHtml('footer'); ?> -
- getTotals('footer')?>