Skip to content

Commit 8fa9966

Browse files
glo24157glo24157
committed
Merge branch 'no-author/sales-01' into comm_prd_may_abhi_v1
2 parents 56a58d5 + 6ce39e5 commit 8fa9966

29 files changed

+62
-140
lines changed

‎app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.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\Create;
77

88
/**
99
* Adminhtml sales order create block
1010
*
1111
* @api
12-
* @author Magento Core Team <core@magentocommerce.com>
1312
* @since 100.0.2
1413
*/
1514
class Customer extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate

‎app/code/Magento/Sales/Block/Adminhtml/Order/Create/Data.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;
77

@@ -11,14 +11,11 @@
1111
* Order create data
1212
*
1313
* @api
14-
* @author Magento Core Team <core@magentocommerce.com>
1514
* @since 100.0.2
1615
*/
1716
class Data extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
1817
{
1918
/**
20-
* Currency factory
21-
*
2219
* @var \Magento\Directory\Model\CurrencyFactory
2320
*/
2421
protected $_currencyFactory;

‎app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php

Lines changed: 2 additions & 9 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

77
namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
@@ -29,22 +29,17 @@
2929
* Create order account form
3030
*
3131
* @api
32-
* @author Magento Core Team <core@magentocommerce.com>
3332
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
3433
* @since 100.0.2
3534
*/
3635
class Account extends AbstractForm
3736
{
3837
/**
39-
* Metadata form factory
40-
*
4138
* @var MetadataFormFactory
4239
*/
4340
protected $_metadataFormFactory;
4441

4542
/**
46-
* Customer repository
47-
*
4843
* @var CustomerRepositoryInterface
4944
*/
5045
protected $customerRepository;
@@ -99,8 +94,6 @@ public function __construct(
9994
}
10095

10196
/**
102-
* Group Management
103-
*
10497
* @var GroupManagementInterface
10598
*/
10699
private $groupManagement;

‎app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php

Lines changed: 2 additions & 7 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;
77

@@ -11,21 +11,16 @@
1111
* Adminhtml order create gift message block
1212
*
1313
* @api
14-
* @author Magento Core Team <core@magentocommerce.com>
1514
* @since 100.0.2
1615
*/
1716
class Giftmessage extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
1817
{
1918
/**
20-
* Gift message save
21-
*
2219
* @var \Magento\GiftMessage\Model\Save
2320
*/
2421
protected $_giftMessageSave;
2522

2623
/**
27-
* Message helper
28-
*
2924
* @var \Magento\GiftMessage\Helper\Message
3025
*/
3126
protected $_messageHelper;

‎app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items.php

Lines changed: 2 additions & 3 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;
77

@@ -11,7 +11,6 @@
1111
* Adminhtml sales order create items block
1212
*
1313
* @api
14-
* @author Magento Core Team <core@magentocommerce.com>
1514
* @since 100.0.2
1615
*/
1716
class Items extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate

‎app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php

Lines changed: 2 additions & 5 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\Create;
77

88
/**
99
* Adminhtml sales order create newsletter block
1010
*
1111
* @api
12-
* @author Magento Core Team <core@magentocommerce.com>
1312
* @since 100.0.2
1413
*/
1514
class Load extends \Magento\Framework\View\Element\Template
@@ -20,8 +19,6 @@ class Load extends \Magento\Framework\View\Element\Template
2019
protected $_jsHelper = null;
2120

2221
/**
23-
* Json encoder
24-
*
2522
* @var \Magento\Framework\Json\EncoderInterface
2623
*/
2724
protected $_jsonEncoder;

‎app/code/Magento/Sales/Block/Adminhtml/Order/Create/Messages.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 2013 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Block\Adminhtml\Order\Create;
77

88
/**
99
* Order create errors block
1010
*
1111
* @api
12-
* @author Magento Core Team <core@magentocommerce.com>
1312
* @since 100.0.2
1413
*/
1514
class Messages extends \Magento\Framework\View\Element\Messages

‎app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php

Lines changed: 4 additions & 4 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\Create;
77

88
/**
99
* Adminhtml sales order create newsletter block
1010
*
1111
* @api
12-
* @author Magento Core Team <core@magentocommerce.com>
1312
* @since 100.0.2
1413
*/
1514
class Newsletter extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
@@ -46,7 +45,8 @@ public function getHeaderCssClass()
4645
}
4746

4847
/**
49-
* {@inheritdoc}
48+
* @inheritdoc
49+
* phpcs:disable
5050
*/
5151
protected function _toHtml()
5252
{

‎app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter/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\Create\Newsletter;
77

88
/**
99
* Adminhtml sales order create newsletter form block
1010
*
1111
* @api
12-
* @author Magento Core Team <core@magentocommerce.com>
1312
* @since 100.0.2
1413
*/
1514
class Form extends \Magento\Backend\Block\Widget

‎app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.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\Create;
77

88
/**
99
* Adminhtml sales order create search block
1010
*
1111
* @api
12-
* @author Magento Core Team <core@magentocommerce.com>
1312
* @since 100.0.2
1413
*/
1514
class Search extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate

‎app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php

Lines changed: 2 additions & 11 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\Search;
77

@@ -12,36 +12,27 @@
1212
* Adminhtml sales order create search products block
1313
*
1414
* @api
15-
* @author Magento Core Team <core@magentocommerce.com>
1615
* @since 100.0.2
1716
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1817
*/
1918
class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
2019
{
2120
/**
22-
* Sales config
23-
*
2421
* @var \Magento\Sales\Model\Config
2522
*/
2623
protected $_salesConfig;
2724

2825
/**
29-
* Session quote
30-
*
3126
* @var \Magento\Backend\Model\Session\Quote
3227
*/
3328
protected $_sessionQuote;
3429

3530
/**
36-
* Catalog config
37-
*
3831
* @var \Magento\Catalog\Model\Config
3932
*/
4033
protected $_catalogConfig;
4134

4235
/**
43-
* Product factory
44-
*
4536
* @var \Magento\Catalog\Model\ProductFactory
4637
*/
4738
protected $_productFactory;

‎app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Price.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
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\Search\Grid\Renderer;
77

88
/**
99
* Adminhtml sales create order product search grid price column renderer
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
class Price extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Price
1412
{

‎app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Product.php

Lines changed: 2 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 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\Renderer;
77

@@ -11,8 +11,6 @@
1111

1212
/**
1313
* Adminhtml sales create order product search grid product name column renderer
14-
*
15-
* @author Magento Core Team <core@magentocommerce.com>
1614
*/
1715
class Product extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
1816
{

‎app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Qty.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
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\Search\Grid\Renderer;
77

88
/**
99
* Renderer for Qty field in sales create new order search grid
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
class Qty extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Input
1412
{
1513
/**
16-
* Type config
17-
*
1814
* @var \Magento\Catalog\Model\ProductTypes\ConfigInterface
1915
*/
2016
protected $typeConfig;

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

Lines changed: 2 additions & 3 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
declare(strict_types=1);
77

@@ -11,7 +11,6 @@
1111
* Adminhtml sales order create shipping address block
1212
*
1313
* @api
14-
* @author Magento Core Team <core@magentocommerce.com>
1514
* @SuppressWarnings(PHPMD.DepthOfInheritance)
1615
* @since 100.0.2
1716
*/

‎app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method.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\Create\Shipping;
77

88
/**
99
* Adminhtml sales order create shipping method block
1010
*
1111
* @api
12-
* @author Magento Core Team <core@magentocommerce.com>
1312
* @since 100.0.2
1413
*/
1514
class Method extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate

0 commit comments

Comments
 (0)