new file mode 100644

@@ -0,0 +1,25 @@

+<?php

+

+/*

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

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+use Contao\CoreBundle\DataContainer\PaletteManipulator;

+

+PaletteManipulator::create()

+    ->addLegend('wa_config_legend','global_legend')

+    ->addField('vr_wa_uploadFolderSRC','wa_config_legend',PaletteManipulator::POSITION_APPEND)

+    ->applyToPalette('root','tl_page')

+    ->applyToPalette('rootfallback','tl_page');

+

+

+$GLOBALS['TL_DCA']['tl_page']['fields']['vr_wa_uploadFolderSRC'] = array(

+    'exclude'    => true,

+    'inputType'  => 'fileTree',

+    'eval'       => array('fieldType'=>'radio', 'files'=>false, 'mandatory'=>true, 'tl_class'=>'clr'),

+    'sql'        => "binary(16) NULL"

+);

@@ -10,6 +10,7 @@

 use Contao\DC_Table;

 use Contao\DataContainer;

+use Contao\Config;

 $GLOBALS['TL_DCA']['tl_vr_wa_reservation'] = array

 (

@@ -39,6 +40,12 @@ $GLOBALS['TL_DCA']['tl_vr_wa_reservation'] = array

             'sql'        => "int(10) unsigned NOT NULL default '0'",

             'relation'   => array('type' => 'belongsTo', 'load' => 'lazy')

         ),

+        'rootid'         => array

+        (

+            'foreignKey' => 'tl_page.title',

+            'sql'        => "int(10) unsigned NOT NULL default '0'",

+            'relation'   => array('type' => 'belongsTo', 'load' => 'lazy')

+        ),

         'tstamp'      => array

         (

             'sql' => "int(10) unsigned NOT NULL default '0'"

@@ -60,5 +67,23 @@ $GLOBALS['TL_DCA']['tl_vr_wa_reservation'] = array

             'sql'       => "blob NULL",

             'relation'   => array('type' => 'hasMany', 'load' => 'lazy')

         ),

+        'upload' => array

+        (

+            'exclude'                 => true,

+            'inputType'               => 'fileTree',

+            'eval'                    => array('filesOnly'=>true, 'fieldType'=>'radio', 'tl_class'=>'clr', 'extensions'=>Config::get('allowedDownload')),

+            'sql'                     => "binary(16) NULL"

+        ),

+        'filename' => array

+        (

+            'exclude'                 => true,

+            'inputType'               => 'text',

+            'eval'                    => array

+            (

+                'maxlength' => 255,

+                'decodeEntities'=>true

+            ),

+            'sql'                     => "varchar(255) BINARY NOT NULL default ''"

+        ),

     )

 );

@@ -11,6 +11,8 @@

 use Contao\DC_Table;

 use Contao\DataContainer;

+\Contao\System::loadLanguageFile('default');

+

 $GLOBALS['TL_DCA']['tl_vr_wa_slot'] = array

 (

new file mode 100644

@@ -0,0 +1,14 @@

+<?php

+

+/**

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

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+$GLOBALS['TL_LANG']['tl_page']['vr_wa_uploadFolderSRC'][0] = 'Upload-Ordner';

+$GLOBALS['TL_LANG']['tl_page']['vr_wa_uploadFolderSRC'][1] = 'Hier werden die hochgeladenen Dateien abgelegt.';

+

+$GLOBALS['TL_LANG']['tl_page']['wa_config_legend'] = 'Weinanlieferung-Einstellungen';

new file mode 100644

@@ -0,0 +1,12 @@

+<?php

+

+/**

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

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+$GLOBALS['TL_LANG']['MSC']['wa_sorte'] = 'Grape variety';

+$GLOBALS['TL_LANG']['MSC']['wa_leseart'] = 'Harvest type';

@@ -59,8 +59,11 @@

             <div class="frame__body">

                 <h4>Reservieren</h4>

+                {% if toast is defined %}

+                  {{ toast|raw }}

+                {% endif %}

                 {% if buchen.buchbar %}

-                    <form hx-post="/_ajax/vr_wa/v1/slot?do=reservate">

+                    <form hx-post="/_ajax/vr_wa/v1/slot?do=reservate" enctype="multipart/form-data">

                         <input type="hidden" name="id" value="{{ id }}">

                         <fieldset>

                             <label for="res-behaelter">Liefernde Behältermenge</label>

@@ -78,6 +81,10 @@

                             {% endfor %}

                         </fieldset>

                         <fieldset>

+                            <label for="res-upload">Dateianhang</label>

+                            <input type="file" id="res-upload" name="upload">

+                        </fieldset>

+                        <fieldset>

                             <button type="submit">Reservieren</button>

                         </fieldset>

                     </form>

@@ -31,6 +31,16 @@

                     </div>

                 {% endfor %}

             </div>

+        {% else %}

+            <div class="placeholder">

+                <h6 class="placeholder-title">Sie haben noch keine Anlieferungszeiten reserviert</h6>

+                <div class="placeholder-subtitle">Sobald Sie Anlieferungszeiten reserviert haben, werden diese hier aufgelistet.</div>

+                <div class="placeholder-commands u-center">

+                    <div class="m-1">

+                        <a href="{{ insert_tag('link_url::2') }}" class="btn btn-info">Zur Reservierung</a>

+                    </div>

+                </div>

+            </div>

         {% endif %}

     {% endblock %}

@@ -1,35 +1,37 @@

 <div hx-get="{{ insert_tag('env::request') }}" hx-headers='{"VR-Ajax": "WaSlotsModule"}' hx-trigger="updateWaList from:body, updateWaBooking from:body" class="{{ class }} content-wrapper block"{{ cssID }}{% if style is defined and style is not empty %} style="{{ style }}"{% endif %}>

     {% block filter %}

-        <form hx-get="{{ insert_tag('env::request') }}" hx-push-url="true" hx-headers='{"VR-Ajax": "WaSlotsModule"}' hx-trigger="change, submit" hx-target="closest .content-wrapper" class="filter">

-            <div class="row">

-                <div class="col-md-3 kapazitaet">

-                    <select name="filter_kapazitaet">

-                        <option value="">-</option>

-                        {% for option in filter.kapazitaet.options %}

-                            <option value="{{ option }}"{% if filter.kapazitaet.selected is defined and filter.kapazitaet.selected == option %} selected{% endif %}>{{ option }}</option>

-                        {% endfor %}

-                    </select>

-                </div>

-                <div class="col-md-3 sorte">

-                    <select name="filter_sorte">

-                        <option value="">-</option>

-                        {% for key, option in filter.sorte.options %}

-                            <option value="{{ key }}"{% if filter.sorte.selected is defined and filter.sorte.selected == key %} selected{% endif %}>{{ option }}</option>

-                        {% endfor %}

-                    </select>

-                </div>

-                <div class="col-md-3 leseart">

-                    <select name="filter_leseart">

-                        <option value="">-</option>

-                        {% for key, option in filter.leseart.options %}

-                            <option value="{{ key }}"{% if filter.leseart.selected is defined and filter.leseart.selected == key %} selected{% endif %}>{{ option }}</option>

-                        {% endfor %}

-                    </select>

+        {% if days is defined and days|length %}

+            <form hx-get="{{ insert_tag('env::request') }}" hx-push-url="true" hx-headers='{"VR-Ajax": "WaSlotsModule"}' hx-trigger="change, submit" hx-target="closest .content-wrapper" class="filter">

+                <div class="row">

+                    <div class="col-md-3 kapazitaet">

+                        <select name="filter_kapazitaet">

+                            <option value="">-</option>

+                            {% for option in filter.kapazitaet.options %}

+                                <option value="{{ option }}"{% if filter.kapazitaet.selected is defined and filter.kapazitaet.selected == option %} selected{% endif %}>{{ option }}</option>

+                            {% endfor %}

+                        </select>

+                    </div>

+                    <div class="col-md-3 sorte">

+                        <select name="filter_sorte">

+                            <option value="">-</option>

+                            {% for key, option in filter.sorte.options %}

+                                <option value="{{ key }}"{% if filter.sorte.selected is defined and filter.sorte.selected == key %} selected{% endif %}>{{ option }}</option>

+                            {% endfor %}

+                        </select>

+                    </div>

+                    <div class="col-md-3 leseart">

+                        <select name="filter_leseart">

+                            <option value="">-</option>

+                            {% for key, option in filter.leseart.options %}

+                                <option value="{{ key }}"{% if filter.leseart.selected is defined and filter.leseart.selected == key %} selected{% endif %}>{{ option }}</option>

+                            {% endfor %}

+                        </select>

+                    </div>

+                    <div class="col submit"><button class="u-block w-100p">Filter übernehmen</button></div>

                 </div>

-                <div class="col submit"><button class="u-block w-100p">Filter übernehmen</button></div>

-            </div>

-        </form>

+            </form>

+        {% endif %}

     {% endblock %}

     {% block content %}

@@ -62,6 +64,11 @@

                     </div>

                 {% endfor %}

             </div>

+        {% else %}

+            <div class="placeholder">

+                <h6 class="placeholder-title">Derzeit sind keine buchbaren Anlieferungszeiten verfügbar</h6>

+                <div class="placeholder-subtitle">Sie können uns auch gerne anrufen.</div>

+            </div>

         {% endif %}

     {% endblock %}

@@ -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();