Skip to content

Commit e33476f

Browse files
MAGETWO-91697: [Magento Cloud] "Tier Pricing" of Products changes to "Price" (without discount) after Updated Items and Quantities
- Fix static test
1 parent 40d5668 commit e33476f

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,10 @@ public function addPriceFilter($product, $searchMin, $useRegularPrice = false)
261261
}
262262

263263
/**
264+
* Get Catalog Rule Processor.
265+
*
264266
* @return \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
267+
*
265268
* @deprecated 100.2.0
266269
*/
267270
private function getCatalogRuleProcessor()

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,7 @@ public function getFlatState()
455455
}
456456

457457
/**
458-
* Retrieve is flat enabled flag
459-
* Return always false if magento run admin
458+
* Retrieve is flat enabled. Return always false if magento run admin.
460459
*
461460
* @return bool
462461
*/
@@ -487,8 +486,7 @@ protected function _construct()
487486
}
488487

489488
/**
490-
* Standard resource collection initialization
491-
* Needed for child classes
489+
* Standard resource collection initialization. Needed for child classes.
492490
*
493491
* @param string $model
494492
* @param string $entityModel
@@ -527,8 +525,7 @@ protected function _prepareStaticFields()
527525
}
528526

529527
/**
530-
* Retrieve collection empty item
531-
* Redeclared for specifying id field name without getting resource model inside model
528+
* Get collection empty item. Redeclared for specifying id field name without getting resource model inside model.
532529
*
533530
* @return \Magento\Framework\DataObject
534531
*/
@@ -614,8 +611,7 @@ public function _loadAttributes($printQuery = false, $logQuery = false)
614611
}
615612

616613
/**
617-
* Add attribute to entities in collection
618-
* If $attribute=='*' select all attributes
614+
* Add attribute to entities in collection. If $attribute=='*' select all attributes.
619615
*
620616
* @param array|string|integer|\Magento\Framework\App\Config\Element $attribute
621617
* @param bool|string $joinType
@@ -651,8 +647,7 @@ public function addAttributeToSelect($attribute, $joinType = false)
651647
}
652648

653649
/**
654-
* Processing collection items after loading
655-
* Adding url rewrites, minimal prices, final prices, tax percents
650+
* Processing collection items after loading. Adding url rewrites, minimal prices, final prices, tax percents.
656651
*
657652
* @return $this
658653
*/
@@ -755,8 +750,7 @@ public function addIdFilter($productId, $exclude = false)
755750
}
756751

757752
/**
758-
* Adding product website names to result collection
759-
* Add for each product websites information
753+
* Adding product website names to result collection. Add for each product websites information.
760754
*
761755
* @return $this
762756
*/
@@ -767,7 +761,7 @@ public function addWebsiteNamesToResult()
767761
}
768762

769763
/**
770-
* {@inheritdoc}
764+
* @inheritdoc
771765
*/
772766
public function load($printQuery = false, $logQuery = false)
773767
{
@@ -824,8 +818,7 @@ protected function doAddWebsiteNamesToResult()
824818
}
825819

826820
/**
827-
* Add store availability filter. Include availability product
828-
* for store website
821+
* Add store availability filter. Include availability product for store website.
829822
*
830823
* @param null|string|bool|int|Store $store
831824
* @return $this
@@ -1113,7 +1106,7 @@ public function getSelectCountSql()
11131106
/**
11141107
* Get SQL for get record count
11151108
*
1116-
* @param null $select
1109+
* @param \Magento\Framework\DB\Select $select
11171110
* @param bool $resetLeftJoins
11181111
* @return \Magento\Framework\DB\Select
11191112
*/
@@ -1355,8 +1348,7 @@ public function joinUrlRewrite()
13551348
}
13561349

13571350
/**
1358-
* Add URL rewrites data to product
1359-
* If collection loadded - run processing else set flag
1351+
* Add URL rewrites data to product. If collection loadded - run processing else set flag.
13601352
*
13611353
* @param int|string $categoryId
13621354
* @return $this
@@ -1579,7 +1571,8 @@ public function addAttributeToFilter($attribute, $condition = null, $joinType =
15791571
}
15801572

15811573
/**
1582-
* {@inheritdoc}
1574+
* @inheritdoc
1575+
*
15831576
* @since 101.0.0
15841577
*/
15851578
protected function getEntityPkName(\Magento\Eav\Model\Entity\AbstractEntity $entity)
@@ -2317,7 +2310,10 @@ private function getGalleryReadHandler()
23172310
}
23182311

23192312
/**
2313+
* Retrieve Media gallery resource.
2314+
*
23202315
* @deprecated 101.0.1
2316+
*
23212317
* @return \Magento\Catalog\Model\ResourceModel\Product\Gallery
23222318
*/
23232319
private function getMediaGalleryResource()

0 commit comments

Comments
 (0)