wait #7706 @1:30

diff --git a/app/SubForms/OurSolutionsUSP.php b/app/SubForms/OurSolutionsUSP.php
index d7179096c7e34d3e6caf43cee13071bc05b7d67b..479704f7e1d9e6d69d3f30ebd8387ff61b6d5a09 100644 (file)
--- a/app/SubForms/OurSolutionsUSP.php
+++ b/app/SubForms/OurSolutionsUSP.php
@@ -8,9 +8,9 @@ use App\SubForms\News;
 
 class OurSolutionsUSP extends SubForm
 {
-    public function getNews() {
+    public function getNews($table) {
         $instance = new News();
-        return $instance->getDataByTable('cubist_cms_pages');
+        return $instance->getDataByTable($table);
     }
 
     public function init()
@@ -32,11 +32,33 @@ class OurSolutionsUSP extends SubForm
             'label' => 'Image',
             'type' => 'Images']);
 
-        $this->addField(['name' => 'page',
-            'label' => 'Lien vers',
+        $this->addField(['name' => 'page_product',
+            'label' => 'Lien vers une page produit',
             'type' => 'SelectFromArray',
-            'options' => self::getNews(),
-            'multiple' => false
+            'options' => $this->getNews('catalog_products'),
+            'multiple' => false,
+            'default' => ''
+        ]);
+
+        $this->addField(['name' => 'page_page',
+            'label' => 'Lien vers une page generale',
+            'type' => 'SelectFromArray',
+            'options' => $this->getNews('cubist_cms_pages'),
+            'multiple' => false,
+        ]);
+
+        $this->addField(['name' => 'page_news',
+            'label' => 'Lien vers une page actualités',
+            'type' => 'SelectFromArray',
+            'options' => $this->getNews('cubist_news'),
+            'multiple' => false,
+        ]);
+
+        $this->addField(['name' => 'page_application',
+            'label' => 'Lien vers une page application',
+            'type' => 'SelectFromArray',
+            'options' => $this->getNews('applications'),
+            'multiple' => false,
         ]);
     }
 }

diff --git a/resources/views/pages/our_solutions.blade.php b/resources/views/pages/our_solutions.blade.php
index ae0197e305f3ba38c0a3a07d913258fe8b53d32d..af9f5cd19ce2962c84feeccd53ab16f892057c39 100644 (file)
--- a/resources/views/pages/our_solutions.blade.php
+++ b/resources/views/pages/our_solutions.blade.php
@@ -114,9 +114,24 @@
             <text-block :title="__('Nos solutions')" title-class="h1 text-inherit" />
             <grid cols="3" class="sm:grid-cols-2 xs:grid-cols-1">
                 @foreach ($our_solutions_items as $item)
-                    @isset($item['page'])
+                    @if(!empty($item['page_product']))
+                        @php($prefix = 'product')
+                        @php($link = App\Models\Product::find($item['page_product'])->getPageData()['slug'])
+                    @elseif(!empty($item['page_page']))
+                        @php($prefix = 'page')
+                        @php($link = Cubist\Backpack\app\Magic\Menu\Menu::getNavigation()->getHrefByID('page/'.$item['page_page']))
+                    @elseif(!empty($item['page_news']))
+                        @php($prefix = 'news')
+                        @php($link = Cubist\Backpack\app\Magic\Menu\Menu::getNavigation()->getHrefByID('news/'.$item['page_news']))
+                    @elseif(!empty($item['page_application']))
+                        @php($prefix = 'application')
+                        @php($link = Cubist\Backpack\app\Magic\Menu\Menu::getNavigation()->getHrefByID('application/'.$item['page_application']))
+                    @endif
+
+
+                    @if(!empty($prefix))
                     <div class="">
-                        <a href="{{ $nav->getHrefById('product/'.$item['page']) }}">
+                        <a href="{{ $link }}">
                             <div class="bg-cover mb-8" style="padding-bottom: 56.25%; background-image: url({{ $page->getImageURLbyCollection($item['image']) }})">
                             </div>
                         </a>
@@ -125,7 +140,7 @@
                                 {{ $item['title'] }}
                             </h3>
                             <p>{{ $item['text'] }}</p>
-                            <a href="{{ $nav->getHrefById('product/'.$item['page']) }}">{{ __('Découvrir') }}</a>
+                            <a href="{{ $link  }}">{{ __('Découvrir') }}</a>
                         </div>
                     </div>
                     @endisset
@@ -147,17 +162,19 @@
 
                         @if(!empty($item['page_product']))
                             @php($prefix = 'product')
+                            @php($link = App\Models\Product::find($item['page_product'])->getPageData()['slug'])
                         @elseif(!empty($item['page_page']))
                             @php($prefix = 'page')
+                            @php($link = Cubist\Backpack\app\Magic\Menu\Menu::getNavigation()->getHrefByID('page/'.$item['page_page']))
                         @elseif(!empty($item['page_news']))
                             @php($prefix = 'news')
+                            @php($link = Cubist\Backpack\app\Magic\Menu\Menu::getNavigation()->getHrefByID('news/'.$item['page_news']))
+                        @elseif(!empty($item['page_application']))
+                            @php($prefix = 'application')
+                            @php($link = Cubist\Backpack\app\Magic\Menu\Menu::getNavigation()->getHrefByID('application/'.$item['page_application']))
                         @endif
                         <article>
-                            <pre style="display: none;">
-                                <?php dump("prefix",$prefix.'/'.$item['page_'.$prefix]) ?>
-                            </pre>
-
-                            <a href="{{ $nav->getHrefById($prefix.'/'.$item['page_'.$prefix]) }}" class="news-index-article-image block bg-grey-100">
+                            <a href="{{ $link }}" class="news-index-article-image block bg-grey-100">
                                 <img src="{{ $page->getImageURLbyCollection($item['image']) }}" />
                             </a>
 
@@ -167,13 +184,13 @@
                                     {{ $item['date'] }}
                                 </time>
                                 <h4 class="text-2xl sm:text-xl">
-                                    <a class="text-navy" href="{{ $nav->getHrefById($prefix.'/'.$item['page_'.$prefix]) }}">
+                                    <a class="text-navy" href="{{ $link }}">
                                         {{ $item['title'] }}
                                     </a>
                                 </h4>
                                 <p>{{ $item['text'] }}</p>
 
-                                <p><a href="{{ $nav->getHrefById($prefix.'/'.$item['page_product']) }}">{{ __("En savoir plus") }}</a></p>
+                                <p><a href="{{ $link }}">{{ __("En savoir plus") }}</a></p>
                             </div>
 
                         </article>