diff --git a/code/resources/views/delivery/edit.blade.php b/code/resources/views/delivery/edit.blade.php index 71be2f9a..b29eafc5 100644 --- a/code/resources/views/delivery/edit.blade.php +++ b/code/resources/views/delivery/edit.blade.php @@ -9,6 +9,10 @@ $master_summary = $aggregate->reduxData(); $currency_symbol = defaultCurrency()->symbol; +$other_bookings = $user->bookings()->where('status', 'pending')->whereHas('order', function($query) use ($aggregate) { + $query->where('aggregate_id', '!=', $aggregate->id)->where('shipping', $aggregate->shipping); +})->get(); + /* In fase di consegna, aggrego sempre tutte le quantità */ @@ -37,12 +41,27 @@
@foreach($user->contacts as $contact) @if($contact->type == 'phone' || $contact->type == 'mobile') - + @endif @endforeach
+ @if($other_bookings->count()) +
+
+
+ {{ _i('Questa persona oggi deve ritirare anche altre prenotazioni:') }} +
    + @foreach($other_bookings as $ob) +
  • {{ $ob->order->printableName() }}
  • + @endforeach +
+
+
+
+ @endif + @foreach($aggregate->orders as $order) @if($more_orders)

{{ $order->printableName() }}