Skip to content

Commit 56a58d5

Browse files
committed
Merge branch 'no-author/gift-message' into comm_prd_may_abhi_v1
2 parents 756da78 + f2c7349 commit 56a58d5

File tree

24 files changed

+66
-102
lines changed

24 files changed

+66
-102
lines changed

app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
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\GiftMessage\Block\Adminhtml\Product\Helper\Form;
77

88
/**
99
* Adminhtml additional helper block for product configuration
1010
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1211
* @codeCoverageIgnore
1312
*/
1413
class Config extends \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Config

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

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

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

88
/**
99
* Adminhtml sales order create gift options block
1010
*
1111
* @api
12-
* @author Magento Core Team <core@magentocommerce.com>
1312
* @codeCoverageIgnore
1413
* @since 100.0.2
1514
*/

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

88
/**
99
* Gift message adminhtml sales order create items
1010
*
1111
* @api
12-
* @author Magento Core Team <core@magentocommerce.com>
1312
* @since 100.0.2
1413
*/
1514
class Items extends \Magento\Backend\Block\Template

app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Form.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\GiftMessage\Block\Adminhtml\Sales\Order\View;
77

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

app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.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\GiftMessage\Block\Adminhtml\Sales\Order\View;
77

88
/**
99
* Adminhtml sales order view gift options block
1010
*
1111
* @api
12-
* @author Magento Core Team <core@magentocommerce.com>
1312
* @codeCoverageIgnore
1413
* @since 100.0.2
1514
*/

app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.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\GiftMessage\Block\Adminhtml\Sales\Order\View;
77

88
/**
99
* Gift message adminhtml sales order view items
1010
*
1111
* @api
12-
* @author Magento Core Team <core@magentocommerce.com>
1312
* @since 100.0.2
1413
*/
1514
class Items extends \Magento\Backend\Block\Template

app/code/Magento/GiftMessage/Block/Message/Inline.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\GiftMessage\Block\Message;
77

@@ -10,8 +10,6 @@
1010

1111
/**
1212
* Gift message inline edit form
13-
*
14-
* @author Magento Core Team <core@magentocommerce.com>
1513
*/
1614
class Inline extends \Magento\Framework\View\Element\Template
1715
{

app/code/Magento/GiftMessage/Model/Message.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 2013 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\GiftMessage\Model;
77

@@ -11,7 +11,6 @@
1111
* Gift Message model
1212
*
1313
* @api
14-
* @author Magento Core Team <core@magentocommerce.com>
1514
* @since 100.0.2
1615
*/
1716
class Message extends \Magento\Framework\Model\AbstractExtensibleModel implements

app/code/Magento/GiftMessage/Model/ResourceModel/Message.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\GiftMessage\Model\ResourceModel;
77

88
/**
99
* Gift Message resource model
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1412
{

0 commit comments

Comments
 (0)