wait #7933 @0:40

diff --git a/app/SubForms/News.php b/app/SubForms/News.php
index e0f4a6482c421b897f20cecb37179bdf325e2593..a3837115e2f7777c0e0f8a6ad602b6251528d82c 100644 (file)
--- a/app/SubForms/News.php
+++ b/app/SubForms/News.php
@@ -44,7 +44,7 @@ class News extends SubForm
             'type' => 'Text']);
 
         $this->addField(['name' => 'page_product',
-            'label' => 'Page produit',
+            'label' => 'Lien vers une page produit',
             'type' => 'SelectFromArray',
             'options' => self::getDataByTable('catalog_products'),
             'multiple' => false,
@@ -52,18 +52,25 @@ class News extends SubForm
         ]);
 
         $this->addField(['name' => 'page_page',
-            'label' => 'Page generale',
+            'label' => 'Lien vers une page generale',
             'type' => 'SelectFromArray',
             'options' => self::getDataByTable('cubist_cms_pages'),
             'multiple' => false,
         ]);
 
         $this->addField(['name' => 'page_news',
-            'label' => 'Page actualités',
+            'label' => 'Lien vers une page actualités',
             'type' => 'SelectFromArray',
             'options' => self::getDataByTable('cubist_news'),
             'multiple' => false,
         ]);
+
+        $this->addField(['name' => 'page_application',
+            'label' => 'Lien vers une page application',
+            'type' => 'SelectFromArray',
+            'options' => self::getDataByTable('applications'),
+            'multiple' => false,
+        ]);
     }
 
     public function getDataByTable($table, $column = 'id') {

diff --git a/resources/views/pages/our_solutions.blade.php b/resources/views/pages/our_solutions.blade.php
index af9f5cd19ce2962c84feeccd53ab16f892057c39..053ec8180771fe48721efe295f940df24ad51962 100644 (file)
--- a/resources/views/pages/our_solutions.blade.php
+++ b/resources/views/pages/our_solutions.blade.php
@@ -113,13 +113,13 @@
         <content>
             <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)
+                @foreach ($our_solutions_items as $key => $item)
                     @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']))
+                        @php($link = App\Models\Page::find($item['page_page'])->getPageData()['slug'])
                     @elseif(!empty($item['page_news']))
                         @php($prefix = 'news')
                         @php($link = Cubist\Backpack\app\Magic\Menu\Menu::getNavigation()->getHrefByID('news/'.$item['page_news']))