refactor and prevent auto creation of company for Socialite User

.gitignore

@@ -17,3 +17,5 @@ yarn-error.log
 /.fleet
 /.idea
 /.vscode
+/public/css/
+/public/js/

app/Actions/FilamentCompanies/CreateUserFromProvider.php

@@ -46,7 +46,7 @@ class CreateUserFromProvider implements CreatesUserFromProvider
                     $this->createsConnectedAccounts->create($user, $provider, $providerUser)
                 );
 
-                $this->createCompany($user);
+                // $this->createCompany($user); // Commented out to prevent creating a company for a Socialite user
             });
         });
     }

app/Events/CompanyGenerated.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\Company;
+use App\Models\User;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class CompanyGenerated
+{
+    use Dispatchable, SerializesModels;
+
+    public User $user;
+    public Company $company;
+    public string $country;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(User $user, Company $company, string $country)
+    {
+        $this->user = $user;
+        $this->company = $company;
+        $this->country = $country;
+    }
+}

app/Filament/Company/Pages/CreateCompany.php

@@ -3,6 +3,7 @@
 namespace App\Filament\Company\Pages;
 
 use App\Enums\EntityType;
+use App\Events\CompanyGenerated;
 use App\Models\Setting\CompanyProfile;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
@@ -70,6 +71,8 @@ class CreateCompany extends FilamentCreateCompany
 
         $name = $data['name'];
 
+        CompanyGenerated::dispatch($user, $company, $data['profile']['country']);
+
         $this->companyCreated($name);
 
         return $company;

app/Listeners/CreateCompanyDefaults.php

@@ -2,9 +2,8 @@
 
 namespace App\Listeners;
 
-use App\Models\Company;
+use App\Events\CompanyGenerated;
 use App\Services\CompanyDefaultService;
-use Wallo\FilamentCompanies\Events\CompanyCreated;
 
 class CreateCompanyDefaults
 {
@@ -19,14 +18,16 @@ class CreateCompanyDefaults
     /**
      * Handle the event.
      */
-    public function handle(CompanyCreated $event): void
+    public function handle(CompanyGenerated $event): void
     {
-        /** @var Company $company */
         $company = $event->company;
+        $country = $event->country;
+
+        $currencyCode = $country ? country($country)->getCurrency()['iso_4217_code'] : 'USD';
 
         $user = $company->owner;
 
         $companyDefaultService = new CompanyDefaultService();
-        $companyDefaultService->createCompanyDefaults($company, $user);
+        $companyDefaultService->createCompanyDefaults($company, $user, $currencyCode);
     }
 }

app/Providers/EventServiceProvider.php

@@ -4,6 +4,7 @@ namespace App\Providers;
 
 use App\Events\CompanyDefaultEvent;
 use App\Events\CompanyDefaultUpdated;
+use App\Events\CompanyGenerated;
 use App\Listeners\ConfigureCompanyDefault;
 use App\Listeners\CreateCompanyDefaults;
 use App\Listeners\SyncAssociatedModels;
@@ -12,7 +13,6 @@ use Filament\Events\TenantSet;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Wallo\FilamentCompanies\Events\CompanyCreated;
 
 class EventServiceProvider extends ServiceProvider
 {
@@ -34,7 +34,7 @@ class EventServiceProvider extends ServiceProvider
         TenantSet::class => [
             ConfigureCompanyDefault::class,
         ],
-        CompanyCreated::class => [
+        CompanyGenerated::class => [
             CreateCompanyDefaults::class,
         ],
     ];

app/Services/CompanyDefaultService.php

@@ -12,16 +12,15 @@ use App\Models\Setting\Discount;
 use App\Models\Setting\DocumentDefault;
 use App\Models\Setting\Tax;
 use App\Models\User;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 
 class CompanyDefaultService
 {
-    public function createCompanyDefaults(Company $company, User $user): void
+    public function createCompanyDefaults(Company $company, User $user, string $currencyCode): void
     {
-        DB::transaction(function () use ($company, $user) {
+        DB::transaction(function () use ($company, $user, $currencyCode) {
             $categories = $this->createCategories($company, $user);
-            $currency = $this->createCurrency($company, $user);
+            $currency = $this->createCurrency($company, $user, $currencyCode);
             $salesTax = $this->createSalesTax($company, $user);
             $purchaseTax = $this->createPurchaseTax($company, $user);
             $salesDiscount = $this->createSalesDiscount($company, $user);
@@ -42,7 +41,7 @@ class CompanyDefaultService
                 'updated_by' => $user->id,
             ];
 
-            CompanyDefault::updateOrInsert(['company_id' => $company->id], $companyDefaults);
+            CompanyDefault::firstOrCreate(['company_id' => $company->id], $companyDefaults);
         }, 5);
     }
 
@@ -93,9 +92,9 @@ class CompanyDefaultService
         ];
     }
 
-    private function createCurrency(Company $company, User $user)
+    private function createCurrency(Company $company, User $user, string $currencyCode)
     {
-        return Currency::factory()->create([
+        return Currency::factory()->forCurrency($currencyCode)->create([
             'company_id' => $company->id,
             'created_by' => $user->id,
             'updated_by' => $user->id,

app/Traits/SyncsWithCompanyDefaults.php

@@ -8,11 +8,11 @@ trait SyncsWithCompanyDefaults
 {
     public static function bootSyncsWithCompanyDefaults(): void
     {
-        static::creating(static function ($model) {
+        static::created(static function ($model) {
             event(new CompanyDefaultEvent($model));
         });
 
-        static::updating(static function ($model) {
+        static::updated(static function ($model) {
             event(new CompanyDefaultEvent($model));
         });
     }

composer.lock

@@ -1234,16 +1234,16 @@
         },
         {
             "name": "filament/actions",
-            "version": "v3.0.52",
+            "version": "v3.0.53",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/actions.git",
-                "reference": "1d8b7e393f9a783d674768e3b9f54e76a357b2e6"
+                "reference": "ab3512faf3a0e35e3b863b78ac4c67eede8f654f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/actions/zipball/1d8b7e393f9a783d674768e3b9f54e76a357b2e6",
-                "reference": "1d8b7e393f9a783d674768e3b9f54e76a357b2e6",
+                "url": "https://api.github.com/repos/filamentphp/actions/zipball/ab3512faf3a0e35e3b863b78ac4c67eede8f654f",
+                "reference": "ab3512faf3a0e35e3b863b78ac4c67eede8f654f",
                 "shasum": ""
             },
             "require": {
@@ -1280,20 +1280,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2023-09-11T12:30:47+00:00"
+            "time": "2023-09-18T10:30:31+00:00"
         },
         {
             "name": "filament/filament",
-            "version": "v3.0.52",
+            "version": "v3.0.53",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/panels.git",
-                "reference": "6a9e8b82ab7e5e639621f53c8982d2bef1322566"
+                "reference": "0fba2ff378d28984e9d0107600a8dff5e2425d8b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/6a9e8b82ab7e5e639621f53c8982d2bef1322566",
-                "reference": "6a9e8b82ab7e5e639621f53c8982d2bef1322566",
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/0fba2ff378d28984e9d0107600a8dff5e2425d8b",
+                "reference": "0fba2ff378d28984e9d0107600a8dff5e2425d8b",
                 "shasum": ""
             },
             "require": {
@@ -1345,20 +1345,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2023-09-16T10:25:57+00:00"
+            "time": "2023-09-18T10:30:37+00:00"
         },
         {
             "name": "filament/forms",
-            "version": "v3.0.52",
+            "version": "v3.0.53",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
-                "reference": "b99b4dfd957df9cebafaee6d95f1de5132221353"
+                "reference": "9b7dc160634649c411fdbeeee4058bd524b30088"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/b99b4dfd957df9cebafaee6d95f1de5132221353",
-                "reference": "b99b4dfd957df9cebafaee6d95f1de5132221353",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/9b7dc160634649c411fdbeeee4058bd524b30088",
+                "reference": "9b7dc160634649c411fdbeeee4058bd524b30088",
                 "shasum": ""
             },
             "require": {
@@ -1401,20 +1401,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2023-09-16T10:25:51+00:00"
+            "time": "2023-09-18T10:30:39+00:00"
         },
         {
             "name": "filament/infolists",
-            "version": "v3.0.52",
+            "version": "v3.0.53",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/infolists.git",
-                "reference": "db3f36f1fa243213996262f1afdce76aba497f7b"
+                "reference": "148b6f2bc0c27c224dc0fd811882dd080eb50a6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/db3f36f1fa243213996262f1afdce76aba497f7b",
-                "reference": "db3f36f1fa243213996262f1afdce76aba497f7b",
+                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/148b6f2bc0c27c224dc0fd811882dd080eb50a6e",
+                "reference": "148b6f2bc0c27c224dc0fd811882dd080eb50a6e",
                 "shasum": ""
             },
             "require": {
@@ -1452,20 +1452,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2023-09-11T12:30:48+00:00"
+            "time": "2023-09-18T10:30:36+00:00"
         },
         {
             "name": "filament/notifications",
-            "version": "v3.0.52",
+            "version": "v3.0.53",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
-                "reference": "b675b8310bb4984334bc5b01b3b770a6b0d56a83"
+                "reference": "288355f86d973a69bd483836b9a38d000b8b2ad2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/notifications/zipball/b675b8310bb4984334bc5b01b3b770a6b0d56a83",
-                "reference": "b675b8310bb4984334bc5b01b3b770a6b0d56a83",
+                "url": "https://api.github.com/repos/filamentphp/notifications/zipball/288355f86d973a69bd483836b9a38d000b8b2ad2",
+                "reference": "288355f86d973a69bd483836b9a38d000b8b2ad2",
                 "shasum": ""
             },
             "require": {
@@ -1504,11 +1504,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2023-09-06T14:23:07+00:00"
+            "time": "2023-09-18T10:30:34+00:00"
         },
         {
             "name": "filament/spatie-laravel-tags-plugin",
-            "version": "v3.0.52",
+            "version": "v3.0.53",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/spatie-laravel-tags-plugin.git",
@@ -1545,16 +1545,16 @@
         },
         {
             "name": "filament/support",
-            "version": "v3.0.52",
+            "version": "v3.0.53",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
-                "reference": "183354b6fe1af1bbda335818c2e412fb7c1869e9"
+                "reference": "9f6fa9a2c03f45eccbca83a083535fb628f73b97"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/support/zipball/183354b6fe1af1bbda335818c2e412fb7c1869e9",
-                "reference": "183354b6fe1af1bbda335818c2e412fb7c1869e9",
+                "url": "https://api.github.com/repos/filamentphp/support/zipball/9f6fa9a2c03f45eccbca83a083535fb628f73b97",
+                "reference": "9f6fa9a2c03f45eccbca83a083535fb628f73b97",
                 "shasum": ""
             },
             "require": {
@@ -1598,20 +1598,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2023-09-16T10:26:04+00:00"
+            "time": "2023-09-18T10:30:36+00:00"
         },
         {
             "name": "filament/tables",
-            "version": "v3.0.52",
+            "version": "v3.0.53",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
-                "reference": "0cd15c2591f42d6528e65e99cf16f34c134904ad"
+                "reference": "bf7110bceca30534038fe7e5344c236860636e27"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/0cd15c2591f42d6528e65e99cf16f34c134904ad",
-                "reference": "0cd15c2591f42d6528e65e99cf16f34c134904ad",
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/bf7110bceca30534038fe7e5344c236860636e27",
+                "reference": "bf7110bceca30534038fe7e5344c236860636e27",
                 "shasum": ""
             },
             "require": {
@@ -1651,20 +1651,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2023-09-16T10:26:09+00:00"
+            "time": "2023-09-18T10:30:31+00:00"
         },
         {
             "name": "filament/widgets",
-            "version": "v3.0.52",
+            "version": "v3.0.53",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/widgets.git",
-                "reference": "11f37f08912f277e1bfc5b19e5b21d74b4f9b4e0"
+                "reference": "bbe1952f1b04e673ae86a6cac758979e5e3ed18c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/widgets/zipball/11f37f08912f277e1bfc5b19e5b21d74b4f9b4e0",
-                "reference": "11f37f08912f277e1bfc5b19e5b21d74b4f9b4e0",
+                "url": "https://api.github.com/repos/filamentphp/widgets/zipball/bbe1952f1b04e673ae86a6cac758979e5e3ed18c",
+                "reference": "bbe1952f1b04e673ae86a6cac758979e5e3ed18c",
                 "shasum": ""
             },
             "require": {
@@ -1695,7 +1695,7 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2023-09-10T23:30:09+00:00"
+            "time": "2023-09-18T10:30:45+00:00"
         },
         {
             "name": "fruitcake/php-cors",
@@ -4750,16 +4750,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.11.20",
+            "version": "v0.11.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "0fa27040553d1d280a67a4393194df5228afea5b"
+                "reference": "bcb22101107f3bf770523b65630c9d547f60c540"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/0fa27040553d1d280a67a4393194df5228afea5b",
-                "reference": "0fa27040553d1d280a67a4393194df5228afea5b",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/bcb22101107f3bf770523b65630c9d547f60c540",
+                "reference": "bcb22101107f3bf770523b65630c9d547f60c540",
                 "shasum": ""
             },
             "require": {
@@ -4789,6 +4789,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-main": "0.11.x-dev"
+                },
+                "bamarni-bin": {
+                    "bin-links": false,
+                    "forward-command": false
                 }
             },
             "autoload": {
@@ -4820,9 +4824,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.11.20"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.11.21"
             },
-            "time": "2023-07-31T14:32:22+00:00"
+            "time": "2023-09-17T21:15:54+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -9738,16 +9742,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "5.0.1",
+            "version": "5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "32ff03d078fed1279c4ec9a407d08c5e9febb480"
+                "reference": "c3fa8483f9539b190f7cd4bfc4a07631dd1df344"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/32ff03d078fed1279c4ec9a407d08c5e9febb480",
-                "reference": "32ff03d078fed1279c4ec9a407d08c5e9febb480",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c3fa8483f9539b190f7cd4bfc4a07631dd1df344",
+                "reference": "c3fa8483f9539b190f7cd4bfc4a07631dd1df344",
                 "shasum": ""
             },
             "require": {
@@ -9804,7 +9808,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
                 "security": "https://github.com/sebastianbergmann/exporter/security/policy",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/5.0.1"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.0"
             },
             "funding": [
                 {
@@ -9812,7 +9816,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-09-08T04:46:58+00:00"
+            "time": "2023-09-18T07:15:37+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -10657,5 +10661,5 @@
         "php": "^8.2"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.0"
 }

config/services.php

@@ -34,7 +34,7 @@ return [
     'github' => [
         'client_id' => env('GITHUB_CLIENT_ID'),
         'client_secret' => env('GITHUB_CLIENT_SECRET'),
-        'redirect' => 'http://erpsaas2.test/company/oauth/github/callback',
+        'redirect' => 'http://erpsaas.test/company/oauth/github/callback',
     ],
 
 ];

database/factories/Setting/CompanyProfileFactory.php

@@ -3,6 +3,7 @@
 namespace Database\Factories\Setting;
 
 use App\Enums\EntityType;
+use App\Events\CompanyGenerated;
 use App\Models\Setting\CompanyProfile;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -42,6 +43,8 @@ class CompanyProfileFactory extends Factory
             $companyProfile->timezone = $this->faker->randomElement(CompanyProfile::getTimezoneOptions($companyProfile->country));
             $companyProfile->state = $this->faker->randomElement(CompanyProfile::getStateOptions($companyProfile->country));
             $companyProfile->save();
+
+            event(new CompanyGenerated($companyProfile->company->owner, $companyProfile->company, $companyProfile->country));
         });
     }
 }

database/factories/Setting/CurrencyFactory.php

@@ -36,4 +36,24 @@ class CurrencyFactory extends Factory
             'enabled' => true,
         ];
     }
+
+    /**
+     * Define a state for a specific currency.
+     */
+    public function forCurrency(string $code): Factory
+    {
+        $currency = currency($code);
+
+        return $this->state([
+            'name' => $currency->getName(),
+            'code' => $currency->getCurrency(),
+            'rate' => $currency->getRate(),
+            'precision' => $currency->getPrecision(),
+            'symbol' => $currency->getSymbol(),
+            'symbol_first' => $currency->isSymbolFirst(),
+            'decimal_mark' => $currency->getDecimalMark(),
+            'thousands_separator' => $currency->getThousandsSeparator(),
+            'enabled' => true,
+        ]);
+    }
 }