@@ -97,7 +97,7 @@ $GLOBALS['TL_DCA']['tl_vr_wa_reservation'] = array

     'palettes' => array

     (

         '__selector__' => array(),

-        'default' => 'pid,uid,behaelter,sorten,lage,ernteart,upload'

+        'default' => 'pid,uid,unit,amount,behaelter,upload'

     ),

     // Subpalettes

@@ -146,11 +146,42 @@ $GLOBALS['TL_DCA']['tl_vr_wa_reservation'] = array

             'sql'       => "blob NULL",

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

         ),

+        'unit' => array

+        (

+            'exclude'                 => true,

+            'inputType'               => 'select',

+            'eval'                    => array

+            (

+                'mandatory' => false,

+                'includeBlankOption' => true,

+                'blankOptionLabel' => &$GLOBALS['TL_LANG']['MSC']['wa_container'],

+                'tl_class' => 'clr w50',

+            ),

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

+            'relation' => array

+            (

+                'table' => 'tl_vr_wa_units',

+                'load' => 'lazy',

+                'type' => 'hasOne',

+                'field' => 'id'

+            )

+        ),

+        'amount'         => array

+        (

+            'exclude'                 => true,

+            'inputType'               => 'text',

+            'eval'       => array

+            (

+                'rgxp'=>'natural',

+                'tl_class'=>'w50',

+            ),

+            'sql'        => "smallint(3) unsigned NOT NULL default 0",

+        ),

         'behaelter'         => array

         (

             'exclude'                 => true,

             'inputType'               => 'text',

-            'eval'       => array('rgxp'=>'natural','tl_class'=>'w50'),

+            'eval'       => array('rgxp'=>'natural','tl_class'=>'clr w50','readonly'=>true),

             'sql'        => "smallint(3) unsigned NOT NULL default 0",

         ),

         'sorten'       => array

@@ -88,7 +88,7 @@ $GLOBALS['TL_DCA']['tl_vr_wa_slottypes'] = array

     // Palettes

     'palettes' => array

     (

-        'default' => '{title_legend},title;{config_legend},duration,containers,units;{expert_legend},default'

+        'default' => '{title_legend},title;{config_legend},duration,containers;{expert_legend},default'

     ),

     // Subpalettes

@@ -157,19 +157,6 @@ $GLOBALS['TL_DCA']['tl_vr_wa_slottypes'] = array

             ),

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

         ),

-        'units' => array

-        (

-            'exclude'                 => true,

-            'inputType'               => 'checkbox',

-            'foreignKey'              => "tl_vr_wa_units.title",

-            'eval'                    => array

-            (

-                'mandatory' => false,

-                'multiple'  => true,

-                'tl_class' => 'clr'

-            ),

-            'sql'                     => "blob NULL"

-        ),

         'default' => array

         (

             'exclude'                 => true,

@@ -110,7 +110,7 @@ $GLOBALS['TL_DCA']['tl_vr_wa_standort'] = array

     'palettes' => array

     (

         '__selector__' => ['nc_enable'],

-        'default' => '{title_legend},title;{notification_legend},nc_enable'

+        'default' => '{title_legend},title;{units_legend},units;{notification_legend},nc_enable'

     ),

     // Subpalettes

@@ -143,6 +143,24 @@ $GLOBALS['TL_DCA']['tl_vr_wa_standort'] = array

             ),

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

         ),

+        'units' => array

+        (

+            'exclude'                 => true,

+            'inputType'               => 'checkbox',

+            'foreignKey'              => "tl_vr_wa_units.title",

+            'eval'                    => array

+            (

+                'mandatory' => false,

+                'multiple'  => true,

+                'tl_class' => 'clr'

+            ),

+            'sql'                     => "blob NULL",

+            'relation' => array

+            (

+                'type' => 'hasMany',

+                'load' => 'lazy'

+            )

+        ),

         'nc_enable' => array

         (

             'exclude'                 => true,

@@ -12,6 +12,10 @@ $GLOBALS['TL_LANG']['tl_vr_wa_reservation']['pid'][0] = 'Zeitslot';

 $GLOBALS['TL_LANG']['tl_vr_wa_reservation']['pid'][1] = 'Der gebuchte Zeitslot.';

 $GLOBALS['TL_LANG']['tl_vr_wa_reservation']['behaelter'][0] = 'Behälteranzahl';

 $GLOBALS['TL_LANG']['tl_vr_wa_reservation']['behaelter'][1] = 'Die Anzahl an Behälter, die der Winzer anliefert.';

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['amount'][0] = 'Anzahl';

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['amount'][1] = 'Die Anzahl der ausgewählten Einheit, die der Winzer anliefert.';

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['unit'][0] = 'Behältereinheit';

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['unit'][1] = 'Die Behältereinheit, die der Winzer anliefert.';

 $GLOBALS['TL_LANG']['tl_vr_wa_reservation']['sorten'][0] = 'Sorten';

 $GLOBALS['TL_LANG']['tl_vr_wa_reservation']['sorten'][1] = 'Die Sorten, die der Winzer anliefert.';

 $GLOBALS['TL_LANG']['tl_vr_wa_reservation']['lage'][0] = 'Lage';

@@ -18,6 +18,8 @@ $GLOBALS['TL_LANG']['tl_vr_wa_slot']['behaelter'][0] = 'Behälter';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['behaelter'][1] = 'Anzahl der Behälter, die verarbeitet werden können.';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['lage'][0] = 'Lage';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['lage'][1] = 'Lage der angelieferten Reben.';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['units'][0] = 'Zusätzliche Container-Einheiten';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['units'][1] = 'Zusätzlich wählbare Behältereinheiten für die Slotbuchung.';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['leseart'][0] = 'Leseart';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['leseart'][1] = 'Die verwendete Leseart.';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['sorten'][0] = 'Rebsorten';

@@ -10,12 +10,15 @@

 $GLOBALS['TL_LANG']['tl_vr_wa_standort']['title'][0] = 'Titel';

 $GLOBALS['TL_LANG']['tl_vr_wa_standort']['title'][1] = 'Der Name des Anlieferungs-Standorts.';

+$GLOBALS['TL_LANG']['tl_vr_wa_standort']['units'][0] = 'Zusätzliche Behälter-Einheiten';

+$GLOBALS['TL_LANG']['tl_vr_wa_standort']['units'][1] = 'Zusätzlich wählbare Behältereinheiten für die Slotbuchung.';

 $GLOBALS['TL_LANG']['tl_vr_wa_standort']['nc_enable'][0] = 'Benachrichtigungen aktivieren';

 $GLOBALS['TL_LANG']['tl_vr_wa_standort']['nc_enable'][1] = 'Ermöglicht das Versenden von Benachrichtigungen beim Veröffentlichen neuer Nachrichten.';

 $GLOBALS['TL_LANG']['tl_vr_wa_standort']['nc_notification'][0] = 'Benachrichtigung';

 $GLOBALS['TL_LANG']['tl_vr_wa_standort']['nc_notification'][1] = 'Die zu versendende Benachrichtigung.';

 $GLOBALS['TL_LANG']['tl_vr_wa_standort']['title_legend'] = 'Standort';

+$GLOBALS['TL_LANG']['tl_vr_wa_standort']['units_legend'] = 'Einheiten-Einstellungen';

 $GLOBALS['TL_LANG']['tl_vr_wa_standort']['notification_legend'] = 'Benachrichtigung-Einstellungen';

 $GLOBALS['TL_LANG']['tl_vr_wa_standort']['rebsorte'] = 'Rebsorten';

@@ -50,19 +50,15 @@

                                             <div class="t-label">Standort</div>

                                             {{ standort.standort }}

                                         </div>

-                                        <div class="col-3">

+                                        <div class="col">

                                             <div class="t-label">Verfügbare Behälterkapazität</div>

                                             {{ bookings.behaelterAvailable }}

                                         </div>

-                                        <div class="col">

-                                            <div class="t-label">Verarbeitete Sorten</div>

-                                            {{ bookings.sorten|join(', ') }}

-                                        </div>

                                     </h3>

                                     <div class="bookings u-row-striped">

                                         {% for booking in bookings.items %}

                                             <div class="row u-items-center">

-                                                <div class="col-1 time icon-uhr-outline">

+                                                <div class="col-2 time icon-uhr-outline">

                                                     <div class="t-label">Uhrzeit</div>

                                                     {{ booking.slot.time|date('H:i') }}

                                                     <div class="t-label">Standort</div>

@@ -71,16 +67,10 @@

                                                 <div class="col-3 behaelter icon-behaelter-outline">

                                                     <div class="t-label">Gebuchte Behälterkapazität</div>

                                                     {{ booking.behaelter }}

-                                                    <div class="t-label">Ernteart</div>

-                                                    {{ booking.ernteart|join(', ') }}

-                                                </div>

-                                                <div class="col-3 behaelter icon-behaelter-outline">

-                                                    <div class="t-label">Anliefernde Sorten</div>

-                                                    {{ booking.sorte|join(', ') }}

-                                                    <div class="t-label">Lage</div>

-                                                    {{ booking.lage|join(', ') }}

+                                                    <div class="t-label">Anlieferungseinheit</div>

+                                                    {{ booking.amount }} x {{ booking.unit }}

                                                 </div>

-                                                <div class="col-3 rebsorten icon-reben-outline">

+                                                <div class="col-5 rebsorten icon-reben-outline">

                                                     <div class="t-label">Mitglied</div>

                                                     {% if booking.member is not null %}

                                                         {% if booking.member.memberno is defined %}

@@ -24,6 +24,7 @@ use Doctrine\DBAL\Connection;

 use Symfony\Component\HttpFoundation\RequestStack;

 use Symfony\Component\HttpFoundation\Response;

 use Symfony\Component\Routing\Annotation\Route;

+use Symfony\Contracts\Translation\TranslatorInterface;

 use Twig\Environment as TwigEnvironment;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

@@ -39,13 +40,15 @@ class WeinanlieferungBookingsController extends AbstractController

     private $tokenManager;

     private $request;

     private $db;

+    private $translator;

-    public function __construct(TwigEnvironment $twig, ContaoCsrfTokenManager $tokenManager, RequestStack $requestStack, Connection $db)

+    public function __construct(TwigEnvironment $twig, ContaoCsrfTokenManager $tokenManager, RequestStack $requestStack, Connection $db, TranslatorInterface $translator)

     {

         $this->twig = $twig;

         $this->tokenManager = $tokenManager;

         $this->request = $requestStack->getCurrentRequest();

         $this->db = $db;

+        $this->translator = $translator;

         $container = System::getContainer();

         $objSession = $container->get('session');

@@ -192,11 +195,19 @@ class WeinanlieferungBookingsController extends AbstractController

                         $strStandort = $Standort->title;

                     }

+                    // Unit

+                    $unitLabel = $this->translator->trans('tl_vr_wa_units.containers.0', [], 'contao_tl_vr_wa_units');

+                    if (($Unit = $booking->getRelated('unit')) !== null)

+                    {

+                        $unitLabel = $Unit->title;

+                    }

+

                     $arrData['days'][$day->dayBegin][$Slot->pid]['times'][$Slot->time]['items'][] = array_merge($booking->row(), [

                         'sorte'              => $arrSorten,

                         'ernteart' => $arrErnteart,

                         'lage' => $arrLagen,

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

+                        'unit' => $unitLabel,

                         'standort' => $strStandort,

                         'member' => $booking->getRelated('uid') !== null ? $booking->getRelated('uid')->row() : null

                     ]);

@@ -15,20 +15,27 @@ namespace vonRotenberg\WeinanlieferungBundle\EventListener\DataContainer;

 use Contao\CoreBundle\ServiceAnnotation\Callback;

 use Contao\DataContainer;

 use Contao\Date;

+use Contao\Input;

 use Contao\StringUtil;

 use Doctrine\DBAL\Connection;

+use Symfony\Contracts\Translation\TranslatorInterface;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungUnitsModel;

 class WeinanlieferungReservationContainerListener

 {

     /** @var Connection */

     protected $db;

-    public function __construct(Connection $db)

+    private $translator;

+

+

+    public function __construct(Connection $db,TranslatorInterface $translator)

     {

         $this->db = $db;

+        $this->translator = $translator;

     }

@@ -145,4 +152,52 @@ class WeinanlieferungReservationContainerListener

         return $arrData;

     }

+

+    /**

+     * @Callback(table="tl_vr_wa_reservation", target="fields.unit.options")

+     */

+    public function onUnitsOptionsCallback(DataContainer $dc)

+    {

+        $arrOptions = [];

+

+        if (

+            ($Slot = WeinanlieferungSlotsModel::findByPk($dc->activeRecord->pid)) !== null

+            && ($Site = $Slot->getRelated('pid')) !== null

+        )

+        {

+            if (($Units = $Site->getRelated('units')) !== null)

+            {

+                foreach ($Units as $unit)

+                {

+                    $arrOptions[$unit->id] = $unit->title . ' (' . $unit->containers . ' '.$this->translator->trans('tl_vr_wa_units.containers.0', [], 'contao_tl_vr_wa_units').')';

+                }

+            }

+

+        }

+

+

+        return $arrOptions;

+    }

+

+    /**

+     * @Callback(table="tl_vr_wa_reservation", target="fields.amount.save")

+     */

+    public function adjustContainers($varValue, DataContainer $dc)

+    {

+        $intUnit = (Input::post('unit') !== null) ? intval(Input::post('unit')) : intval($dc->activeRecord->unit);

+

+        $intContainers = $varValue;

+

+        if ($intUnit)

+        {

+            if (($Unit = WeinanlieferungUnitsModel::findByPk($intUnit)) !== null)

+            {

+                $intContainers = intval($varValue) * intval($Unit->containers);

+            }

+        }

+

+        $this->db->update($dc->table,['behaelter'=>$intContainers],['id'=>$dc->activeRecord->id]);

+

+        return $varValue;

+    }

 }