Skip to content

Commit b1676e3

Browse files
committed
Merge branch 'no-author/sales-04' into comm_prd_may_abhi_v2
2 parents c85958e + dd62e62 commit b1676e3

File tree

30 files changed

+58
-173
lines changed

30 files changed

+58
-173
lines changed

app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.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
namespace Magento\Sales\Model\ResourceModel\Order\Creditmemo;
77

@@ -12,28 +12,21 @@
1212
* Flat sales order creditmemo collection
1313
*
1414
* @api
15-
* @author Magento Core Team <[email protected]>
1615
* @since 100.0.2
1716
*/
1817
class Collection extends AbstractCollection implements CreditmemoSearchResultInterface
1918
{
2019
/**
21-
* Id field name
22-
*
2320
* @var string
2421
*/
2522
protected $_idFieldName = 'entity_id';
2623

2724
/**
28-
* Event prefix
29-
*
3025
* @var string
3126
*/
3227
protected $_eventPrefix = 'sales_order_creditmemo_collection';
3328

3429
/**
35-
* Event object
36-
*
3730
* @var string
3831
*/
3932
protected $_eventObject = 'order_creditmemo_collection';

app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
/**
2323
* Flat sales order creditmemo comment resource
24-
*
2524
*/
2625
class Comment extends EntityAbstract implements CreditmemoCommentResourceInterface
2726
{
@@ -33,8 +32,6 @@ class Comment extends EntityAbstract implements CreditmemoCommentResourceInterfa
3332
protected $_eventPrefix = 'sales_order_creditmemo_comment_resource';
3433

3534
/**
36-
* Class Validator
37-
*
3835
* @var Validator
3936
*/
4037
protected $validator;

app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment/Collection.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\Model\ResourceModel\Order\Creditmemo\Comment;
77

@@ -12,21 +12,16 @@
1212
* Flat sales order creditmemo comments collection
1313
*
1414
* @api
15-
* @author Magento Core Team <[email protected]>
1615
* @since 100.0.2
1716
*/
1817
class Collection extends AbstractCollection implements CreditmemoCommentSearchResultInterface
1918
{
2019
/**
21-
* Event prefix
22-
*
2320
* @var string
2421
*/
2522
protected $_eventPrefix = 'sales_order_creditmemo_comment_collection';
2623

2724
/**
28-
* Event object
29-
*
3025
* @var string
3126
*/
3227
protected $_eventObject = 'order_creditmemo_comment_collection';

app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php

Lines changed: 4 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\Sales\Model\ResourceModel\Order\Creditmemo;
77

@@ -10,14 +10,10 @@
1010

1111
/**
1212
* Flat sales order creditmemo item resource
13-
*
14-
* @author Magento Core Team <[email protected]>
1513
*/
1614
class Item extends SalesResource implements CreditmemoItemResourceInterface
1715
{
1816
/**
19-
* Event prefix
20-
*
2117
* @var string
2218
*/
2319
protected $_eventPrefix = 'sales_order_creditmemo_item_resource';
@@ -33,6 +29,8 @@ protected function _construct()
3329
}
3430

3531
/**
32+
* Before save
33+
*
3634
* @param \Magento\Framework\Model\AbstractModel $object
3735
* @return $this
3836
*/

app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item/Collection.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
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\Model\ResourceModel\Order\Creditmemo\Item;
77

88
/**
99
* Flat sales order creditmemo items collection
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection
1412
{
1513
/**
16-
* Event prefix
17-
*
1814
* @var string
1915
*/
2016
protected $_eventPrefix = 'sales_order_creditmemo_item_collection';
2117

2218
/**
23-
* Event object
24-
*
2519
* @var string
2620
*/
2721
protected $_eventObject = 'order_creditmemo_item_collection';

app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Child.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\Model\ResourceModel\Order\Invoice\Attribute\Backend;
77

88
/**
99
* Invoice backend model for child attribute
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Child extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
1412
{

app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Item.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\Model\ResourceModel\Order\Invoice\Attribute\Backend;
77

88
/**
99
* Invoice backend model for item attribute
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Item extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
1412
{

app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Order.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\Model\ResourceModel\Order\Invoice\Attribute\Backend;
77

88
/**
99
* Invoice backend model for order attribute
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Order extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
1412
{

app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Collection.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
namespace Magento\Sales\Model\ResourceModel\Order\Invoice;
77

@@ -12,28 +12,21 @@
1212
* Flat sales order invoice collection
1313
*
1414
* @api
15-
* @author Magento Core Team <[email protected]>
1615
* @since 100.0.2
1716
*/
1817
class Collection extends AbstractCollection implements InvoiceSearchResultInterface
1918
{
2019
/**
21-
* Id field name
22-
*
2320
* @var string
2421
*/
2522
protected $_idFieldName = 'entity_id';
2623

2724
/**
28-
* Event prefix
29-
*
3025
* @var string
3126
*/
3227
protected $_eventPrefix = 'sales_order_invoice_collection';
3328

3429
/**
35-
* Event object
36-
*
3730
* @var string
3831
*/
3932
protected $_eventObject = 'order_invoice_collection';

app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
/**
2323
* Flat sales order invoice comment resource
24-
*
2524
*/
2625
class Comment extends EntityAbstract implements InvoiceCommentResourceInterface
2726
{

0 commit comments

Comments
 (0)