Skip to content

[Backport] Remove commented code #17136

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 1 commit into from
Jul 27, 2018
Merged

[Backport] Remove commented code #17136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 0 additions & 8 deletions app/code/Magento/Backend/Block/Dashboard/Bar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Catalog/Setup/InstallData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
6 changes: 0 additions & 6 deletions app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
7 changes: 0 additions & 7 deletions app/code/Magento/Sales/Model/Order/Creditmemo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 0 additions & 8 deletions app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@
// @codingStandardsIgnoreFile

?>
<?php /*$_source = $block->getSource(); ?>
<?php $block->setPriceDataObject($_source) ?>
<?php if ($_source): ?>
<table width="100%">
<?php echo $block->getChildHtml('main'); ?>
<?php echo $block->getChildHtml('footer'); ?>
</table>
<?php endif;*/ ?>
<table class="data-table admin__table-secondary order-subtotal-table">
<?php $_totals = $block->getTotals('footer')?>

Expand Down