fix #2990 @1

diff --git a/.env.production b/.env.production
index 2480041853a0701ae723adfffa23e27b9a8a7c11..f46442f172fdbf6b76c5e18980ebe1425e784680 100644 (file)
--- a/.env.production
+++ b/.env.production
@@ -54,9 +54,9 @@ ELASTICSEARCH_USER=
 ELASTICSEARCH_PASS=
 ELASTICSEARCH_INDEX_NAME=pmi
 
-FEATURE_QUOTE=false
-FEATURE_NEWS=false
-FEATURE_SEARCH=false
+FEATURE_QUOTE=true
+FEATURE_NEWS=true
+FEATURE_SEARCH=true
 FEATURE_I18N=false
 FEATURE_TEAM=false
 FEATURE_CLIENTS=false

diff --git a/.env.staging b/.env.staging
index 1c94da67a9369cc4aae4eef849e0259a91239990..460ed5a985cd7f9060478084cec6188ed49daefa 100644 (file)
--- a/.env.staging
+++ b/.env.staging
@@ -53,10 +53,11 @@ ELASTICSEARCH_USER=
 ELASTICSEARCH_PASS=
 ELASTICSEARCH_INDEX_NAME=pmi_staging
 
-FEATURE_QUOTE=false
-FEATURE_NEWS=false
-FEATURE_SEARCH=false
+FEATURE_QUOTE=true
+FEATURE_NEWS=true
+FEATURE_SEARCH=true
 FEATURE_I18N=false
 FEATURE_TEAM=false
 FEATURE_CLIENTS=false
 FEATURE_PARTNERS=false
+

diff --git a/app/Console/Commands/CMSMigration.php b/app/Console/Commands/CMSMigration.php
index 739b599fdc3d0e3cf13d12cf01befa5136e69d11..09dfd3a8b48e0714c3acc89aefc22c1e0feadb9e 100644 (file)
--- a/app/Console/Commands/CMSMigration.php
+++ b/app/Console/Commands/CMSMigration.php
@@ -17,8 +17,8 @@ class CMSMigration extends Command
         echo 'Run backup of staging' . "\n";
         `cd /home/pmi/www;php artisan backup:run`;
 
-        $tables = ['cubist_cms_pages', 'cubist_news', 'cubist_settings', 'cubist_locales', 'cubist_translate'];
-        $models = ['App\Models\Page', 'App\Models\News', 'App\Models\Locale', 'App\Models\Settings', 'App\Models\Translate'];
+        $tables = ['cubist_cms_pages', 'cubist_news', 'cubist_settings', 'cubist_locales', 'cubist_translate', 'applications'];
+        $models = ['App\Models\Page', 'App\Models\News', 'App\Models\Locale', 'App\Models\Settings', 'App\Models\Translate', 'App\Models\Application'];
         foreach ($models as $k => $model) {
             $models[$k] = '\'' . addcslashes($model, '\\') . '\'';
         }

diff --git a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
index 32b0402b829b9bf5810a2e691010618e5ff3b6f3..d68bb28d1c01c1c29c3e95af20b7079f8b8edc5a 100644 (file)
--- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
+++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
@@ -2,25 +2,28 @@
 <li><a href="{{ backpack_url('dashboard') }}"><i class="fa fa-dashboard"></i>
         <span>{{ trans('backpack::base.dashboard') }}</span></a></li>
 
-@can('dev')
-    <li class="header">Edition</li>
-@endcan
+
 @can('backpack_edition')
-    @can('dev')
-        <li><a href='{{ backpack_url('page') }}'><i class='fa fa-file-o'></i> <span>Pages</span></a></li>
-        <li><a href="{{ backpack_url('news') }}"><i class="fa fa-newspaper-o"></i> <span>News</span></a></li>
-        <li><a href="{{ backpack_url('application') }}"><i class="fa fa-archive"></i> <span>Applications</span></a></li>
-        @can('backpack_settings')
-            <li><a href='{{ backpack_url('settings') }}'><i class='fa fa-cog'></i> <span>Paramètres</span></a></li>
-        @endcan
-        <li class="treeview">
-            <a href="#"><i class="fa fa-globe"></i> <span>Traductions</span> <i class="fa fa-angle-left pull-right"></i></a>
-            <ul class="treeview-menu">
-                <li><a href="{{ url(config('backpack.base.route_prefix', 'admin').'/locale') }}"><i class="fa fa-flag-checkered"></i> Langues</a></li>
-                <li><a href="{{ url(config('backpack.base.route_prefix', 'admin').'/translate') }}"><i class="fa fa-language"></i> Traductions</a></li>
-            </ul>
-        </li>
+    <li class="header">Edition</li>
+    <li><a href='{{ backpack_url('page') }}'><i class='fa fa-file-o'></i> <span>Pages</span></a></li>
+    <li><a href="{{ backpack_url('news') }}"><i class="fa fa-newspaper-o"></i> <span>News</span></a></li>
+    <li><a href="{{ backpack_url('application') }}"><i class="fa fa-archive"></i> <span>Applications</span></a></li>
+    @can('backpack_settings')
+        <li><a href='{{ backpack_url('settings') }}'><i class='fa fa-cog'></i> <span>Paramètres</span></a></li>
     @endcan
+    <li class="treeview">
+        <a href="#"><i class="fa fa-globe"></i> <span>Traductions</span> <i class="fa fa-angle-left pull-right"></i></a>
+        <ul class="treeview-menu">
+            @can('backpack_settings')
+                <li><a href="{{ url(config('backpack.base.route_prefix', 'admin').'/locale') }}"><i
+                            class="fa fa-flag-checkered"></i> Langues</a></li>
+            @endcan
+            @can('backpack_translation')
+                <li><a href="{{ url(config('backpack.base.route_prefix', 'admin').'/translate') }}"><i
+                            class="fa fa-language"></i> Traductions</a></li>
+            @endcan
+        </ul>
+    </li>
     <li class="header">Édition du catalogue de produits</li>
     <li><a href='{{ backpack_url('product') }}'><i class='fa fa-book'></i> <span>Produits</span></a></li>
     <li><a href='{{ backpack_url('producttype') }}'><i class='fa fa-wpforms'></i> <span>Types de produit</span></a>
@@ -28,33 +31,31 @@
     <li><a href='{{ backpack_url('specification') }}'><i class='fa fa-align-left'></i>
             <span>Spécifications</span></a>
     </li>
-    <li><a href='{{ backpack_url('quotes') }}'><i class='fa fa-table'></i>
-            <span>Demandes de devis</span></a>
-    </li>
-{{--    <li><a href='{{ backpack_url('catalog_category') }}'><i class='fa fa-folder-open'></i>--}}
-{{--            <span>Catégories</span></a>--}}
-{{--    </li>--}}
+    {{--    <li><a href='{{ backpack_url('catalog_category') }}'><i class='fa fa-folder-open'></i>--}}
+    {{--            <span>Catégories</span></a>--}}
+    {{--    </li>--}}
 @endcan
 
-@can('dev')
-    @can('backpack_maintenance')
-        <li class="header">Administration</li>
-        <li class="treeview">
-            <a href="#"><i class="fa fa-group"></i> <span>Users, Roles, Permissions</span> <i
-                    class="fa fa-angle-left pull-right"></i></a>
-            <ul class="treeview-menu">
-                <li><a href="{{ backpack_url('user') }}"><i class="fa fa-user"></i> <span>Users</span></a></li>
-                <li><a href="{{ backpack_url('role') }}"><i class="fa fa-group"></i> <span>Roles</span></a></li>
-                <li><a href="{{ backpack_url('permission') }}"><i class="fa fa-key"></i> <span>Permissions</span></a>
-                </li>
-            </ul>
-        </li>
-        <li class="header">Maintenance</li>
-        <li><a href='{{ backpack_url('backup') }}'><i class='fa fa-hdd-o'></i> <span>Backups</span></a></li>
-        <li><a href='{{ backpack_url('log') }}'><i class='fa fa-terminal'></i> <span>Logs</span></a></li>
-    @endcan
-{{--    <li><a href="{{ backpack_url('elfinder') }}"><i class="fa fa-files-o"></i>--}}
-{{--            <span>{{ trans('backpack::crud.file_manager') }}</span></a></li>--}}
+@can('backpack_sales')
+    <li class="header">Gestion des demandes de devis</li>
+    <li><a href='{{ backpack_url('quotes') }}'><i class='fa fa-table'></i> <span>Demandes de devis</span></a>
+    </li>
 @endcan
 
+@can('backpack_maintenance')
+    <li class="header">Administration</li>
+    <li class="treeview">
+        <a href="#"><i class="fa fa-group"></i> <span>Users, Roles, Permissions</span> <i
+                class="fa fa-angle-left pull-right"></i></a>
+        <ul class="treeview-menu">
+            <li><a href="{{ backpack_url('user') }}"><i class="fa fa-user"></i> <span>Users</span></a></li>
+            <li><a href="{{ backpack_url('role') }}"><i class="fa fa-group"></i> <span>Roles</span></a></li>
+            <li><a href="{{ backpack_url('permission') }}"><i class="fa fa-key"></i> <span>Permissions</span></a>
+            </li>
+        </ul>
+    </li>
+    <li class="header">Maintenance</li>
+    <li><a href='{{ backpack_url('backup') }}'><i class='fa fa-hdd-o'></i> <span>Backups</span></a></li>
+    <li><a href='{{ backpack_url('log') }}'><i class='fa fa-terminal'></i> <span>Logs</span></a></li>
+@endcan