@@ -98,6 +98,12 @@ class WeinanlieferungSlotsModel extends Model

             $arrOptions['order'] = "$t.time ASC";

         }

+        if (isset($arrOptions['column']))

+        {

+            $arrColumns = array_merge($arrColumns,$arrOptions['column']);

+            $arrOptions = array_diff_key($arrOptions,['column'=>true]);

+        }

+

         return static::findBy($arrColumns,null,$arrOptions);

     }

@@ -35,8 +35,9 @@ class WeinanlieferungSlotsModel extends Model

         // Skip unsaved elements (see #2708)

         $arrColumns[] = "$t.tstamp!=0";

+        $arrColumns[] = "$t.published='1'";

-        $arrColumns[] = "$t.buchbar='1' AND $t.buchbar_bis>$time";

+        $arrColumns[] = "($t.buchbar_ab<=$time OR $t.buchbar_ab = 0 OR $t.buchbar_ab IS NULL) AND $t.buchbar_bis>$time";

         if (!isset($arrOptions['order']))

         {

@@ -54,8 +55,9 @@ class WeinanlieferungSlotsModel extends Model

         // Skip unsaved elements (see #2708)

         $arrColumns[] = "$t.tstamp!=0";

+        $arrColumns[] = "$t.published='1'";

-        $arrColumns[] = "$t.buchbar='1' AND $t.buchbar_bis>$time";

+        $arrColumns[] = "($t.buchbar_ab<=$time OR $t.buchbar_ab = 0 OR $t.buchbar_ab IS NULL) AND $t.buchbar_bis>$time";

         if (!isset($arrOptions['order']))

         {

@@ -87,8 +89,9 @@ class WeinanlieferungSlotsModel extends Model

         // Skip unsaved elements (see #2708)

         $arrColumns[] = "$t.tstamp!=0";

+        $arrColumns[] = "$t.published='1'";

-        $arrColumns[] = "$t.buchbar='1' AND $t.buchbar_bis>$time";

+        $arrColumns[] = "($t.buchbar_ab<=$time OR $t.buchbar_ab = 0 OR $t.buchbar_ab IS NULL) AND $t.buchbar_bis>$time";

         if (!isset($arrOptions['order']))

         {

@@ -108,7 +111,7 @@ class WeinanlieferungSlotsModel extends Model

             $arrOptions['order'] = "$t.time ASC";

         }

-        return static::findBy(array("$t.time >= ?","$t.tstamp!=0","$t.buchbar='1' AND $t.buchbar_bis > ?"), [$time,$time], $arrOptions);

+        return static::findBy(array("$t.time >= ?","$t.tstamp!=0","$t.published='1' AND ($t.buchbar_ab<=$time OR $t.buchbar_ab = 0 OR $t.buchbar_ab IS NULL) AND $t.buchbar_bis > ?"), [$time,$time,$time], $arrOptions);

     }

     public function getAvailableBehaelter(?int $intOffset=null)

@@ -103,6 +103,11 @@ class WeinanlieferungSlotsModel extends Model

         $t = static::$strTable;

         $time = Date::floorToMinute();

+        if (!isset($arrOptions['order']))

+        {

+            $arrOptions['order'] = "$t.time ASC";

+        }

+

         return static::findBy(array("$t.time >= ?","$t.tstamp!=0","$t.buchbar='1' AND $t.buchbar_bis > ?"), [$time,$time], $arrOptions);

     }

@@ -14,6 +14,7 @@ namespace vonRotenberg\WeinanlieferungBundle\Model;

 use Contao\Controller;

 use Contao\Database;

+use Contao\Date;

 use Contao\Model;

 use Contao\Model\Registry;

 use Doctrine\DBAL\Connection;

@@ -97,6 +98,14 @@ class WeinanlieferungSlotsModel extends Model

         return static::findBy($arrColumns,null,$arrOptions);

     }

+    public static function findAllFuturePublished(array $arrOptions=array())

+    {

+        $t = static::$strTable;

+        $time = Date::floorToMinute();

+

+        return static::findBy(array("$t.time >= ?","$t.tstamp!=0","$t.buchbar='1' AND $t.buchbar_bis > ?"), [$time,$time], $arrOptions);

+    }

+

     public function getAvailableBehaelter(?int $intOffset=null)

     {

         /** @var Connection $db */

@@ -97,7 +97,7 @@ class WeinanlieferungSlotsModel extends Model

         return static::findBy($arrColumns,null,$arrOptions);

     }

-    public function getAvailableBehaelter()

+    public function getAvailableBehaelter(?int $intOffset=null)

     {

         /** @var Connection $db */

         $db = Controller::getContainer()->get('database_connection');

@@ -112,6 +112,11 @@ class WeinanlieferungSlotsModel extends Model

             $intReserved = 0;

         }

+        if ($intOffset > 0)

+        {

+            $intReserved += $intOffset;

+        }

+

         return (int) $this->behaelter - $intReserved;

     }

 }

@@ -12,9 +12,11 @@ declare(strict_types=1);

 namespace vonRotenberg\WeinanlieferungBundle\Model;

+use Contao\Controller;

 use Contao\Database;

 use Contao\Model;

 use Contao\Model\Registry;

+use Doctrine\DBAL\Connection;

 class WeinanlieferungSlotsModel extends Model

 {

@@ -40,7 +42,7 @@ class WeinanlieferungSlotsModel extends Model

             $arrOptions['order'] = "$t.time ASC";

         }

-        return static::findBy($arrColumns, $intId, $arrOptions);

+        return static::findOneBy($arrColumns, $intId, $arrOptions);

     }

     public static function findPublishedByPid($intPid, array $arrOptions=array())

@@ -94,4 +96,22 @@ class WeinanlieferungSlotsModel extends Model

         return static::findBy($arrColumns,null,$arrOptions);

     }

+

+    public function getAvailableBehaelter()

+    {

+        /** @var Connection $db */

+        $db = Controller::getContainer()->get('database_connection');

+

+        $ReservedBehaelter = $db->prepare("SELECT SUM(behaelter) FROM tl_vr_wa_reservation WHERE pid = ?")

+            ->executeQuery([$this->id]);

+

+        $intReserved = $ReservedBehaelter->fetchOne();

+

+        if ($intReserved === null)

+        {

+            $intReserved = 0;

+        }

+

+        return (int) $this->behaelter - $intReserved;

+    }

 }

@@ -24,6 +24,25 @@ class WeinanlieferungSlotsModel extends Model

      */

     protected static $strTable = 'tl_vr_wa_slot';

+    public static function findPublishedById($intId, array $arrOptions=array())

+    {

+        $time = time();

+        $t = static::$strTable;

+        $arrColumns = array("$t.id=?");

+

+        // Skip unsaved elements (see #2708)

+        $arrColumns[] = "$t.tstamp!=0";

+

+        $arrColumns[] = "$t.buchbar='1' AND $t.buchbar_bis>$time";

+

+        if (!isset($arrOptions['order']))

+        {

+            $arrOptions['order'] = "$t.time ASC";

+        }

+

+        return static::findBy($arrColumns, $intId, $arrOptions);

+    }

+

     public static function findPublishedByPid($intPid, array $arrOptions=array())

     {

         $time = time();

new file mode 100644

@@ -0,0 +1,78 @@

+<?php

+

+declare(strict_types=1);

+

+/*

+ * This file is part of contao-weinanlieferung-bundle.

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+namespace vonRotenberg\WeinanlieferungBundle\Model;

+

+use Contao\Database;

+use Contao\Model;

+use Contao\Model\Registry;

+

+class WeinanlieferungSlotsModel extends Model

+{

+    /**

+     * Table name

+     * @var string

+     */

+    protected static $strTable = 'tl_vr_wa_slot';

+

+    public static function findPublishedByPid($intPid, array $arrOptions=array())

+    {

+        $time = time();

+        $t = static::$strTable;

+        $arrColumns = array("$t.pid=?");

+

+        // Skip unsaved elements (see #2708)

+        $arrColumns[] = "$t.tstamp!=0";

+

+        $arrColumns[] = "$t.buchbar='1' AND $t.buchbar_bis>$time";

+

+        if (!isset($arrOptions['order']))

+        {

+            $arrOptions['order'] = "$t.time ASC";

+        }

+

+        return static::findBy($arrColumns, $intPid, $arrOptions);

+    }

+

+    public static function findMultiplePublishedByPids(array $arrPids, array $arrOptions=array())

+    {

+        if (empty($arrPids) || !\is_array($arrPids))

+        {

+            return null;

+        }

+

+        $arrPids = array_filter($arrPids, function($var) {

+            return is_numeric($var);

+        });

+

+        if (empty($arrPids))

+        {

+            return null;

+        }

+

+        $time = time();

+        $t = static::$strTable;

+        $arrColumns = array("$t.pid IN (".implode(',',$arrPids).")");

+

+        // Skip unsaved elements (see #2708)

+        $arrColumns[] = "$t.tstamp!=0";

+

+        $arrColumns[] = "$t.buchbar='1' AND $t.buchbar_bis>$time";

+

+        if (!isset($arrOptions['order']))

+        {

+            $arrOptions['order'] = "$t.time ASC";

+        }

+

+        return static::findBy($arrColumns,null,$arrOptions);

+    }

+}