@@ -20,8 +20,11 @@

                 </div>

                 <div class="tl_sorting tl_subpanel">

                     <strong>Filter:</strong>

-                    <select name="tl_sort" id="tl_sort" class="tl_select tl_chosen">

-                        <option value="title" selected="selected">Monat</option>

+                    <select name="tl_month" id="tl_month" class="tl_select tl_chosen">

+                        <option value=""{{ filter.month.selected is not defined or not filter.month.selected ? ' selected' : '' }}>Monat</option>

+                        {% for value, label in filter.month.options %}

+                            <option value="{{ value }}"{{ filter.month.selected is defined and filter.month.selected == value ? ' selected' : '' }}>{{ label }}</option>

+                        {% endfor %}

                     </select>

                 </div>

             </div>

@@ -68,6 +68,28 @@ class WeinanlieferungBookingsController extends AbstractController

         System::loadLanguageFile('default');

         // Filter

+        if (Input::post('FORM_SUBMIT') === 'tl_filters' && Input::post('filter_reset') === null)

+        {

+            $queryBuilder = $this->db->createQueryBuilder()

+                ->select('id')

+                ->from(WeinanlieferungSlotsModel::getTable());

+

+            if (!empty(Input::post('tl_month')) && is_numeric(Input::post('tl_month')))

+            {

+                $Month = new Date(Input::post('tl_month'));

+                $arrData['filter']['month']['selected'] = Input::post('tl_month');

+                $queryBuilder->andWhere('date BETWEEN :month_start AND :month_end')

+                    ->setParameter('month_start', $Month->monthBegin)

+                    ->setParameter('month_end', $Month->monthEnd);

+            } else {

+                $Today = new Date();

+                $queryBuilder->andWhere("time >= :today")

+                    ->setParameter('today',$Today->dayBegin);

+            }

+

+            $arrSlots = $queryBuilder->fetchFirstColumn();

+

+        }

         $arrMonthOptions = [];

         $MonthRequest = $this->db->executeQuery("SELECT s.date, DATE_FORMAT(FROM_UNIXTIME(s.date),'%m/%Y') as 'month_label' FROM tl_vr_wa_reservation r INNER JOIN tl_vr_wa_slot s ON s.id = r.pid GROUP BY month_label, s.date ORDER BY s.date ASC");

@@ -76,9 +98,28 @@ class WeinanlieferungBookingsController extends AbstractController

             $arrMonthOptions[$month['date']] = $month['month_label'];

         }

+        $arrData['filter']['month']['options'] = $arrMonthOptions;

+

         // Get bookings

-        if (($bookings = WeinanlieferungReservationModel::findAllFuture(['order' => "(SELECT tl_vr_wa_slot.time FROM tl_vr_wa_slot WHERE tl_vr_wa_slot.id=tl_vr_wa_reservation.pid) ASC"])) !== null)

+        if (isset($queryBuilder))

+        {

+            $arrColumns = null;

+            if (count($arrSlots))

+            {

+                $arrColumns[] = "pid IN (".implode(',',$arrSlots).")";

+            }

+            if (!$arrColumns)

+            {

+                $bookings = WeinanlieferungReservationModel::findAllFuture(['order' => "(SELECT tl_vr_wa_slot.time FROM tl_vr_wa_slot WHERE tl_vr_wa_slot.id=tl_vr_wa_reservation.pid) ASC"]);

+            } else {

+                $bookings = WeinanlieferungReservationModel::findBy($arrColumns,null,['order' => "(SELECT tl_vr_wa_slot.time FROM tl_vr_wa_slot WHERE tl_vr_wa_slot.id=tl_vr_wa_reservation.pid) ASC"]);

+            }

+

+        } else {

+            $bookings = WeinanlieferungReservationModel::findAllFuture(['order' => "(SELECT tl_vr_wa_slot.time FROM tl_vr_wa_slot WHERE tl_vr_wa_slot.id=tl_vr_wa_reservation.pid) ASC"]);

+        }

+        if ($bookings !== null)

         {

             /** @var WeinanlieferungReservationModel $booking */

             foreach ($bookings as $booking)