fix: correct handling of formatted_price in view

helsingborg-stad · Mar 20, 2024 · 04f5b16 · 04f5b16
1 parent 39f5bd4
commit 04f5b16
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 21 deletions.
diff --git a/views/single-event.blade.php b/views/single-event.blade.php
@@ -4,21 +4,21 @@
 @stop
 
 @section('above')
-@if(!empty($event['image_src']))
-    @segment([
-        'layout'            => 'full-width',
-        'image'             => $event['image_src'],
-        'background'        => 'primary',
-        'textColor'         => 'light',
-        'overlay'           => 'dark',
-        'classList'         => ['modularity-event-hero', 'u-margin__bottom--5'],
-        'textAlignment'     => 'center',
-        'title'             => get_the_title(),
-        'subTitle'          => 123,
-        'content'           => $event['occasion']['formatted'] ?? false,
-    ])
-    @endsegment
-@endif
+    @if(!empty($event['image_src']))
+        @segment([
+            'layout'            => 'full-width',
+            'image'             => $event['image_src'],
+            'background'        => 'primary',
+            'textColor'         => 'light',
+            'overlay'           => 'dark',
+            'classList'         => ['modularity-event-hero', 'u-margin__bottom--5'],
+            'textAlignment'     => 'center',
+            'title'             => get_the_title(),
+            'subTitle'          => 123,
+            'content'           => $event['occasion']['formatted'] ?? false,
+        ])
+        @endsegment
+    @endif
 @stop
 
 @section('content')
@@ -29,7 +29,7 @@
             ])
             @enddatebadge
         @endif
-        
+
         @typography([
             'variant' => 'h1',
             'element' => 'span',
@@ -45,7 +45,7 @@
         @if(!empty($event['introText']))
             {!! $event['introText'] !!}
         @endif
-        
+
         @if(!empty($event['booking_link']) || !empty($event['ticket_includes']))
             <div class="{{ !empty($event['introText']) ? 'u-margin__y--4' : 'u-margin__bottom--4'}}">
                 @include('widgets.ticket')

diff --git a/views/widgets/additional-ticket-types.blade.php b/views/widgets/additional-ticket-types.blade.php
@@ -10,16 +10,16 @@
                             <strong>{{ $ticketType['ticket_name'] }}</strong>
                         @endtypography
                     @endif
-                    
+
                     <ul role="list" aria-labelledby="single-event-tickettypes-{{$index}}">
                         @if(!empty($ticketType['ticket_type']))
                             <li role="listitem">
-                                <span hidden id="single-event-tickettypes-{{$index}}-type">{{ $eventLang->ticketType }}:</span> 
+                                <span hidden id="single-event-tickettypes-{{$index}}-type">{{ $eventLang->ticketType }}:</span>
                                 <strong aria-labelledby="single-event-tickettypes-{{$index}}-type">{{ strtolower($ticketType['ticket_type']) === 'seated' ? $eventLang->ticketSeated : $eventLang->ticketStanding }}</strong>
                             </li>
                         @endif
 
-                        @if($ticketType['minimum_price']['formatted_price'])
+                        {{-- @if($ticketType['minimum_price']['formatted_price'])
                             <li role="listitem">
                                 <strong id="single-event-tickettypes-{{$index}}-pricemin">{{ $eventLang->priceMin }}:</strong>
                                 <span aria-labelledby="single-event-tickettypes-{{$index}}-pricemin">{{ $ticketType['minimum_price']['formatted_price'] }}</span>
@@ -31,10 +31,24 @@
                                 <strong id="single-event-tickettypes-{{$index}}-pricemax">{{ $eventLang->priceMax }}:</strong>
                                 <span aria-labelledby="single-event-tickettypes-{{$index}}-pricemax">{{ $ticketType['maximum_price']['formatted_price'] }}</span>
                             </li>
+                        @endif --}}
+                        @if($ticketType['minimum_price'] && is_array($ticketType['minimum_price']) && array_key_exists('formatted_price', $ticketType['minimum_price']))
+                            <li role="listitem">
+                                <strong id="single-event-tickettypes-{{$index}}-pricemin">{{ $eventLang->priceMin }}:</strong>
+                                <span aria-labelledby="single-event-tickettypes-{{$index}}-pricemin">{{ $ticketType['minimum_price']['formatted_price'] }}</span>
+                            </li>
+                        @endif
+
+                        @if($ticketType['maximum_price'] && is_array($ticketType['maximum_price']) && array_key_exists('formatted_price', $ticketType['maximum_price']))
+                            <li role="listitem">
+                                <strong id="single-event-tickettypes-{{$index}}-pricemax">{{ $eventLang->priceMax }}:</strong>
+                                <span aria-labelledby="single-event-tickettypes-{{$index}}-pricemax">{{ $ticketType['maximum_price']['formatted_price'] }}</span>
+                            </li>
                         @endif
+
                     </ul>
                 @endforeach
             @endif
         </div>
     @endcard
-@endif
+@endif