Allow filtering products by stock level

aimeos · Dec 7, 2020 · 04e688a · 04e688a
1 parent 6db677d
commit 04e688a
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/lib/mshoplib/src/MShop/Product/Manager/Standard.php b/lib/mshoplib/src/MShop/Product/Manager/Standard.php
@@ -444,7 +444,15 @@ public function getSearchAttributes( bool $withsub = true ) : array
 		 */
 		$path = 'mshop/product/manager/submanagers';
 
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub );
+		$list = $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub );
+
+		if( $withsub )
+		{
+			$manager = \Aimeos\MShop::create( $this->getContext(), 'stock' );
+			$list = array_merge( $list, $manager->getSearchAttributes( $withsub ) );
+		}
+
+		return $list;
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Stock/Manager/Standard.php b/lib/mshoplib/src/MShop/Stock/Manager/Standard.php
@@ -26,6 +26,7 @@ class Standard
 		'stock.id' => array(
 			'code' => 'stock.id',
 			'internalcode' => 'msto."id"',
+			'internaldeps' => ['LEFT JOIN "mshop_stock" AS msto ON mpro."id" = msto."prodid"'],
 			'label' => 'ID',
 			'type' => 'integer',
 			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,

diff --git a/lib/mshoplib/tests/MShop/Product/Manager/StandardTest.php b/lib/mshoplib/tests/MShop/Product/Manager/StandardTest.php
@@ -476,6 +476,32 @@ public function testSearchItemsLimit()
 	}
 
 
+	public function testSearchItemsStock()
+	{
+		$total = 0;
+		$search = $this->object->filter();
+		$search->setConditions( $search->compare( '>', 'stock.stocklevel', 0 ) );
+		$search->slice( 0, 1 );
+
+		$results = $this->object->search( $search, [], $total );
+		$this->assertEquals( 1, count( $results ) );
+		$this->assertEquals( 13, $total );
+	}
+
+
+	public function testSearchItemsStockUnlimited()
+	{
+		$total = 0;
+		$search = $this->object->filter();
+		$search->setConditions( $search->compare( '==', 'stock.stocklevel', null ) );
+		$search->slice( 0, 1 );
+
+		$results = $this->object->search( $search, [], $total );
+		$this->assertEquals( 1, count( $results ) );
+		$this->assertEquals( 7, $total );
+	}
+
+
 	public function testGetSubManager()
 	{
 		$this->assertInstanceOf( \Aimeos\MShop\Common\Manager\Iface::class, $this->object->getSubManager( 'lists' ) );