Merge pull request #147 from andrewdwallo/development-3.x

Development 3.x

app/Filament/Pages/Auth/Login.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Filament\Pages\Auth;
+
+use Wallo\FilamentCompanies\Pages\Auth\Login as BaseLogin;
+
+class Login extends BaseLogin
+{
+    public function mount(): void
+    {
+        parent::mount();
+
+        if (app()->environment('demo')) {
+            $this->form->fill([
+                'email' => 'admin@erpsaas.com',
+                'password' => 'password',
+                'remember' => true,
+            ]);
+        }
+    }
+}

app/Providers/Filament/CompanyPanelProvider.php

@@ -35,6 +35,7 @@ use App\Filament\Company\Resources\Sales\EstimateResource;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource;
 use App\Filament\Components\PanelShiftDropdown;
+use App\Filament\Pages\Auth\Login;
 use App\Filament\User\Clusters\Account;
 use App\Http\Middleware\ConfigureCurrentCompany;
 use App\Livewire\UpdatePassword;
@@ -69,7 +70,6 @@ use Wallo\FilamentCompanies\Actions\GenerateRedirectForProvider;
 use Wallo\FilamentCompanies\Enums\Feature;
 use Wallo\FilamentCompanies\Enums\Provider;
 use Wallo\FilamentCompanies\FilamentCompanies;
-use Wallo\FilamentCompanies\Pages\Auth\Login;
 use Wallo\FilamentCompanies\Pages\Auth\Register;
 
 class CompanyPanelProvider extends PanelProvider
@@ -79,33 +79,38 @@ class CompanyPanelProvider extends PanelProvider
      */
     public function panel(Panel $panel): Panel
     {
+        $isDemoEnvironment = app()->environment('demo');
+
         return $panel
             ->default()
             ->id('company')
             ->path('company')
             ->login(Login::class)
-            ->registration(action: app()->environment('demo') ? null : Register::class)
-            ->passwordReset(requestAction: app()->environment('demo') ? null : Pages\Auth\PasswordReset\RequestPasswordReset::class)
+            ->when(! $isDemoEnvironment, function (Panel $panel) {
+                return $panel
+                    ->registration(Register::class)
+                    ->passwordReset();
+            })
             ->tenantMenu(false)
             ->plugin(
                 FilamentCompanies::make()
                     ->userPanel('user')
                     ->switchCurrentCompany()
-                    ->updateProfileInformation(condition: ! app()->environment('demo'), component: UpdateProfileInformation::class)
-                    ->updatePasswords(condition: ! app()->environment('demo'), component: UpdatePassword::class)
-                    ->setPasswords(condition: ! app()->environment('demo'))
-                    ->connectedAccounts(condition: ! app()->environment('demo'))
-                    ->manageBrowserSessions(condition: ! app()->environment('demo'))
-                    ->accountDeletion(condition: ! app()->environment('demo'))
-                    ->profilePhotos(condition: ! app()->environment('demo'))
-                    ->api(condition: ! app()->environment('demo'))
+                    ->updateProfileInformation(component: UpdateProfileInformation::class)
+                    ->updatePasswords(component: UpdatePassword::class)
+                    ->setPasswords()
+                    ->connectedAccounts()
+                    ->manageBrowserSessions()
+                    ->accountDeletion()
+                    ->profilePhotos()
+                    ->api()
                     ->companies(invitations: true)
                     ->autoAcceptInvitations()
                     ->termsAndPrivacyPolicy()
                     ->notifications()
                     ->modals()
                     ->socialite(
-                        condition: ! app()->environment('demo'),
+                        condition: ! $isDemoEnvironment,
                         providers: [Provider::Github],
                         features: [Feature::RememberSession, Feature::ProviderAvatars],
                     ),
@@ -178,13 +183,13 @@ class CompanyPanelProvider extends PanelProvider
             ->discoverPages(in: app_path('Filament/Company/Pages'), for: 'App\\Filament\\Company\\Pages')
             ->discoverClusters(in: app_path('Filament/Company/Clusters'), for: 'App\\Filament\\Company\\Clusters')
             ->pages([
-                Pages\Dashboard::class,
+                // Pages\Dashboard::class,
             ])
             ->authGuard('web')
             ->discoverWidgets(in: app_path('Filament/Company/Widgets'), for: 'App\\Filament\\Company\\Widgets')
             ->widgets([
-                Widgets\AccountWidget::class,
-                Widgets\FilamentInfoWidget::class,
+                // Widgets\AccountWidget::class,
+                // Widgets\FilamentInfoWidget::class,
             ])
             ->middleware([
                 EncryptCookies::class,

app/Providers/Filament/UserPanelProvider.php

@@ -11,7 +11,6 @@ use Filament\Http\Middleware\DisableBladeIconComponents;
 use Filament\Http\Middleware\DispatchServingFilamentEvent;
 use Filament\Navigation\NavigationBuilder;
 use Filament\Navigation\NavigationItem;
-use Filament\Pages;
 use Filament\Panel;
 use Filament\PanelProvider;
 use Filament\Support\Colors\Color;
@@ -50,12 +49,13 @@ class UserPanelProvider extends PanelProvider
                                     ->icon('heroicon-s-building-office-2')
                                     ->url(static function (): ?string {
                                         $user = Auth::user();
+                                        $companyPanel = FilamentCompanies::getCompanyPanel();
 
                                         if ($company = $user?->primaryCompany()) {
-                                            return Pages\Dashboard::getUrl(panel: FilamentCompanies::getCompanyPanel(), tenant: $company);
+                                            return Filament::getPanel($companyPanel)->getUrl(tenant: $company);
                                         }
 
-                                        return Filament::getPanel(FilamentCompanies::getCompanyPanel())->getTenantRegistrationUrl();
+                                        return Filament::getPanel($companyPanel)->getTenantRegistrationUrl();
                                     }),
                             ]);
                     }),

app/Services/AccountService.php

@@ -381,7 +381,7 @@ class AccountService
         $driver = DB::getDriverName();
 
         $datediff = $driver === 'pgsql'
-            ? "DATE_PART('day', ?::date - invoices.due_date)"
+            ? '(?::date - invoices.due_date::date)'
             : 'DATEDIFF(?, invoices.due_date)';
 
         return Invoice::query()
@@ -404,7 +404,7 @@ class AccountService
         $driver = DB::getDriverName();
 
         $datediff = $driver === 'pgsql'
-            ? "DATE_PART('day', ?::date - bills.due_date)"
+            ? '(?::date - bills.due_date::date)'
             : 'DATEDIFF(?, bills.due_date)';
 
         return Bill::query()

database/migrations/2023_11_18_041015_create_currency_lists_table.php

@@ -1,6 +1,5 @@
 <?php
 
-use App\Facades\Forex;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -12,10 +11,6 @@ return new class extends Migration
      */
     public function up(): void
     {
-        if (Forex::isDisabled()) {
-            return;
-        }
-
         Schema::create('currency_lists', function (Blueprint $table) {
             $table->id();
             $table->string('code');