From 92304248e53a33e27d60e413b2b4cf7c1aef0144 Mon Sep 17 00:00:00 2001 From: mageprince <7pprince@gmail.com> Date: Tue, 17 Jul 2018 14:22:43 +0530 Subject: [PATCH 1/3] Update Tax.php --- app/code/Magento/Tax/Block/Sales/Order/Tax.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/Tax/Block/Sales/Order/Tax.php b/app/code/Magento/Tax/Block/Sales/Order/Tax.php index 71eb629111344..94e5b972db121 100644 --- a/app/code/Magento/Tax/Block/Sales/Order/Tax.php +++ b/app/code/Magento/Tax/Block/Sales/Order/Tax.php @@ -260,16 +260,11 @@ protected function _initShipping() } /** - * @return void + * @return null */ protected function _initDiscount() { - // $store = $this->getStore(); - // $parent = $this->getParentBlock(); - // if ($this->_config->displaySales) { - // - // } elseif ($this->_config->displaySales) { - // } + return null; } /** From 93c0bb7eff2dde0debc83cb02d24c104d886d8a6 Mon Sep 17 00:00:00 2001 From: mageprince <7pprince@gmail.com> Date: Tue, 17 Jul 2018 15:12:18 +0530 Subject: [PATCH 2/3] Update Tax.php --- app/code/Magento/Tax/Block/Sales/Order/Tax.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Tax/Block/Sales/Order/Tax.php b/app/code/Magento/Tax/Block/Sales/Order/Tax.php index 94e5b972db121..2ea0bcddea14e 100644 --- a/app/code/Magento/Tax/Block/Sales/Order/Tax.php +++ b/app/code/Magento/Tax/Block/Sales/Order/Tax.php @@ -260,11 +260,11 @@ protected function _initShipping() } /** - * @return null + * @return void */ protected function _initDiscount() { - return null; + return; } /** From 7d581c7a4d1e3cc2ed97941acf000bbaf0216f55 Mon Sep 17 00:00:00 2001 From: Vlad Veselov Date: Tue, 17 Jul 2018 23:16:20 +0300 Subject: [PATCH 3/3] Update Tax.php --- app/code/Magento/Tax/Block/Sales/Order/Tax.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/Magento/Tax/Block/Sales/Order/Tax.php b/app/code/Magento/Tax/Block/Sales/Order/Tax.php index 2ea0bcddea14e..4d48abbcb0982 100644 --- a/app/code/Magento/Tax/Block/Sales/Order/Tax.php +++ b/app/code/Magento/Tax/Block/Sales/Order/Tax.php @@ -264,7 +264,6 @@ protected function _initShipping() */ protected function _initDiscount() { - return; } /**