Merge pull request #1237 from Blair2004/v4.8.x

V4.8.x

Author: nexopos

.gitignore

@@ -28,6 +28,7 @@ public/css/*.css
 !public/css/app.*.css
 !public/css/light.*.css
 !public/css/dark.*.css
+!public/css/fonts.*.css
 !public/css/typography.*.css
 !public/css/grid.*.css
 !public/css/animations.*.css

app/Services/CrudService.php

@@ -493,31 +493,32 @@ public function getEntries( $config = [] ): array
         $columnsLongName = [];
 
         /**
-         * Let's loop relation if they exists
+         * First loop to retreive the columns and rename it
          */
-        if ( $this->getRelations() ) {
-            /**
-             * First loop to retreive the columns and rename it
-             */
-            $select = [];
+        $select = [];
 
-            /**
-             * Building Select field for primary table
-             * We're caching the table columns, since we would like to
-             * avoid many DB Calls
-             */
-            if ( ! empty( Cache::get( 'table-columns-' . $table ) ) && true === false ) {
-                $columns = Cache::get( 'table-columns-' . $table );
-            } else {
-                $columns = Schema::getColumnListing( $table );
-                Cache::put( 'table-columns-' . $table, $columns, Carbon::now()->addDays(1) );
-            }
+        /**
+         * Building Select field for primary table
+         * We're caching the table columns, since we would like to
+         * avoid many DB Calls
+         */
+        if ( ! empty( Cache::get( 'table-columns-' . $table ) ) && true === false ) {
+            $columns = Cache::get( 'table-columns-' . $table );
+        } else {
+            $columns = Schema::getColumnListing( $table );
+            Cache::put( 'table-columns-' . $table, $columns, Carbon::now()->addDays(1) );
+        }
 
-            foreach ( $columns as $index => $column ) {
-                $__name = $table . '.' . $column;
-                $columnsLongName[] = $__name;
-                $select[] = $__name . ' as ' . $column;
-            }
+        foreach ( $columns as $index => $column ) {
+            $__name = $table . '.' . $column;
+            $columnsLongName[] = $__name;
+            $select[] = $__name . ' as ' . $column;
+        }
+        
+        /**
+         * Let's loop relation if they exists
+         */
+        if ( $this->getRelations() ) {
 
             /**
              * we're extracting the joined table

config/nexopos.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'version' => '4.8.11',
+    'version' => '4.8.12',
     'languages' => [
         'en' => 'English',
         'fr' => 'Français',

public/css-manifest.json

@@ -1,6 +1,6 @@
 {
   "animations.css": "animations.cb4544d9bb06aeaa8e48.css",
-  "app.css": "app.f9fb82c1b0295a171e9f.css",
+  "app.css": "app.8e6b5ebc12879ff51a1b.css",
   "typography.css": "typography.5d798833a07dd150efa8.css",
   "fonts.css": "fonts.64053e5a2ec1dd65399b.css",
   "light.css": "light.9e990100ce36c59d8156.css",