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

         (

             'exclude'                 => true,

             'inputType'               => 'text',

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

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

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

         ),

         'unit_id' => array

@@ -15,6 +15,7 @@ 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\Component\EventDispatcher\EventDispatcherInterface;

@@ -23,6 +24,7 @@ use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungReservationModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungUnitModel;

 class WeinanlieferungReservationContainerListener

 {

@@ -365,15 +367,39 @@ class WeinanlieferungReservationContainerListener

      */

     public function onSubmitCallback(DataContainer $dc)

     {

-        if (($reservation = WeinanlieferungReservationModel::findByPk($dc->id)) !== null && $reservation->checked_in)

+        if (($reservation = WeinanlieferungReservationModel::findByPk($dc->id)) !== null)

         {

-            $time = time();

-            $reservation->checked_in = '1';

-            $reservation->checked_in_on = $time;

-            $reservation->save();

+            // Handle checck-in

+            if ($reservation->checked_in)

+            {

+                $time = time();

+                $reservation->checked_in = '1';

+                $reservation->checked_in_on = $time;

+                $reservation->save();

+

+                $event = new CheckInCompletedEvent($reservation->row(), $reservation);

+                $this->eventDispatcher->dispatch($event, CheckInCompletedEvent::NAME);

+            }

-            $event = new CheckInCompletedEvent($reservation->row(), $reservation);

-            $this->eventDispatcher->dispatch($event, CheckInCompletedEvent::NAME);

+            // Handle units

+            if ($reservation->unit_amount)

+            {

+                // recompute the base units

+                $unitId = (int)$reservation->unit_id;

+                $unitAmount = (int)$reservation->unit_amount;

+                $multiplier = 1;

+                if ($unitId > 0)

+                {

+                    if (($u = WeinanlieferungUnitModel::findByPk($unitId)) !== null)

+                    {

+                        $multiplier = max(1, (int)$u->multiplier);

+                    }

+                }

+

+                $intBehaelter = $unitAmount * $multiplier;

+                $reservation->behaelter = $intBehaelter;

+                $reservation->save();

+            }

         }

     }