[WIP] Next Demo version

.env.example

@@ -6,12 +6,12 @@ APP_URL=http://localhost
 BACKPACK_THEME=backpack.theme-tabler
 
 # MySQL Database Connection
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
+#DB_CONNECTION=mysql
+#DB_HOST=127.0.0.1
+#DB_PORT=3306
+#DB_DATABASE=homestead
+#DB_USERNAME=homestead
+#DB_PASSWORD=secret
 
 # PostgreSQL Database Connection
 #DB_CONNECTION=pgsql
@@ -22,9 +22,9 @@ DB_PASSWORD=secret
 #DB_PASSWORD=
 
 # SQLite Database Connection
-# You might also need to run 'touch storage/app/database.sqlite`  to create the db
-#DB_CONNECTION=sqlite
-#DB_DATABASE=../storage/app/database.sqlite
+# You might also need to run 'touch storage/app/database.sqlite`  to create the db if the file does not exist.
+DB_CONNECTION=sqlite
+DB_DATABASE=./storage/app/database.sqlite
 
 CACHE_DRIVER=file
 SESSION_DRIVER=file

.gitignore

@@ -15,3 +15,4 @@ Homestead.json
 /.vscode
 /packages
 /_volumes
+/public/basset

app/Console/Commands/RefreshDb.php

@@ -39,10 +39,12 @@ public function __construct()
      */
     public function handle()
     {
+        Artisan::call('down');
         Log::warning('Cleanup time. Refreshing the database.');
         Artisan::call('db:wipe --force');
         Artisan::call('migrate --force');
         Artisan::call('db:seed --force');
         Artisan::call('backup:clean');
+        Artisan::call('up');
     }
 }

app/Http/Controllers/Admin/AdminPageController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+class AdminPageController
+{
+    /**
+     * Show the new in v7 page.
+     *
+     * @return \Illuminate\View\View
+     */
+    public function newInV7()
+    {
+        return view('admin.new-in-v7', [
+            'title'       => 'New in v7',
+            'description' => 'Discover the new features and improvements in Backpack v7.',
+        ]);
+    }
+}

app/Http/Controllers/Admin/CaveCrudController.php

@@ -18,6 +18,7 @@ class CaveCrudController extends CrudController
     use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
     use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
     use \Backpack\CRUD\app\Http\Controllers\Operations\ShowOperation;
+    use \Backpack\Pro\Http\Controllers\Operations\AjaxUploadOperation { ajaxUpload as traitAjaxUpload; }
 
     /**
      * Configure the CrudPanel object. Apply settings to all operations.
@@ -147,4 +148,15 @@ public static function getMonsterSubfields()
 
         return $subfields;
     }
+
+    public function ajaxUpload()
+    {
+        if (app('env') === 'production') {
+            return response()->json(['errors' => [
+                'message' => 'Uploads are disabled in production.',
+            ]], 500);
+        }
+
+        return $this->traitAjaxUpload();
+    }
 }

app/Http/Controllers/Admin/DummyCrudController.php

@@ -21,6 +21,7 @@ class DummyCrudController extends CrudController
     use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
     use \Backpack\CRUD\app\Http\Controllers\Operations\ShowOperation;
     use \Backpack\CRUD\app\Http\Controllers\Operations\FetchOperation;
+    use \Backpack\Pro\Http\Controllers\Operations\AjaxUploadOperation { ajaxUpload as traitAjaxUpload; }
 
     public function setup()
     {
@@ -186,4 +187,15 @@ protected function groups()
 
         return $groups;
     }
+
+    public function ajaxUpload()
+    {
+        if (app('env') === 'production') {
+            return response()->json(['errors' => [
+                'message' => 'Uploads are disabled in production.',
+            ]], 500);
+        }
+
+        return $this->traitAjaxUpload();
+    }
 }

app/Http/Controllers/Admin/FluentMonsterCrudController.php

@@ -443,12 +443,6 @@ protected function setupCreateOperation()
                 ->type('summernote')
                 ->label('Summernote editor')
                 ->tab('Big texts');
-
-        CRUD::field('wysiwyg')
-                ->type('ckeditor')
-                ->label('CKEditor - also called the WYSIWYG field')
-                ->tab('Big texts');
-
         CRUD::field('tinymce')
                 ->type('tinymce')
                 ->label('TinyMCE')

app/Http/Controllers/Admin/IconCrudController.php

@@ -25,6 +25,20 @@ public function setup()
     protected function setupListOperation()
     {
         $this->crud->addColumns(['name', 'icon']);
+
+        $this->crud->addFilter([
+            'type'  => 'date_range',
+            'name'  => 'created_at',
+            'label' => 'Created At',
+        ], null, function ($value) {
+            $value = json_decode($value, true);
+
+            // if the filter is active
+            if ($value) {
+                $this->crud->addClause('where', 'created_at', '>=', $value['from']);
+                $this->crud->addClause('where', 'created_at', '<=', $value['to']);
+            }
+        });
     }
 
     protected function setupCreateOperation()

app/Http/Controllers/Admin/MonsterCrudController.php

@@ -5,6 +5,7 @@
 use App\Http\Requests\MonsterRequest as StoreRequest;
 // VALIDATION: change the requests to match your own file names if you need form validation
 use Backpack\CRUD\app\Http\Controllers\CrudController;
+use Backpack\CRUD\app\Library\Widget;
 use Illuminate\Support\Collection;
 
 class MonsterCrudController extends CrudController
@@ -15,8 +16,8 @@ class MonsterCrudController extends CrudController
     use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
     use \Backpack\CRUD\app\Http\Controllers\Operations\ShowOperation;
     use \Backpack\CRUD\app\Http\Controllers\Operations\FetchOperation;
-    use \Backpack\Pro\Http\Controllers\Operations\DropzoneOperation { dropzoneUpload as traitDropzone; }
-    use \App\Http\Controllers\Admin\Operations\SMSOperation; //Custom Form Operation Example
+    use \Backpack\Pro\Http\Controllers\Operations\AjaxUploadOperation { ajaxUpload as traitAjaxUpload; }
+    use Operations\SMSOperation; //Custom Form Operation Example
     use \Backpack\ActivityLog\Http\Controllers\Operations\ModelActivityOperation;
     use \Backpack\ActivityLog\Http\Controllers\Operations\EntryActivityOperation;
 
@@ -64,7 +65,7 @@ public function fetchPaginatedTypes()
             ['id' => 'review', 'title' => 'Review', 'location' => 'Hybrid'],
         ];
 
-        Collection::macro('paginate', function (int $perPage = 15, int $page = null, array $options = []) {
+        Collection::macro('paginate', function (int $perPage = 15, ?int $page = null, array $options = []) {
             $page ??= \Illuminate\Pagination\Paginator::resolveCurrentPage() ?? 1;
 
             return new \Illuminate\Pagination\LengthAwarePaginator($this->forPage($page, $perPage)->toArray(), $this->count(), $perPage, $page, $options);
@@ -279,6 +280,53 @@ public function setupListOperation()
 
     public function setupShowOperation()
     {
+        // add a widget
+        Widget::add([
+            'type'       => 'datatable',
+            'controller' => 'App\Http\Controllers\Admin\IconCrudController',
+            'name'       => 'icon_crud',
+            'section'    => 'after_content',
+            'content'    => [
+                'header' => 'Icons for this monster',
+            ],
+            'wrapper'    => ['class'=> 'mb-3'],
+        ]);
+
+        Widget::add([
+            'type'       => 'datatable',
+            'controller' => 'App\Http\Controllers\Admin\ProductCrudController',
+            'name'       => 'products_datatable',
+            'section'    => 'after_content',
+            'content'    => [
+                'header' => 'Products for this monster',
+            ],
+            'wrapper'    => ['class'=> 'mb-3'],
+            'configure'  => function ($crud, $entry = null) {
+                // Customize which columns to show
+                $crud->removeAllColumns();
+                $crud->addColumn(['name' => 'name', 'label' => 'Product Name']);
+                $crud->addColumn(['name' => 'price', 'label' => 'Price']);
+
+                // Get the current monster's products
+                if ($entry) {
+                    $productIds = $entry->products->pluck('id')->toArray();
+                    if (count($productIds) > 0) {
+                        // Configure the controller to only show products related to this monster
+                        $crud->addClause('whereIn', 'id', $productIds);
+                    } else {
+                        // Force an empty result when there are no products
+                        $crud->addClause('where', 'id', 0); // This will match no products
+                    }
+
+                    // Remove buttons that aren't needed for this embedded view
+
+                    // Disable features that aren't needed
+                    $crud->denyAccess(['create', 'update', 'delete']);
+                    $crud->disableResponsiveTable();
+                }
+            },
+        ]);
+
         $this->crud->setOperationSetting('tabsEnabled', true);
         $this->setupListOperation();
 
@@ -320,13 +368,6 @@ public function setupShowOperation()
             'tab'    => 'WYSIWYG Editors',
         ]);
 
-        $this->crud->addColumn([
-            'name'    => 'wysiwyg',
-            'type'    => 'wysiwyg',
-            'label'   => 'Wysiwyg'.backpack_pro_badge(),
-            'tab'     => 'WYSIWYG Editors',
-        ]);
-
         $this->crud->addColumn([
             'name'      => 'features',
             'label'     => 'Features'.backpack_pro_badge(),
@@ -1703,10 +1744,11 @@ public static function getFieldsArrayForWysiwygEditorsTab()
                 'tab'   => 'WYSIWYG Editors',
             ],
             [   // Summernote
-                'name'  => 'summernote',
-                'label' => 'Summernote editor'.backpack_free_badge(),
-                'type'  => 'summernote',
-                'tab'   => 'WYSIWYG Editors',
+                'name'      => 'summernote',
+                'label'     => 'Summernote editor'.backpack_free_badge(),
+                'type'      => 'summernote',
+                'tab'       => 'WYSIWYG Editors',
+                'withFiles' => true,
             ],
             [   // CKEditor
                 'name'  => 'ckeditor',
@@ -1720,12 +1762,6 @@ public static function getFieldsArrayForWysiwygEditorsTab()
                 'type'  => 'tinymce',
                 'tab'   => 'WYSIWYG Editors',
             ],
-            [   // Wysiwyg
-                'name'  => 'wysiwyg',
-                'label' => 'Wysiwyg'.backpack_pro_badge(),
-                'type'  => 'wysiwyg',
-                'tab'   => 'WYSIWYG Editors',
-            ],
         ];
     }
 
@@ -1837,15 +1873,17 @@ public static function getFieldsArrayForMiscellaneousTab()
         ];
     }
 
-    public function dropzoneUpload()
+    public function ajaxUpload()
     {
         if (app('env') === 'production') {
             return response()->json(['errors' => [
-                'dropzone' => ['Uploads are disabled in production'],
+                'dropzone'   => ['Uploads are disabled in production'],
+                'easymde'    => ['Uploads are disabled in production'],
+                'summernote' => ['Uploads are disabled in production'],
             ],
             ], 500);
         }
 
-        return $this->traitDropzone();
+        return $this->traitAjaxUpload();
     }
 }

app/Http/Controllers/Admin/PetShop/InvoiceCrudController.php

@@ -5,6 +5,7 @@
 use App\Http\Requests\InvoiceRequest;
 use Backpack\CRUD\app\Http\Controllers\CrudController;
 use Backpack\CRUD\app\Library\CrudPanel\CrudPanelFacade as CRUD;
+use Backpack\CRUD\app\Library\Widget;
 
 /**
  * Class InvoiceCrudController.
@@ -53,19 +54,32 @@ public function setupLast5YearsView()
     protected function setupListOperation()
     {
         CRUD::addColumn([
-            'name'   => 'owner',
-            'label'  => 'Owner',
-            'linkTo' => [
-                'route'     => 'owner.show',
-                'target'    => '_blank',
-            ],
+            'name' => 'info',
+            'type' => 'view',
+            'view' => 'crud::chips.invoice',
         ]);
-        CRUD::column('series');
-        CRUD::column('number');
         CRUD::column('issuance_date');
         CRUD::column('due_date');
         CRUD::column('total');
 
+        CRUD::filter('series')
+            ->type('dropdown')
+            ->values(\App\Models\PetShop\Invoice::select('series')->distinct()->pluck('series', 'series')->toArray())
+            ->label('Series')
+            ->placeholder('Search by series')
+            ->whenActive(function ($value) {
+                CRUD::addClause('where', 'series', '=', $value);
+            });
+
+        CRUD::filter('issuance_date')
+            ->type('date_range')
+            ->label('Issuance Date')
+            ->placeholder('Search by issuance date')
+            ->whenActive(function ($value) {
+                $dates = json_decode($value);
+                CRUD::addClause('whereBetween', 'issuance_date', [$dates->from, $dates->to]);
+            });
+
         $this->runCustomViews();
     }
 
@@ -130,6 +144,17 @@ protected function setupShowOperation()
         $this->autoSetupShowOperation();
 
         CRUD::column('total');
+
+        // get the owner with important relationships
+        $owner = CRUD::getCurrentEntry()->owner()->with('avatar', 'invoices')->first();
+
+        // add a chip widget for the owner
+        Widget::add()
+            ->to('after_content')
+            ->type('chip')
+            ->view('crud::chips.owner')
+            ->title('Owner')
+            ->entry($owner);
     }
 
     public function fetchOwner()