feat: Only display CTA application on school page if displayOnWebsite… (

#764)
helsingborg-stad · Nov 16, 2023 · 4114fa1 · 4114fa1
1 parent dff455f
commit 4114fa1
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 30 deletions.
diff --git a/library/Controller/ContentType/School/SchoolDataPreparer.php b/library/Controller/ContentType/School/SchoolDataPreparer.php
@@ -278,7 +278,12 @@ private function appendViewApplicationData(): void
     {
         $this->data['application'] = [];
 
-        $this->data['application']['displayOnWebsite'] = (bool) $this->postMeta->ctaApplication->display_on_website;
+
+        $this->data['application']['displayOnWebsite'] = true;
+        if( false === $this->postMeta->ctaApplication->display_on_website || 0 === $this->postMeta->ctaApplication->display_on_website ) 
+        {
+            $this->data['application']['displayOnWebsite'] = false;
+        }
 
         $this->data['application']['title'] = $this->postMeta->ctaApplication->title ?: sprintf(__('Do you want to apply to %s?', 'municipio'), get_queried_object()->post_title);
         $this->data['application']['description'] = $this->postMeta->ctaApplication->description ?: '';

diff --git a/views/v3/content-type-school.blade.php b/views/v3/content-type-school.blade.php
@@ -85,39 +85,40 @@
     @endif
 
 
-    @paper(['classList' => ['u-color__bg--complementary-lighter', 'u-padding--4']])
+    @if ($application['displayOnWebsite'])
 
-        @typography(['element' => 'h2'])
-            {{ $application['title'] }}
-        @endtypography
-
-        @typography(['element' => 'p', 'classList' => ['u-margin__bottom--3']])
-            {{ $application['description'] }}
-        @endtypography
+        @paper(['classList' => ['u-color__bg--complementary-lighter', 'u-padding--4']])
+            @typography(['element' => 'h2'])
+                {{ $application['title'] }}
+            @endtypography
 
-        @if ($application['apply'])
-            @button([
-                'text' => $application['apply']['text'],
-                'href' => $application['apply']['url'],
-                'color' => 'primary',
-                'style' => 'filled',
-                'size' => 'lg',
-            ])
-            @endbutton
-        @endif
+            @typography(['element' => 'p', 'classList' => ['u-margin__bottom--3']])
+                {{ $application['description'] }}
+            @endtypography
 
-        @if ($application['howToApply'])
-            @button([
-                'text' => $application['howToApply']['text'],
-                'href' => $application['howToApply']['url'],
-                'color' => 'secondary',
-                'style' => 'filled',
-                'size' => 'lg',
-            ])
-            @endbutton
-        @endif
+            @if ($application['apply'])
+                @button([
+                    'text' => $application['apply']['text'],
+                    'href' => $application['apply']['url'],
+                    'color' => 'primary',
+                    'style' => 'filled',
+                    'size' => 'lg',
+                ])
+                @endbutton
+            @endif
 
-    @endpaper
+            @if ($application['howToApply'])
+                @button([
+                    'text' => $application['howToApply']['text'],
+                    'href' => $application['howToApply']['url'],
+                    'color' => 'secondary',
+                    'style' => 'filled',
+                    'size' => 'lg',
+                ])
+                @endbutton
+            @endif
+        @endpaper
+    @endif
 
     @if ($contacts)