Skip to content

Commit 21276bc

Browse files
committed
Merge remote-tracking branch 'fredden/no-author/sales-02' into commpr-10131-0608
2 parents 6dd3fa9 + b240d96 commit 21276bc

File tree

32 files changed

+74
-169
lines changed

32 files changed

+74
-169
lines changed

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2013 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Block\Adminhtml\Order\Create\Totals;
77

@@ -10,7 +10,6 @@
1010
/**
1111
* Subtotal Total Row Renderer
1212
*
13-
* @author Magento Core Team <core@magentocommerce.com>
1413
* @SuppressWarnings(PHPMD.DepthOfInheritance)
1514
*/
1615
class Discount extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
@@ -24,9 +23,9 @@ class Discount extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
2423
* @param \Magento\Backend\Block\Template\Context $context
2524
* @param \Magento\Backend\Model\Session\Quote $sessionQuote
2625
* @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
26+
* @param PriceCurrencyInterface $priceCurrency
2727
* @param \Magento\Sales\Helper\Data $salesData
2828
* @param \Magento\Sales\Model\Config $salesConfig
29-
* @param PriceCurrencyInterface $priceCurrency
3029
* @param \Magento\Tax\Model\Config $taxConfig
3130
* @param array $data
3231
*/

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2013 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Block\Adminhtml\Order\Create\Totals;
77

@@ -10,21 +10,16 @@
1010
/**
1111
* Subtotal Total Row Renderer
1212
*
13-
* @author Magento Core Team <core@magentocommerce.com>
1413
* @SuppressWarnings(PHPMD.DepthOfInheritance)
1514
*/
1615
class Grandtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
1716
{
1817
/**
19-
* Template
20-
*
2118
* @var string
2219
*/
2320
protected $_template = 'Magento_Sales::order/create/totals/grandtotal.phtml';
2421

2522
/**
26-
* Tax config
27-
*
2823
* @var \Magento\Tax\Model\Config
2924
*/
3025
protected $_taxConfig;
@@ -33,9 +28,9 @@ class Grandtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defa
3328
* @param \Magento\Backend\Block\Template\Context $context
3429
* @param \Magento\Backend\Model\Session\Quote $sessionQuote
3530
* @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
31+
* @param PriceCurrencyInterface $priceCurrency
3632
* @param \Magento\Sales\Helper\Data $salesData
3733
* @param \Magento\Sales\Model\Config $salesConfig
38-
* @param PriceCurrencyInterface $priceCurrency
3934
* @param \Magento\Tax\Model\Config $taxConfig
4035
* @param array $data
4136
*/

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Block\Adminhtml\Order\Create\Totals;
77

@@ -10,21 +10,16 @@
1010
/**
1111
* Subtotal Total Row Renderer
1212
*
13-
* @author Magento Core Team <core@magentocommerce.com>
1413
* @SuppressWarnings(PHPMD.DepthOfInheritance)
1514
*/
1615
class Shipping extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
1716
{
1817
/**
19-
* Template
20-
*
2118
* @var string
2219
*/
2320
protected $_template = 'Magento_Sales::order/create/totals/shipping.phtml';
2421

2522
/**
26-
* Tax config
27-
*
2823
* @var \Magento\Tax\Model\Config
2924
*/
3025
protected $_taxConfig;
@@ -33,9 +28,9 @@ class Shipping extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
3328
* @param \Magento\Backend\Block\Template\Context $context
3429
* @param \Magento\Backend\Model\Session\Quote $sessionQuote
3530
* @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
31+
* @param PriceCurrencyInterface $priceCurrency
3632
* @param \Magento\Sales\Helper\Data $salesData
3733
* @param \Magento\Sales\Model\Config $salesConfig
38-
* @param PriceCurrencyInterface $priceCurrency
3934
* @param \Magento\Tax\Model\Config $taxConfig
4035
* @param array $data
4136
*/

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2013 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Block\Adminhtml\Order\Create\Totals;
77

@@ -10,21 +10,16 @@
1010
/**
1111
* Subtotal Total Row Renderer
1212
*
13-
* @author Magento Core Team <core@magentocommerce.com>
1413
* @SuppressWarnings(PHPMD.DepthOfInheritance)
1514
*/
1615
class Subtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
1716
{
1817
/**
19-
* Template
20-
*
2118
* @var string
2219
*/
2320
protected $_template = 'Magento_Sales::order/create/totals/subtotal.phtml';
2421

2522
/**
26-
* Tax config
27-
*
2823
* @var \Magento\Tax\Model\Config
2924
*/
3025
protected $_taxConfig;
@@ -33,9 +28,9 @@ class Subtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
3328
* @param \Magento\Backend\Block\Template\Context $context
3429
* @param \Magento\Backend\Model\Session\Quote $sessionQuote
3530
* @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
31+
* @param PriceCurrencyInterface $priceCurrency
3632
* @param \Magento\Sales\Helper\Data $salesData
3733
* @param \Magento\Sales\Model\Config $salesConfig
38-
* @param PriceCurrencyInterface $priceCurrency
3934
* @param \Magento\Tax\Model\Config $taxConfig
4035
* @param array $data
4136
*/

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Block\Adminhtml\Order\Create\Totals;
77

88
use Magento\Store\Model\ResourceModel\Website\Collection;
99

1010
/**
1111
* Adminhtml sales order create totals table block
12-
*
13-
* @author Magento Core Team <core@magentocommerce.com>
1412
*/
1513
class Table extends \Magento\Backend\Block\Template
1614
{
1715
/**
18-
* Website collection
19-
*
2016
* @var Collection|null
2117
*/
2218
protected $_websiteCollection = null;

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Block\Adminhtml\Order\Create\Totals;
77

@@ -12,7 +12,6 @@
1212
/**
1313
* Tax Total Row Renderer
1414
*
15-
* @author Magento Core Team <core@magentocommerce.com>
1615
* @SuppressWarnings(PHPMD.DepthOfInheritance)
1716
*/
1817
class Tax extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
@@ -42,8 +41,6 @@ public function __construct(
4241
}
4342

4443
/**
45-
* Template
46-
*
4744
* @var string
4845
*/
4946
protected $_template = 'Magento_Sales::order/create/totals/tax.phtml';

app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Totals.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo;
77

@@ -11,14 +11,11 @@
1111
* Adminhtml order creditmemo totals block
1212
*
1313
* @api
14-
* @author Magento Core Team <core@magentocommerce.com>
1514
* @since 100.0.2
1615
*/
1716
class Totals extends \Magento\Sales\Block\Adminhtml\Totals
1817
{
1918
/**
20-
* Creditmemo
21-
*
2219
* @var Creditmemo|null
2320
*/
2421
protected $_creditmemo;

app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo;
77

88
/**
99
* Adminhtml creditmemo view
1010
*
1111
* @api
12-
* @author Magento Core Team <core@magentocommerce.com>
1312
* @since 100.0.2
1413
*/
1514
class View extends \Magento\Backend\Block\Widget\Form\Container
1615
{
1716
/**
18-
* Core registry
19-
*
2017
* @var \Magento\Framework\Registry
2118
*/
2219
protected $_coreRegistry = null;

app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo\View;
77

88
/**
99
* Adminhtml sales shipment comment view block
1010
*
1111
* @api
12-
* @author Magento Core Team <core@magentocommerce.com>
1312
* @since 100.0.2
1413
*/
1514
class Comments extends \Magento\Backend\Block\Text\ListText
1615
{
1716
/**
18-
* Core registry
19-
*
2017
* @var \Magento\Framework\Registry
2118
*/
2219
protected $_coreRegistry = null;

app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Form.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo\View;
77

88
/**
99
* Creditmemo view form
1010
*
1111
* @api
12-
* @author Magento Core Team <core@magentocommerce.com>
1312
* @since 100.0.2
1413
*/
1514
class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder

0 commit comments

Comments
 (0)