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
{

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

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

app/code/Magento/GiftMessage/Model/Save.php

Lines changed: 9 additions & 6 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 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\GiftMessage\Model;
77

88
/**
99
* Adminhtml giftmessage save model
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
10+
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
1211
*/
1312
class Save extends \Magento\Framework\DataObject
1413
{
@@ -18,8 +17,6 @@ class Save extends \Magento\Framework\DataObject
1817
protected $_saved = false;
1918

2019
/**
21-
* Gift message message
22-
*
2320
* @var \Magento\GiftMessage\Helper\Message|null
2421
*/
2522
protected $_giftMessageMessage = null;
@@ -79,6 +76,8 @@ public function saveAllInQuote()
7976
}
8077

8178
/**
79+
* Get Saved
80+
*
8281
* @return bool
8382
* @SuppressWarnings(PHPMD.BooleanGetMethodName)
8483
* @codeCoverageIgnore
@@ -89,6 +88,8 @@ public function getSaved()
8988
}
9089

9190
/**
91+
* Save all order
92+
*
9293
* @return $this
9394
*/
9495
public function saveAllInOrder()
@@ -301,6 +302,8 @@ public function importAllowQuoteItemsFromProducts($products)
301302
}
302303

303304
/**
305+
* Import allow quote item
306+
*
304307
* @param mixed $items
305308
* @return $this
306309
*/

app/code/Magento/GiftMessage/Observer/MultishippingEventCreateOrdersObserver.php

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

88
use Magento\Framework\Event\ObserverInterface;
99

1010
/**
1111
* Gift Message Observer Model
12-
*
13-
* @author Magento Core Team <core@magentocommerce.com>
1412
*/
1513
class MultishippingEventCreateOrdersObserver implements ObserverInterface
1614
{

app/code/Magento/GiftMessage/Observer/SalesEventOrderItemToQuoteItemObserver.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\GiftMessage\Observer;
77

88
use Magento\Framework\Event\ObserverInterface;
99

1010
/**
1111
* Gift Message Observer Model
12-
*
13-
* @author Magento Core Team <core@magentocommerce.com>
1412
*/
1513
class SalesEventOrderItemToQuoteItemObserver implements ObserverInterface
1614
{
1715
/**
18-
* Gift message message
19-
*
2016
* @var \Magento\GiftMessage\Helper\Message|null
2117
*/
2218
protected $_giftMessageMessage = null;

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

88
use Magento\Framework\Event\ObserverInterface;
99

1010
/**
1111
* Gift Message Observer Model
12-
*
13-
* @author Magento Core Team <core@magentocommerce.com>
1412
*/
1513
class SalesEventOrderToQuoteObserver implements ObserverInterface
1614
{
1715
/**
18-
* Gift message message
19-
*
2016
* @var \Magento\GiftMessage\Helper\Message|null
2117
*/
2218
protected $_giftMessageMessage = null;

app/code/Magento/GiftMessage/Observer/SalesEventQuoteSubmitBeforeObserver.php

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

88
use Magento\Framework\Event\ObserverInterface;
99

1010
/**
1111
* Gift Message Observer Model
12-
*
13-
* @author Magento Core Team <core@magentocommerce.com>
1412
*/
1513
class SalesEventQuoteSubmitBeforeObserver implements ObserverInterface
1614
{

app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
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
/**
88
* Adminhtml account controller
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\MediaStorage\Controller\Adminhtml\System\Config\System;
1311

@@ -16,7 +14,7 @@ abstract class Storage extends \Magento\Backend\App\Action
1614
/**
1715
* Authorization level of a basic admin session
1816
*/
19-
const ADMIN_RESOURCE = 'Magento_Backend::system';
17+
public const ADMIN_RESOURCE = 'Magento_Backend::system';
2018

2119
/**
2220
* Return file storage singleton

0 commit comments

Comments
 (0)