... | ... |
@@ -36,6 +36,8 @@ |
36 | 36 |
<div class="col-1 time icon-uhr-outline"> |
37 | 37 |
<div class="t-label">Uhrzeit</div> |
38 | 38 |
{{ booking.slot.time|date('H:i') }} |
39 |
+ <div class="t-label">Standort</div> |
|
40 |
+ {{ booking.standort }} |
|
39 | 41 |
</div> |
40 | 42 |
<div class="col-3 behaelter icon-behaelter-outline"> |
41 | 43 |
<div class="t-label">Gebuchte Behälterkapazität</div> |
... | ... |
@@ -122,11 +122,18 @@ class WeinanlieferungBookingsController extends AbstractController |
122 | 122 |
} |
123 | 123 |
} |
124 | 124 |
|
125 |
+ $strStandort = ''; |
|
126 |
+ if (($Standort = $Slot->getRelated('pid')) !== null) |
|
127 |
+ { |
|
128 |
+ $strStandort = $Standort->title; |
|
129 |
+ } |
|
130 |
+ |
|
125 | 131 |
$arrData['days'][$day->dayBegin][$Slot->time]['items'][] = array_merge($booking->row(), [ |
126 | 132 |
'sorte' => $arrSorten, |
127 | 133 |
'ernteart' => $arrErnteart, |
128 | 134 |
'lage' => $arrLagen, |
129 | 135 |
'slot' => $Slot->row(), |
136 |
+ 'standort' => $strStandort, |
|
130 | 137 |
'member' => $booking->getRelated('uid') !== null ? $booking->getRelated('uid')->row() : null |
131 | 138 |
]); |
132 | 139 |
} |
... | ... |
@@ -112,6 +112,8 @@ class WeinanlieferungReservationContainerListener |
112 | 112 |
$arrSorten = []; |
113 | 113 |
$intAvailableBehaelter = $slot->getAvailableBehaelter(); |
114 | 114 |
|
115 |
+ $Standort = $slot->getRelated('pid'); |
|
116 |
+ |
|
115 | 117 |
$Sorten = StringUtil::deserialize($slot->sorten,true); |
116 | 118 |
foreach($Sorten as $sorte) |
117 | 119 |
{ |
... | ... |
@@ -119,7 +121,7 @@ class WeinanlieferungReservationContainerListener |
119 | 121 |
$objLeseart = WeinanlieferungLeseartModel::findByPk($sorte['leseart']); |
120 | 122 |
$arrSorten[] = ($objSorte !== null ? $objSorte->title : '') . ' ' . ($objLeseart !== null ? $objLeseart->title : ''); |
121 | 123 |
} |
122 |
- $arrData[$slot->id] = Date::parse(Date::getNumericDatimFormat(),$slot->time) . ' - (' . implode(', ',$arrSorten) . ') [Verfügbare Behälter: ' . $intAvailableBehaelter . '/' . $slot->behaelter . ']'; |
|
124 |
+ $arrData[$slot->id] = Date::parse(Date::getNumericDatimFormat(),$slot->time) . ' - ' . ($Standort !== null ? $Standort->title : $slot->pid) . ' - (' . implode(', ',$arrSorten) . ') [Verfügbare Behälter: ' . $intAvailableBehaelter . '/' . $slot->behaelter . ']'; |
|
123 | 125 |
} |
124 | 126 |
|
125 | 127 |
return $arrData; |