@@ -167,7 +167,7 @@ class SlotAjaxController extends AbstractController

             $arrLage = array_combine($Lage->fetchEach('id'),$Lage->fetchEach('title'));

         }

-        $intAvailableBehaelter = $Slot->getAvailableBehaelter();

+        $intAvailableBehaelter = max(0,$Slot->getAvailableBehaelter());

         $arrData = [

             'modal' => $blnModal,

@@ -237,7 +237,7 @@ class SlotAjaxController extends AbstractController

             $arrLage = $Lage->fetchEach('title');

         }

-        $intAvailableBehaelter = $Slot->getAvailableBehaelter();

+        $intAvailableBehaelter = max(0,$Slot->getAvailableBehaelter());

         $arrData = [

             'modal' => $blnModal,

@@ -366,7 +366,7 @@ class SlotAjaxController extends AbstractController

             $arrLagenBooked = explode(',', $Booking->lage);

         }

-        $intAvailableBehaelter = $Slot->getAvailableBehaelter();

+        $intAvailableBehaelter = max(0,$Slot->getAvailableBehaelter());

         $arrData = array_merge($arrData,[

             'modal' => $blnModal,

@@ -173,7 +173,7 @@ class SlotAjaxController extends AbstractController

             'modal' => $blnModal,

             'id'       => $Slot->id,

             'slot'     => array_merge($Slot->row(),[

-                'anmerkungen' => $insertTagService->replace($Slot->anmerkungen),

+                'anmerkungen' => $insertTagService->replace($Slot->anmerkungen ?? ''),

                 'sorte' => $arrSorten,

                 'behaelterAvailable' => $intAvailableBehaelter

             ]),

@@ -243,7 +243,7 @@ class SlotAjaxController extends AbstractController

             'modal' => $blnModal,

             'id'       => $Slot->id,

             'slot'     => array_merge($Slot->row(),[

-                'anmerkungen' => $insertTagService->replace($Slot->anmerkungen),

+                'anmerkungen' => $insertTagService->replace($Slot->anmerkungen ?? ''),

                 'sorte' => $arrSorten,

                 'behaelterAvailable' => $intAvailableBehaelter

             ]),

@@ -372,7 +372,7 @@ class SlotAjaxController extends AbstractController

             'modal' => $blnModal,

             'id'       => $Booking->id,

             'slot'     => array_merge($Slot->row(),[

-                'anmerkungen' => $insertTagService->replace($Slot->anmerkungen),

+                'anmerkungen' => $insertTagService->replace($Slot->anmerkungen ?? ''),

                 'sorte' => $arrSortenAvailable,

                 'behaelterAvailable' => $intAvailableBehaelter,

             ]),

@@ -449,7 +449,7 @@ class SlotAjaxController extends AbstractController

         if (count($arrError))

         {

-            return $this->renderDetails(false,'<div class="toast toast--danger mx-0">Bitte geben Sie alle Pflichtangaben (mit * marierte Felder) an</div>');

+            return $this->renderDetails(false,'<div class="toast toast--danger mx-0">Bitte geben Sie alle Pflichtangaben (mit * markierte Felder) an</div>');

         }

         $arrSorten = [];

@@ -548,7 +548,7 @@ class SlotAjaxController extends AbstractController

         if (count($arrError))

         {

-            return $this->renderBooking(false,'<div class="toast toast--danger mx-0">Bitte geben Sie alle Pflichtangaben (mit * marierte Felder) an</div>');

+            return $this->renderBooking(false,'<div class="toast toast--danger mx-0">Bitte geben Sie alle Pflichtangaben (mit * markierte Felder) an</div>');

         }

         $arrSorten = [];

@@ -439,7 +439,7 @@ class SlotAjaxController extends AbstractController

             }

         }

         $arrError = [];

-        foreach (['behaelter','sorten','ernteart'] as $field)

+        foreach (['behaelter','sorten','ernteart','lage'] as $field)

         {

             if (empty(Input::post($field)))

             {

@@ -538,7 +538,7 @@ class SlotAjaxController extends AbstractController

             }

         }

         $arrError = [];

-        foreach (['behaelter','sorten','ernteart'] as $field)

+        foreach (['behaelter','sorten','ernteart','lage'] as $field)

         {

             if (empty(Input::post($field)))

             {

@@ -100,6 +100,8 @@ class SlotAjaxController extends AbstractController

     protected function renderDetails(bool $blnModal=true,string $error=null)

     {

+        $insertTagService = Controller::getContainer()->get('contao.insert_tag.parser');

+

         if (empty($_REQUEST['id']))

         {

             return new Response('Required parameter missing',412);

@@ -171,6 +173,7 @@ class SlotAjaxController extends AbstractController

             'modal' => $blnModal,

             'id'       => $Slot->id,

             'slot'     => array_merge($Slot->row(),[

+                'anmerkungen' => $insertTagService->replace($Slot->anmerkungen),

                 'sorte' => $arrSorten,

                 'behaelterAvailable' => $intAvailableBehaelter

             ]),

@@ -197,6 +200,8 @@ class SlotAjaxController extends AbstractController

     protected function renderAnnotation(bool $blnModal=true,string $error=null)

     {

+        $insertTagService = Controller::getContainer()->get('contao.insert_tag.parser');

+

         if (empty($_REQUEST['id']))

         {

             return new Response('Required parameter missing',412);

@@ -238,6 +243,7 @@ class SlotAjaxController extends AbstractController

             'modal' => $blnModal,

             'id'       => $Slot->id,

             'slot'     => array_merge($Slot->row(),[

+                'anmerkungen' => $insertTagService->replace($Slot->anmerkungen),

                 'sorte' => $arrSorten,

                 'behaelterAvailable' => $intAvailableBehaelter

             ]),

@@ -256,6 +262,8 @@ class SlotAjaxController extends AbstractController

     protected function renderBooking(bool $blnModal=true,string $error=null)

     {

+        $insertTagService = Controller::getContainer()->get('contao.insert_tag.parser');

+

         $arrData = [];

         if (empty($_REQUEST['id']))

@@ -364,6 +372,7 @@ class SlotAjaxController extends AbstractController

             'modal' => $blnModal,

             'id'       => $Booking->id,

             'slot'     => array_merge($Slot->row(),[

+                'anmerkungen' => $insertTagService->replace($Slot->anmerkungen),

                 'sorte' => $arrSortenAvailable,

                 'behaelterAvailable' => $intAvailableBehaelter,

             ]),

@@ -31,6 +31,7 @@ use Symfony\Component\HttpFoundation\Request;

 use Symfony\Component\HttpFoundation\Response;

 use Symfony\Component\Routing\Annotation\Route;

 use Symfony\Contracts\Translation\TranslatorInterface;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLageModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungReservationModel;

@@ -154,10 +155,16 @@ class SlotAjaxController extends AbstractController

         {

             foreach (explode(',', $Slot->ernteart) as $ernteart)

             {

-                $arrErnteart[] = $GLOBALS['TL_LANG']['REF']['wa_ernteart'][$ernteart] ?? $ernteart;

+                $arrErnteart[$ernteart] = $GLOBALS['TL_LANG']['REF']['wa_ernteart'][$ernteart] ?? $ernteart;

             }

         }

+        $arrLage = [];

+        if (($Lage = $Slot->getRelated('lage')) !== null)

+        {

+            $arrLage = array_combine($Lage->fetchEach('id'),$Lage->fetchEach('title'));

+        }

+

         $intAvailableBehaelter = $Slot->getAvailableBehaelter();

         $arrData = [

@@ -168,12 +175,14 @@ class SlotAjaxController extends AbstractController

                 'behaelterAvailable' => $intAvailableBehaelter

             ]),

             'standort' => $Slot->getRelated('pid'),

-            'lage' => $Slot->getRelated('lage'),

+            'lage' => $arrLage,

             'ernteart' => $arrErnteart,

             'buchen' => [

                 'buchbar' => (boolean) $intAvailableBehaelter,

                 'behaelter' => range(min($intAvailableBehaelter,1),$intAvailableBehaelter),

-                'sorten' => $arrSorten

+                'sorten' => $arrSorten,

+                'lage' => $arrLage,

+                'ernteart' => $arrErnteart,

             ],

             'reservations' => $arrReservations

         ];

@@ -217,6 +226,12 @@ class SlotAjaxController extends AbstractController

             }

         }

+        $arrLage = [];

+        if (($Lage = $Slot->getRelated('lage')) !== null)

+        {

+            $arrLage = $Lage->fetchEach('title');

+        }

+

         $intAvailableBehaelter = $Slot->getAvailableBehaelter();

         $arrData = [

@@ -227,7 +242,7 @@ class SlotAjaxController extends AbstractController

                 'behaelterAvailable' => $intAvailableBehaelter

             ]),

             'standort' => $Slot->getRelated('pid'),

-            'lage' => $Slot->getRelated('lage'),

+            'lage' => $arrLage,

             'ernteart' => $arrErnteart,

             'buchen' => [

                 'buchbar' => (boolean) $intAvailableBehaelter,

@@ -239,7 +254,7 @@ class SlotAjaxController extends AbstractController

         return $this->render('@Contao/modal_slot_annotation.html.twig',$arrData);

     }

-    protected function renderBooking(bool $blnModal=true)

+    protected function renderBooking(bool $blnModal=true,string $error=null)

     {

         $arrData = [];

@@ -315,6 +330,34 @@ class SlotAjaxController extends AbstractController

             $arrSortenBooked[$objSorte->id.','.$objLeseart->id] = ($objSorte !== null  ? $objSorte->title : '') . ' ' . ($objLeseart !== null  ? $objLeseart->title : '');

         }

+        $arrErnteartAvailable = [];

+        if ($Slot->ernteart !== null)

+        {

+            foreach (explode(',', $Slot->ernteart) as $ernteart)

+            {

+                $arrErnteartAvailable[$ernteart] = $GLOBALS['TL_LANG']['REF']['wa_ernteart'][$ernteart] ?? $ernteart;

+            }

+        }

+        $arrErnteartBooked = [];

+        if ($Booking->ernteart !== null)

+        {

+            $arrErnteartBooked = explode(',', $Booking->ernteart);

+        }

+

+        $arrLagenAvailable = [];

+        if (($Lagen = $Slot->getRelated('lage')) !== null)

+        {

+            foreach ($Lagen as $lage)

+            {

+                $arrLagenAvailable[$lage->id] = $lage->title;

+            }

+        }

+        $arrLagenBooked = [];

+        if ($Booking->lage !== null)

+        {

+            $arrLagenBooked = explode(',', $Booking->lage);

+        }

+

         $intAvailableBehaelter = $Slot->getAvailableBehaelter();

         $arrData = array_merge($arrData,[

@@ -322,19 +365,28 @@ class SlotAjaxController extends AbstractController

             'id'       => $Booking->id,

             'slot'     => array_merge($Slot->row(),[

                 'sorte' => $arrSortenAvailable,

-                'behaelterAvailable' => $intAvailableBehaelter

+                'behaelterAvailable' => $intAvailableBehaelter,

             ]),

             'buchung' => array_merge($Booking->row(),[

-                'sorten' => $arrSortenBooked

+                'sorten' => $arrSortenBooked,

+                'ernteart' => $arrErnteartBooked,

+                'lage' => $arrLagenBooked,

             ]),

             'standort' => $Slot->getRelated('pid'),

             'buchen' => [

                 'buchbar' => (boolean) $intAvailableBehaelter,

                 'behaelter' => range(min($intAvailableBehaelter,1),$intAvailableBehaelter+$Booking->behaelter),

-                'sorten' => $arrSortenAvailable

+                'sorten' => $arrSortenAvailable,

+                'ernteart' => $arrErnteartAvailable,

+                'lage' => $arrLagenAvailable,

             ]

         ]);

+        if (!empty($error))

+        {

+            $arrData['toast'] = $error;

+        }

+

         return $this->render('@Contao/modal_booking_details.html.twig',$arrData);

     }

@@ -364,11 +416,33 @@ class SlotAjaxController extends AbstractController

             }

         }

-        if (empty($_REQUEST['id']) || empty(Input::post('behaelter')) || empty(Input::post('sorten')))

+        if (empty($_REQUEST['id']))

         {

             return new Response('Missing parameter',412);

         }

+        // Form validation

+        if (($Slot = WeinanlieferungSlotsModel::findByPk($_REQUEST['id'])) !== null)

+        {

+            if (Input::post('behaelter') > $Slot->getAvailableBehaelter())

+            {

+                return $this->renderDetails(false,sprintf('<div class="toast toast--danger mx-0">Fehler: Es sind mittlerweile nur noch %s Behälter verfügbar.</div>',$Slot->getAvailableBehaelter()));

+            }

+        }

+        $arrError = [];

+        foreach (['behaelter','sorten','ernteart'] as $field)

+        {

+            if (empty(Input::post($field)))

+            {

+                $arrError = [$field];

+            }

+        }

+

+        if (count($arrError))

+        {

+            return $this->renderDetails(false,'<div class="toast toast--danger mx-0">Bitte geben Sie alle Pflichtangaben (mit * marierte Felder) an</div>');

+        }

+

         $arrSorten = [];

         if (!is_array(Input::post('sorten')))

         {

@@ -377,13 +451,31 @@ class SlotAjaxController extends AbstractController

             $arrSorten = implode(';', Input::post('sorten'));

         }

+        $arrErnteart = [];

+        if (!is_array(Input::post('ernteart')))

+        {

+            $arrErnteart[] = Input::post('ernteart');

+        } else {

+            $arrErnteart = implode(',', Input::post('ernteart'));

+        }

+

+        $arrLage = [];

+        if (!is_array(Input::post('lage')))

+        {

+            $arrLage[] = Input::post('lage');

+        } else {

+            $arrLage = implode(',', Input::post('lage'));

+        }

+

         $Reservation = new WeinanlieferungReservationModel();

         $arrData = array_merge($arrData,[

             'pid' => $_REQUEST['id'],

             'tstamp' => time(),

             'uid' => FrontendUser::getInstance()->id,

             'behaelter' => Input::post('behaelter'),

-            'sorten' => $arrSorten

+            'sorten' => $arrSorten,

+            'ernteart' => $arrErnteart,

+            'lage' => $arrLage

         ]);

         $Reservation->setRow($arrData);

@@ -397,7 +489,7 @@ class SlotAjaxController extends AbstractController

     {

         Controller::loadDataContainer('tl_vr_wa_reservation');

-        if (empty($_REQUEST['id']) || empty(Input::post('behaelter')) || empty(Input::post('sorten')))

+        if (empty($_REQUEST['id']))

         {

             return new Response('Missing parameter',412);

         }

@@ -418,7 +510,7 @@ class SlotAjaxController extends AbstractController

             if ($File->hasErrors())

             {

-                return $this->renderDetails(false,'<div class="toast toast--danger mx-0">' . $File->getErrorAsHTML() . '</div>');

+                return $this->renderBooking(false,'<div class="toast toast--danger mx-0">' . $File->getErrorAsHTML() . '</div>');

             }

             if (!empty($_SESSION['FILES'][$File->name]))

@@ -428,6 +520,28 @@ class SlotAjaxController extends AbstractController

             }

         }

+        // Form validation

+        if (($Slot = $Reservation->getRelated('pid')) !== null)

+        {

+            if (Input::post('behaelter') > $Slot->getAvailableBehaelter()+$Reservation->behaelter)

+            {

+                return $this->renderBooking(false,sprintf('<div class="toast toast--danger mx-0">Fehler: Es sind mittlerweile nur noch %s Behälter verfügbar.</div>',$Slot->getAvailableBehaelter()+$Reservation->behaelter));

+            }

+        }

+        $arrError = [];

+        foreach (['behaelter','sorten','ernteart'] as $field)

+        {

+            if (empty(Input::post($field)))

+            {

+                $arrError = [$field];

+            }

+        }

+

+        if (count($arrError))

+        {

+            return $this->renderBooking(false,'<div class="toast toast--danger mx-0">Bitte geben Sie alle Pflichtangaben (mit * marierte Felder) an</div>');

+        }

+

         $arrSorten = [];

         if (!is_array(Input::post('sorten')))

         {

@@ -436,9 +550,27 @@ class SlotAjaxController extends AbstractController

             $arrSorten = implode(';', Input::post('sorten'));

         }

+        $arrErnteart = [];

+        if (!is_array(Input::post('ernteart')))

+        {

+            $arrErnteart[] = Input::post('ernteart');

+        } else {

+            $arrErnteart = implode(',', Input::post('ernteart'));

+        }

+

+        $arrLage = [];

+        if (!is_array(Input::post('lage')))

+        {

+            $arrLage[] = Input::post('lage');

+        } else {

+            $arrLage = implode(',', Input::post('lage'));

+        }

+

         $Reservation->tstamp = time();

         $Reservation->behaelter = Input::post('behaelter');

         $Reservation->sorten = $arrSorten;

+        $Reservation->ernteart = $arrErnteart;

+        $Reservation->lage = $arrLage;

         $Reservation->save();

@@ -149,6 +149,15 @@ class SlotAjaxController extends AbstractController

             $arrSorten = array_combine($Sorten->fetchEach('id'),$Sorten->fetchEach('title'));

         }*/

+        $arrErnteart = [];

+        if ($Slot->ernteart !== null)

+        {

+            foreach (explode(',', $Slot->ernteart) as $ernteart)

+            {

+                $arrErnteart[] = $GLOBALS['TL_LANG']['REF']['wa_ernteart'][$ernteart] ?? $ernteart;

+            }

+        }

+

         $intAvailableBehaelter = $Slot->getAvailableBehaelter();

         $arrData = [

@@ -159,6 +168,8 @@ class SlotAjaxController extends AbstractController

                 'behaelterAvailable' => $intAvailableBehaelter

             ]),

             'standort' => $Slot->getRelated('pid'),

+            'lage' => $Slot->getRelated('lage'),

+            'ernteart' => $arrErnteart,

             'buchen' => [

                 'buchbar' => (boolean) $intAvailableBehaelter,

                 'behaelter' => range(min($intAvailableBehaelter,1),$intAvailableBehaelter),

@@ -197,6 +208,15 @@ class SlotAjaxController extends AbstractController

             $arrSorten[$objSorte->id.','.$objLeseart->id] = ($objSorte !== null  ? $objSorte->title : '') . ' ' . ($objLeseart !== null  ? $objLeseart->title : '');

         }

+        $arrErnteart = [];

+        if ($Slot->ernteart !== null)

+        {

+            foreach (explode(',', $Slot->ernteart) as $ernteart)

+            {

+                $arrErnteart[] = $GLOBALS['TL_LANG']['REF']['wa_ernteart'][$ernteart] ?? $ernteart;

+            }

+        }

+

         $intAvailableBehaelter = $Slot->getAvailableBehaelter();

         $arrData = [

@@ -207,6 +227,8 @@ class SlotAjaxController extends AbstractController

                 'behaelterAvailable' => $intAvailableBehaelter

             ]),

             'standort' => $Slot->getRelated('pid'),

+            'lage' => $Slot->getRelated('lage'),

+            'ernteart' => $arrErnteart,

             'buchen' => [

                 'buchbar' => (boolean) $intAvailableBehaelter,

                 'behaelter' => range(min($intAvailableBehaelter,1),$intAvailableBehaelter),

@@ -78,6 +78,9 @@ class SlotAjaxController extends AbstractController

             case 'details':

                 return $this->renderDetails($blnModal);

+            case 'annotation':

+                return $this->renderAnnotation($blnModal);

+

             case 'booking':

                 return $this->renderBooking($blnModal);

@@ -172,6 +175,48 @@ class SlotAjaxController extends AbstractController

         return $this->render('@Contao/modal_slot_details.html.twig',$arrData);

     }

+    protected function renderAnnotation(bool $blnModal=true,string $error=null)

+    {

+        if (empty($_REQUEST['id']))

+        {

+            return new Response('Required parameter missing',412);

+        }

+

+        if (($Slot = WeinanlieferungSlotsModel::findPublishedById($_REQUEST['id'])) === null)

+        {

+            return new Response('Could not load slot data',500);

+        }

+

+        // Build data

+        $arrSorten = [];

+        $Sorten = StringUtil::deserialize($Slot->sorten,true);

+        foreach($Sorten as $sorte)

+        {

+            $objSorte = WeinanlieferungRebsorteModel::findByPk($sorte['sorte']);

+            $objLeseart = WeinanlieferungLeseartModel::findByPk($sorte['leseart']);

+            $arrSorten[$objSorte->id.','.$objLeseart->id] = ($objSorte !== null  ? $objSorte->title : '') . ' ' . ($objLeseart !== null  ? $objLeseart->title : '');

+        }

+

+        $intAvailableBehaelter = $Slot->getAvailableBehaelter();

+

+        $arrData = [

+            'modal' => $blnModal,

+            'id'       => $Slot->id,

+            'slot'     => array_merge($Slot->row(),[

+                'sorte' => $arrSorten,

+                'behaelterAvailable' => $intAvailableBehaelter

+            ]),

+            'standort' => $Slot->getRelated('pid'),

+            'buchen' => [

+                'buchbar' => (boolean) $intAvailableBehaelter,

+                'behaelter' => range(min($intAvailableBehaelter,1),$intAvailableBehaelter),

+                'sorten' => $arrSorten

+            ],

+        ];

+

+        return $this->render('@Contao/modal_slot_annotation.html.twig',$arrData);

+    }

+

     protected function renderBooking(bool $blnModal=true)

     {

         $arrData = [];

@@ -313,7 +313,6 @@ class SlotAjaxController extends AbstractController

         $Reservation = new WeinanlieferungReservationModel();

         $arrData = array_merge($arrData,[

             'pid' => $_REQUEST['id'],

-            'rootid' => $rootPage !== null ? $rootPage->id : '',

             'tstamp' => time(),

             'uid' => FrontendUser::getInstance()->id,

             'behaelter' => Input::post('behaelter'),

@@ -290,8 +290,11 @@ class SlotAjaxController extends AbstractController

                 return $this->renderDetails(false,'<div class="toast toast--danger mx-0">' . $File->getErrorAsHTML() . '</div>');

             }

-            $arrData['filename'] = $_SESSION['FILES'][$File->name]['name'] ?? '';

-            $arrData['upload'] = $_SESSION['FILES'][$File->name]['uuid'] ? StringUtil::uuidToBin($_SESSION['FILES'][$File->name]['uuid']) : null;

+            if (!empty($_SESSION['FILES'][$File->name]))

+            {

+                $arrData['filename'] = $_SESSION['FILES'][$File->name]['name'] ?? '';

+                $arrData['upload'] = $_SESSION['FILES'][$File->name]['uuid'] ? StringUtil::uuidToBin($_SESSION['FILES'][$File->name]['uuid']) : null;

+            }

         }

         if (empty($_REQUEST['id']) || empty(Input::post('behaelter')) || empty(Input::post('sorten')))

@@ -352,8 +355,11 @@ class SlotAjaxController extends AbstractController

                 return $this->renderDetails(false,'<div class="toast toast--danger mx-0">' . $File->getErrorAsHTML() . '</div>');

             }

-            $Reservation->filename = $_SESSION['FILES'][$File->name]['name'] ?? '';

-            $Reservation->upload = $_SESSION['FILES'][$File->name]['uuid'] ? StringUtil::uuidToBin($_SESSION['FILES'][$File->name]['uuid']) : null;

+            if (!empty($_SESSION['FILES'][$File->name]))

+            {

+                $Reservation->filename = $_SESSION['FILES'][$File->name]['name'] ?? '';

+                $Reservation->upload = $_SESSION['FILES'][$File->name]['uuid'] ? StringUtil::uuidToBin($_SESSION['FILES'][$File->name]['uuid']) : null;

+            }

         }

         $arrSorten = [];

@@ -361,7 +367,7 @@ class SlotAjaxController extends AbstractController

         {

             $arrSorten[] = Input::post('sorten');

         } else {

-            $arrSorten = implode(',', Input::post('sorten'));

+            $arrSorten = implode(';', Input::post('sorten'));

         }

         $Reservation->tstamp = time();

@@ -14,8 +14,12 @@ namespace vonRotenberg\WeinanlieferungBundle\Controller\Frontend\Ajax;

 use Contao\Controller;

 use Contao\CoreBundle\Controller\AbstractController;

+use Contao\CoreBundle\Exception\PageNotFoundException;

 use Contao\CoreBundle\Framework\ContaoFramework;

 use Contao\CoreBundle\Security\Authentication\Token\TokenChecker;

+use Contao\Environment;

+use Contao\File;

+use Contao\FilesModel;

 use Contao\FormFileUpload;

 use Contao\Frontend;

 use Contao\FrontendUser;

@@ -170,6 +174,8 @@ class SlotAjaxController extends AbstractController

     protected function renderBooking(bool $blnModal=true)

     {

+        $arrData = [];

+

         if (empty($_REQUEST['id']))

         {

             return new Response('Required parameter missing',412);

@@ -181,6 +187,49 @@ class SlotAjaxController extends AbstractController

             return new Response('Could not load booking data',500);

         }

+        $objFile = FilesModel::findByUuid($Booking->upload);

+

+        if (!empty($_REQUEST['deleteFile']) && $_REQUEST['deleteFile'] && $objFile !== null)

+        {

+            $File = new File($objFile->path);

+            if ($File->delete())

+            {

+                $objFile->delete();

+                $objFile = null;

+            }

+        }

+

+        if (!empty($Booking->upload) && $objFile !== null)

+        {

+            $File = new File($objFile->path);

+            $strHref = Environment::get('request');

+

+            // Remove an existing file parameter (see #5683)

+            if (isset($_GET['file']))

+            {

+                $strHref = preg_replace('/(&(amp;)?|\?)file=[^&]+/', '', $strHref);

+            }

+

+            $strHref .= (strpos($strHref, '?') !== false ? '&' : '?') . 'file=' . System::urlEncode($File->value);

+

+            $arrData['file'] = [

+                'link' => $strHref,

+                'filename' => $File->filename,

+                'extension' => $File->extension,

+                'name' => $File->name,

+                'path' => $File->dirname

+            ];

+        }

+

+        // Send the file to the browser (see #4632 and #8375)

+        if ($objFile !== null && ($file = Input::get('file', true)))

+        {

+            if ($file == $objFile->path)

+            {

+                Controller::sendFileToBrowser($file);

+            }

+        }

+

         $arrSortenAvailable = [];

         $Sorten = StringUtil::deserialize($Slot->sorten,true);

         foreach($Sorten as $sorte)

@@ -201,7 +250,7 @@ class SlotAjaxController extends AbstractController

         $intAvailableBehaelter = $Slot->getAvailableBehaelter();

-        $arrData = [

+        $arrData = array_merge($arrData,[

             'modal' => $blnModal,

             'id'       => $Booking->id,

             'slot'     => array_merge($Slot->row(),[

@@ -217,7 +266,7 @@ class SlotAjaxController extends AbstractController

                 'behaelter' => range(min($intAvailableBehaelter,1),$intAvailableBehaelter+$Booking->behaelter),

                 'sorten' => $arrSortenAvailable

             ]

-        ];

+        ]);

         return $this->render('@Contao/modal_booking_details.html.twig',$arrData);

     }

@@ -277,6 +326,8 @@ class SlotAjaxController extends AbstractController

     protected function updateReservation()

     {

+        Controller::loadDataContainer('tl_vr_wa_reservation');

+

         if (empty($_REQUEST['id']) || empty(Input::post('behaelter')) || empty(Input::post('sorten')))

         {

             return new Response('Missing parameter',412);

@@ -287,6 +338,24 @@ class SlotAjaxController extends AbstractController

             return new Response('Could not load booking data',500);

         }

+        if (($rootPage = Frontend::getRootPageFromUrl()) !== null && !empty($rootPage->vr_wa_uploadFolderSRC))

+        {

+            $File = new FormFileUpload(\Contao\Widget::getAttributesFromDca($GLOBALS['TL_DCA']['tl_vr_wa_reservation']['fields']['upload'], 'upload'));

+            $File->storeFile = true;

+            $File->doNotOverwrite = true;

+            $File->uploadFolder = $rootPage->vr_wa_uploadFolderSRC;

+

+            $File->validate();

+

+            if ($File->hasErrors())

+            {

+                return $this->renderDetails(false,'<div class="toast toast--danger mx-0">' . $File->getErrorAsHTML() . '</div>');

+            }

+

+            $Reservation->filename = $_SESSION['FILES'][$File->name]['name'] ?? '';

+            $Reservation->upload = $_SESSION['FILES'][$File->name]['uuid'] ? StringUtil::uuidToBin($_SESSION['FILES'][$File->name]['uuid']) : null;

+        }

+

         $arrSorten = [];

         if (!is_array(Input::post('sorten')))

         {

@@ -16,6 +16,8 @@ use Contao\Controller;

 use Contao\CoreBundle\Controller\AbstractController;

 use Contao\CoreBundle\Framework\ContaoFramework;

 use Contao\CoreBundle\Security\Authentication\Token\TokenChecker;

+use Contao\FormFileUpload;

+use Contao\Frontend;

 use Contao\FrontendUser;

 use Contao\Input;

 use Contao\StringUtil;

@@ -88,7 +90,7 @@ class SlotAjaxController extends AbstractController

         return new Response('',500);

     }

-    protected function renderDetails(bool $blnModal=true)

+    protected function renderDetails(bool $blnModal=true,string $error=null)

     {

         if (empty($_REQUEST['id']))

         {

@@ -158,6 +160,11 @@ class SlotAjaxController extends AbstractController

             'reservations' => $arrReservations

         ];

+        if (!empty($error))

+        {

+            $arrData['toast'] = $error;

+        }

+

         return $this->render('@Contao/modal_slot_details.html.twig',$arrData);

     }

@@ -217,6 +224,27 @@ class SlotAjaxController extends AbstractController

     protected function reservate()

     {

+        Controller::loadDataContainer('tl_vr_wa_reservation');

+        $arrData = [];

+

+        if (($rootPage = Frontend::getRootPageFromUrl()) !== null && !empty($rootPage->vr_wa_uploadFolderSRC))

+        {

+            $File = new FormFileUpload(\Contao\Widget::getAttributesFromDca($GLOBALS['TL_DCA']['tl_vr_wa_reservation']['fields']['upload'], 'upload'));

+            $File->storeFile = true;

+            $File->doNotOverwrite = true;

+            $File->uploadFolder = $rootPage->vr_wa_uploadFolderSRC;

+

+            $File->validate();

+

+            if ($File->hasErrors())

+            {

+                return $this->renderDetails(false,'<div class="toast toast--danger mx-0">' . $File->getErrorAsHTML() . '</div>');

+            }

+

+            $arrData['filename'] = $_SESSION['FILES'][$File->name]['name'] ?? '';

+            $arrData['upload'] = $_SESSION['FILES'][$File->name]['uuid'] ? StringUtil::uuidToBin($_SESSION['FILES'][$File->name]['uuid']) : null;

+        }

+

         if (empty($_REQUEST['id']) || empty(Input::post('behaelter')) || empty(Input::post('sorten')))

         {

             return new Response('Missing parameter',412);

@@ -231,14 +259,15 @@ class SlotAjaxController extends AbstractController

         }

         $Reservation = new WeinanlieferungReservationModel();

-

-        $Reservation->setRow([

+        $arrData = array_merge($arrData,[

             'pid' => $_REQUEST['id'],

+            'rootid' => $rootPage !== null ? $rootPage->id : '',

             'tstamp' => time(),

             'uid' => FrontendUser::getInstance()->id,

             'behaelter' => Input::post('behaelter'),

             'sorten' => $arrSorten

         ]);

+        $Reservation->setRow($arrData);

         $Reservation->save();

@@ -18,12 +18,15 @@ use Contao\CoreBundle\Framework\ContaoFramework;

 use Contao\CoreBundle\Security\Authentication\Token\TokenChecker;

 use Contao\FrontendUser;

 use Contao\Input;

+use Contao\StringUtil;

 use Contao\System;

 use Doctrine\DBAL\Connection;

 use Symfony\Component\HttpFoundation\Request;

 use Symfony\Component\HttpFoundation\Response;

 use Symfony\Component\Routing\Annotation\Route;

 use Symfony\Contracts\Translation\TranslatorInterface;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungReservationModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

@@ -83,7 +86,6 @@ class SlotAjaxController extends AbstractController

         }

         return new Response('',500);

-        return new Response(null,203);

     }

     protected function renderDetails(bool $blnModal=true)

@@ -106,10 +108,18 @@ class SlotAjaxController extends AbstractController

             foreach ($Reservations as $reservation)

             {

                 $arrSortenBooked = [];

-                if (($Sorten = $reservation->getRelated('sorten')) !== null)

+                $SortenLeseart = explode(';',$reservation->sorten);

+                foreach($SortenLeseart as $sorteLeseart)

                 {

-                    $arrSortenBooked = $Sorten->fetchEach('title');

+                    list($sorte,$leseart) = explode(',',$sorteLeseart);

+                    $objSorte = WeinanlieferungRebsorteModel::findByPk($sorte);

+                    $objLeseart = WeinanlieferungLeseartModel::findByPk($leseart);

+                    $arrSortenBooked[$objSorte->id.','.$objLeseart->id] = ($objSorte !== null  ? $objSorte->title : '') . ' ' . ($objLeseart !== null  ? $objLeseart->title : '');

                 }

+                /*if (($Sorten = $reservation->getRelated('sorten')) !== null)

+                {

+                    $arrSortenBooked = $Sorten->fetchEach('title');

+                }*/

                 $arrReservations[] = array_merge($reservation->row(),[

                     'sorten' => $arrSortenBooked

                 ]);

@@ -118,10 +128,17 @@ class SlotAjaxController extends AbstractController

         // Build data

         $arrSorten = [];

-        if (($Sorten = $Slot->getRelated('sorte')) !== null)

+        $Sorten = StringUtil::deserialize($Slot->sorten,true);

+        foreach($Sorten as $sorte)

         {

-            $arrSorten = array_combine($Sorten->fetchEach('id'),$Sorten->fetchEach('title'));

+            $objSorte = WeinanlieferungRebsorteModel::findByPk($sorte['sorte']);

+            $objLeseart = WeinanlieferungLeseartModel::findByPk($sorte['leseart']);

+            $arrSorten[$objSorte->id.','.$objLeseart->id] = ($objSorte !== null  ? $objSorte->title : '') . ' ' . ($objLeseart !== null  ? $objLeseart->title : '');

         }

+        /*if (($Sorten = $Slot->getRelated('sorte')) !== null)

+        {

+            $arrSorten = array_combine($Sorten->fetchEach('id'),$Sorten->fetchEach('title'));

+        }*/

         $intAvailableBehaelter = $Slot->getAvailableBehaelter();

@@ -158,14 +175,21 @@ class SlotAjaxController extends AbstractController

         }

         $arrSortenAvailable = [];

-        if (($Sorten = $Slot->getRelated('sorte')) !== null)

+        $Sorten = StringUtil::deserialize($Slot->sorten,true);

+        foreach($Sorten as $sorte)

         {

-            $arrSortenAvailable = array_combine($Sorten->fetchEach('id'),$Sorten->fetchEach('title'));

+            $objSorte = WeinanlieferungRebsorteModel::findByPk($sorte['sorte']);

+            $objLeseart = WeinanlieferungLeseartModel::findByPk($sorte['leseart']);

+            $arrSortenAvailable[$objSorte->id.','.$objLeseart->id] = ($objSorte !== null  ? $objSorte->title : '') . ' ' . ($objLeseart !== null  ? $objLeseart->title : '');

         }

         $arrSortenBooked = [];

-        if (($Sorten = $Booking->getRelated('sorten')) !== null)

+        $SortenLeseart = explode(';',$Booking->sorten);

+        foreach($SortenLeseart as $sorteLeseart)

         {

-            $arrSortenBooked = array_combine($Sorten->fetchEach('id'),$Sorten->fetchEach('title'));

+            list($sorte,$leseart) = explode(',',$sorteLeseart);

+            $objSorte = WeinanlieferungRebsorteModel::findByPk($sorte);

+            $objLeseart = WeinanlieferungLeseartModel::findByPk($leseart);

+            $arrSortenBooked[$objSorte->id.','.$objLeseart->id] = ($objSorte !== null  ? $objSorte->title : '') . ' ' . ($objLeseart !== null  ? $objLeseart->title : '');

         }

         $intAvailableBehaelter = $Slot->getAvailableBehaelter();

@@ -203,7 +227,7 @@ class SlotAjaxController extends AbstractController

         {