Always apply rules to related products too

Author: aimeos

src/MShop/Rule/Manager/Base.php

@@ -49,6 +49,10 @@ public function apply( $items, string $type = 'catalog' )
 		{
 			foreach( $this->rules[$type] as $rule )
 			{
+				// Selection products are handled by rule providers
+				$articleIds = $item->getType() === 'select' ? $item->getRefItems( 'product', null, 'default' )->keys() : [];
+				$this->apply( $item->getRefItems( 'product' )->except( $articleIds ), $type );
+
 				if( $rule->apply( $item ) ) {
 					break;
 				}

src/MShop/Rule/Provider/Catalog/Percent.php

@@ -67,7 +67,16 @@ public function getConfigBE() : array
 	 */
 	public function apply( \Aimeos\MShop\Product\Item\Iface $product ) : bool
 	{
-		$this->update( $product, (float) $this->getConfigValue( 'percent' ) );
+		$percent = (float) $this->getConfigValue( 'percent', 0 );
+
+		if( $product->getType() === 'select' )
+		{
+			foreach( $product->getRefItems( 'product', null, 'default' ) as $subproduct ) {
+				$this->update( $subproduct, $percent );
+			}
+		}
+
+		$this->update( $product, $percent );
 		return $this->isLast();
 	}
 
@@ -86,21 +95,5 @@ protected function update( \Aimeos\MShop\Product\Item\Iface $product, float $per
 			$diff = $value * $percent / 100;
 			$price->setValue( $value + $diff )->setRebate( $diff < 0 ? abs( $diff ) : 0 );
 		}
-
-		$varticles = map();
-		$subproducts = $product->getRefItems( 'product' );
-
-		if( $product->getType() === 'select' )
-		{
-			$varticles = $product->getRefItems( 'product', null, 'default' );
-
-			foreach( $varticles as $subproduct ) {
-				$this->update( $subproduct, $percent );
-			}
-		}
-
-		foreach( $subproducts->except( $varticles->keys() ) as $subproduct ) {
-			$this->object()->apply( $subproduct );
-		}
 	}
 }

src/MShop/Rule/Provider/Catalog/Taxrate.php

@@ -67,7 +67,13 @@ public function getConfigBE() : array
 	 */
 	public function apply( \Aimeos\MShop\Product\Item\Iface $product ) : bool
 	{
-		$product->getRefItems( 'price' )->setTaxrate( $this->getConfigValue( 'taxrate' ) );
+		$taxrate = $this->getConfigValue( 'taxrate' );
+
+		foreach( $product->getRefItems( 'product', null, 'default' ) as $subproduct ) {
+			$subproduct->getRefItems( 'price' )->setTaxrate( $taxrate );
+		}
+
+		$product->getRefItems( 'price' )->setTaxrate( $taxrate );
 		return $this->isLast();
 	}
 }

tests/MShop/Rule/Provider/Catalog/PercentTest.php

@@ -67,25 +67,6 @@ public function testApply()
 	}
 
 
-	public function testApplyRebate()
-	{
-		$this->item->setConfig( ['percent' => '-10'] );
-		$product = \Aimeos\MShop::create( $this->context, 'product' )->find( 'CNE', ['price', 'product'] );
-		$price = $product->getRefItems( 'price' )->first();
-
-		$this->assertFalse( $this->object->apply( $product ) );
-		$this->assertEquals( '16.20', $price?->getValue() );
-		$this->assertEquals( '1.80', $price?->getRebate() );
-
-		foreach( $product->getRefItems( 'product' ) as $subproduct )
-		{
-			foreach( $subproduct->getRefItems( 'price' ) as $price ) {
-				$this->assertGreaterThan( 0, $price->getRebate() );
-			}
-		}
-	}
-
-
 	public function testApplySelection()
 	{
 		$this->item->setConfig( ['percent' => '-10'] );