diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php index 80929d886673f..c1e030e37f3bd 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php @@ -1,7 +1,7 @@ * @since 100.0.2 */ class Collection extends AbstractCollection implements CreditmemoSearchResultInterface { /** - * Id field name - * * @var string */ protected $_idFieldName = 'entity_id'; /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_creditmemo_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php index 6cb33157ae0ee..a44a6cfd42d0e 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php @@ -21,7 +21,6 @@ /** * Flat sales order creditmemo comment resource - * */ class Comment extends EntityAbstract implements CreditmemoCommentResourceInterface { @@ -33,8 +32,6 @@ class Comment extends EntityAbstract implements CreditmemoCommentResourceInterfa protected $_eventPrefix = 'sales_order_creditmemo_comment_resource'; /** - * Class Validator - * * @var Validator */ protected $validator; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment/Collection.php index 76549adef0e36..37081f16e5e4c 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment/Collection.php @@ -1,7 +1,7 @@ * @since 100.0.2 */ class Collection extends AbstractCollection implements CreditmemoCommentSearchResultInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_comment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_creditmemo_comment_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php index d7b23cc49f371..f85b150bbff8b 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php @@ -1,7 +1,7 @@ */ class Item extends SalesResource implements CreditmemoItemResourceInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_item_resource'; @@ -33,6 +29,8 @@ protected function _construct() } /** + * Before save + * * @param \Magento\Framework\Model\AbstractModel $object * @return $this */ diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item/Collection.php index 081e990647fe9..0e37f0790146e 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item/Collection.php @@ -1,27 +1,21 @@ */ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_item_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_creditmemo_item_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Child.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Child.php index 69df9d24e66e0..1a17fabc2f823 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Child.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Child.php @@ -1,14 +1,12 @@ */ class Child extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Item.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Item.php index 1205ae98588f5..da5af071e7da7 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Item.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Item.php @@ -1,14 +1,12 @@ */ class Item extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Order.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Order.php index 84e15dc104947..49c2fefb2e30b 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Order.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Order.php @@ -1,14 +1,12 @@ */ class Order extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Collection.php index 3a5391e0e5cb5..d68157e5b198a 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Collection.php @@ -1,7 +1,7 @@ * @since 100.0.2 */ class Collection extends AbstractCollection implements InvoiceSearchResultInterface { /** - * Id field name - * * @var string */ protected $_idFieldName = 'entity_id'; /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_invoice_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php index 7a7ba9b0f2f40..9c709c36d41de 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php @@ -21,7 +21,6 @@ /** * Flat sales order invoice comment resource - * */ class Comment extends EntityAbstract implements InvoiceCommentResourceInterface { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment/Collection.php index 54dbf613e39e5..7f4d5cea6b2f5 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment/Collection.php @@ -1,7 +1,7 @@ * @since 100.0.2 */ class Collection extends AbstractCollection implements InvoiceCommentSearchResultInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_comment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_invoice_comment_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php index d5295d33d2aba..8444d7eb14c26 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php @@ -1,7 +1,7 @@ */ class Item extends SalesResource implements InvoiceItemResourceInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_item_resource'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item/Collection.php index bc14a57808a35..429f4c443e5ad 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item/Collection.php @@ -1,7 +1,7 @@ * @since 100.0.2 */ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_item_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_invoice_item_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php index 10191ba42ee76..fd5e6cdb400c9 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php @@ -1,7 +1,7 @@ * @since 100.0.2 */ class Collection extends AbstractCollection implements \Magento\Sales\Api\Data\OrderItemSearchResultInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_item_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_item_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php index c11823cff665f..916d359105b94 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php @@ -10,7 +10,6 @@ /** * Sales transaction resource model - * */ class Transaction extends EntityAbstract implements TransactionResourceInterface { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction/Collection.php index 5647e1a32db3e..de7665f6bca0d 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction/Collection.php @@ -1,7 +1,7 @@ */ class Collection extends AbstractCollection implements TransactionSearchResultInterface { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php index b1d2deb248ba1..5a3751a1e0f5b 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php @@ -1,7 +1,7 @@ */ class OrderStatus { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php index d2d45b62250ed..81a7ebec2ef21 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php @@ -1,7 +1,7 @@ */ class Shipment extends SalesResource implements ShipmentResourceInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_resource'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Attribute/Backend/Child.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Attribute/Backend/Child.php index b06d484c5c5ad..ec3f9ac4f71f3 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Attribute/Backend/Child.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Attribute/Backend/Child.php @@ -1,14 +1,12 @@ */ class Child extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php index 8758fc1da92d8..12f80883f2199 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php @@ -1,7 +1,7 @@ * @since 100.0.2 */ class Collection extends AbstractCollection implements ShipmentSearchResultInterface @@ -23,15 +22,11 @@ class Collection extends AbstractCollection implements ShipmentSearchResultInter protected $_idFieldName = 'entity_id'; /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php index 21901c903a84f..9e6aaded1c322 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php @@ -21,7 +21,6 @@ /** * Flat sales order shipment comment resource - * */ class Comment extends EntityAbstract implements ShipmentCommentResourceInterface { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment/Collection.php index 91bc59610262c..ce7be3a5a351d 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment/Collection.php @@ -1,7 +1,7 @@ * @since 100.0.2 */ class Collection extends AbstractCollection implements ShipmentCommentSearchResultInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_comment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_comment_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php index e5e4292d897b5..8c8a80f649cdf 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php @@ -1,7 +1,7 @@ */ class Item extends SalesResource implements ShipmentItemResourceInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_item_resource'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item/Collection.php index a868a10384672..78e7203779fe5 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item/Collection.php @@ -1,27 +1,21 @@ */ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_item_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_item_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php index 4879df7d5f44a..d29f8bc2bffc5 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php @@ -1,7 +1,7 @@ */ class Track extends SalesResource implements ShipmentTrackResourceInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_track_resource'; /** - * Validator - * * @var \Magento\Sales\Model\Order\Shipment\Track\Validator */ protected $validator; /** * @param \Magento\Framework\Model\ResourceModel\Db\Context $context - * @param \Magento\Sales\Model\ResourceModel\Attribute $attribute - * @param \Magento\SalesSequence\Model\Manager $sequenceManager * @param Snapshot $entitySnapshot * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite + * @param \Magento\Sales\Model\ResourceModel\Attribute $attribute + * @param \Magento\SalesSequence\Model\Manager $sequenceManager * @param \Magento\Sales\Model\Order\Shipment\Track\Validator $validator * @param string $connectionName */ diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track/Collection.php index d5ca4c6879966..cc19dc80059be 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track/Collection.php @@ -1,7 +1,7 @@ * @since 100.0.2 */ class Collection extends AbstractCollection implements ShipmentTrackSearchResultInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_track_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_track_collection'; /** - * Order field - * * @var string */ protected $_orderField = 'order_id'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php index 9e37ee815d448..31ad1b3577a1f 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php @@ -1,7 +1,7 @@ */ class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/Collection.php index 476a8282e73e8..c3c88d194acac 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/Collection.php @@ -1,14 +1,12 @@ */ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php index 95fa9e11ce509..5e702cb358b4f 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php @@ -1,7 +1,7 @@ */ class History extends EntityAbstract implements OrderStatusHistoryResourceInterface { @@ -24,10 +22,10 @@ class History extends EntityAbstract implements OrderStatusHistoryResourceInterf /** * @param \Magento\Framework\Model\ResourceModel\Db\Context $context - * @param \Magento\Sales\Model\ResourceModel\Attribute $attribute - * @param \Magento\SalesSequence\Model\Manager $sequenceManager * @param Snapshot $entitySnapshot * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite + * @param \Magento\Sales\Model\ResourceModel\Attribute $attribute + * @param \Magento\SalesSequence\Model\Manager $sequenceManager * @param Validator $validator * @param string $connectionName */ @@ -52,8 +50,6 @@ public function __construct( } /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_status_history_resource'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History/Collection.php index aff98dd3f47c3..ac63d1b15065f 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History/Collection.php @@ -1,7 +1,7 @@ */ class Collection extends AbstractCollection implements OrderStatusHistorySearchResultInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_status_history_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_status_history_collection';