Skip to content

Commit e5994fe

Browse files
glo24157glo24157
committed
Merge branch 'no-author/product-alert' into comm_prd_may_abhi_v2
2 parents 4b7bb57 + 22d7e88 commit e5994fe

File tree

30 files changed

+72
-139
lines changed

30 files changed

+72
-139
lines changed

‎app/code/Magento/Persistent/Block/Form/Remember.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\Persistent\Block\Form;
77

88
/**
99
* Remember Me block
1010
*
1111
* @api
12-
* @author Magento Core Team <core@magentocommerce.com>
1312
* @since 100.0.2
1413
*/
1514
class Remember extends \Magento\Framework\View\Element\Template
1615
{
1716
/**
18-
* Persistent data
19-
*
2017
* @var \Magento\Persistent\Helper\Data
2118
*/
2219
protected $_persistentData = null;

‎app/code/Magento/Persistent/Block/Header/Additional.php

Lines changed: 2 additions & 6 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\Persistent\Block\Header;
77

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

1212
/**
1313
* Remember Me block
14-
*
15-
* @author Magento Core Team <core@magentocommerce.com>
1614
*/
1715
class Additional extends \Magento\Framework\View\Element\Html\Link
1816
{
@@ -27,8 +25,6 @@ class Additional extends \Magento\Framework\View\Element\Html\Link
2725
protected $_persistentSessionHelper;
2826

2927
/**
30-
* Customer repository
31-
*
3228
* @var \Magento\Customer\Api\CustomerRepositoryInterface
3329
*/
3430
protected $customerRepository;

‎app/code/Magento/ProductAlert/Block/Email/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\ProductAlert\Block\Email;
77

88
/**
99
* ProductAlert email price changed grid
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
class Price extends \Magento\ProductAlert\Block\Email\AbstractEmail
1412
{

‎app/code/Magento/ProductAlert/Block/Email/Stock.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\ProductAlert\Block\Email;
77

88
/**
99
* ProductAlert email back in stock grid
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
class Stock extends \Magento\ProductAlert\Block\Email\AbstractEmail
1412
{

‎app/code/Magento/ProductAlert/Helper/Data.php

Lines changed: 6 additions & 6 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\ProductAlert\Helper;
77

@@ -10,8 +10,6 @@
1010
/**
1111
* ProductAlert data helper
1212
*
13-
* @author Magento Core Team <core@magentocommerce.com>
14-
*
1513
* @api
1614
* @since 100.0.2
1715
*/
@@ -25,8 +23,6 @@ class Data extends \Magento\Framework\Url\Helper\Data
2523
protected $_product = null;
2624

2725
/**
28-
* Core registry
29-
*
3026
* @var \Magento\Framework\Registry
3127
*/
3228
protected $_coreRegistry = null;
@@ -85,6 +81,8 @@ public function setProduct($product)
8581
}
8682

8783
/**
84+
* Get store
85+
*
8886
* @return Store
8987
*/
9088
public function getStore()
@@ -93,6 +91,8 @@ public function getStore()
9391
}
9492

9593
/**
94+
* Get Save Url
95+
*
9696
* @param string $type
9797
* @return string
9898
*/

‎app/code/Magento/ProductAlert/Model/Email.php

Lines changed: 5 additions & 14 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

@@ -35,7 +35,6 @@
3535
/**
3636
* ProductAlert Email processor
3737
*
38-
* @author Magento Core Team <core@magentocommerce.com>
3938
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
4039
*
4140
* @api
@@ -45,15 +44,13 @@
4544
*/
4645
class Email extends AbstractModel
4746
{
48-
const XML_PATH_EMAIL_PRICE_TEMPLATE = 'catalog/productalert/email_price_template';
47+
public const XML_PATH_EMAIL_PRICE_TEMPLATE = 'catalog/productalert/email_price_template';
4948

50-
const XML_PATH_EMAIL_STOCK_TEMPLATE = 'catalog/productalert/email_stock_template';
49+
public const XML_PATH_EMAIL_STOCK_TEMPLATE = 'catalog/productalert/email_stock_template';
5150

52-
const XML_PATH_EMAIL_IDENTITY = 'catalog/productalert/email_identity';
51+
public const XML_PATH_EMAIL_IDENTITY = 'catalog/productalert/email_identity';
5352

5453
/**
55-
* Type
56-
*
5754
* @var string
5855
*/
5956
protected $_type = 'price';
@@ -87,22 +84,16 @@ class Email extends AbstractModel
8784
protected $_stockProducts = [];
8885

8986
/**
90-
* Price block
91-
*
9287
* @var Price
9388
*/
9489
protected $_priceBlock;
9590

9691
/**
97-
* Stock block
98-
*
9992
* @var Stock
10093
*/
10194
protected $_stockBlock;
10295

10396
/**
104-
* Product alert data
105-
*
10697
* @var Data
10798
*/
10899
protected $_productAlertData = null;

‎app/code/Magento/ProductAlert/Model/ResourceModel/AbstractResource.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 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\ProductAlert\Model\ResourceModel;
77

88
use Magento\Framework\Model\AbstractModel;
99

1010
/**
1111
* Product alert for back in abstract resource model
12-
*
13-
* @author Magento Core Team <core@magentocommerce.com>
1412
*/
1513
abstract class AbstractResource extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1614
{

‎app/code/Magento/ProductAlert/Model/ResourceModel/Price/Collection.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 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\ProductAlert\Model\ResourceModel\Price;
77

88
/**
99
* Product alert for changed price collection
1010
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1211
* @api
1312
* @since 100.0.2
1413
*/

‎app/code/Magento/ProductAlert/Model/ResourceModel/Price/Customer/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\ProductAlert\Model\ResourceModel\Price\Customer;
77

88
/**
99
* ProductAlert Price Customer collection
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collection
1412
{

‎app/code/Magento/ProductAlert/Model/ResourceModel/Stock/Collection.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +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\ProductAlert\Model\ResourceModel\Stock;
77

88
/**
99
* Product alert for back in stock collection
1010
*
11-
* @author Magento Core Team <core@magentocommerce.com>
12-
*
1311
* @api
1412
* @since 100.0.2
1513
*/

0 commit comments

Comments
 (0)