Improve initial email flow

app/Jobs/Account/CreateAccount.php

@@ -36,6 +36,7 @@ use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\Response;
 use Turbo124\Beacon\Facades\LightLogs;
+use Illuminate\Support\Facades\App;
 
 class CreateAccount
 {
@@ -114,8 +115,22 @@ class CreateAccount
 
         $spaa9f78->fresh();
 
-        if(Ninja::isHosted())
+        if(Ninja::isHosted()){
+nlog("welcome");
+            App::forgetInstance('translator');
+            $t = app('translator');
+            $t->replace(Ninja::transformTranslations($sp035a66->settings));
+
+            $nmo = new NinjaMailerObject;
+            $nmo->mailable = new \Modules\Admin\Mail\Welcome($sp035a66->owner());
+            $nmo->company =  $sp035a66;
+            $nmo->settings = $sp035a66->settings;
+            $nmo->to_user = $sp035a66->owner();
+
+            NinjaMailerJob::dispatch($nmo);
+
             \Modules\Admin\Jobs\Account\NinjaUser::dispatch([], $sp035a66);
+        }
 
         VersionCheck::dispatch();
 
@@ -123,6 +138,9 @@ class CreateAccount
                  ->increment()
                  ->batch();
 
+        
+
+
         return $sp794f3f;
     }
 

app/Jobs/User/CreateUser.php

@@ -83,7 +83,6 @@ class CreateUser
         ]);
 
         if(!Ninja::isSelfHost()) {
-            nlog("in the create user class");
             event(new UserWasCreated($user, $user, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
         }
 

app/Listeners/SendVerificationNotification.php

@@ -24,6 +24,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Carbon;
 
 class SendVerificationNotification implements ShouldQueue
 {
@@ -53,6 +54,9 @@ class SendVerificationNotification implements ShouldQueue
 
         $event->user->service()->invite($event->company);
 
+
+        if(Carbon::parse($event->company->created_at)->lt(now()->subDay()))
+        {
             App::forgetInstance('translator');
             $t = app('translator');
             $t->replace(Ninja::transformTranslations($event->company->settings));
@@ -63,7 +67,7 @@ class SendVerificationNotification implements ShouldQueue
             $nmo->settings = $event->company->settings;
             $nmo->to_user = $event->creating_user;
             NinjaMailerJob::dispatch($nmo);
-
+        }
 
     }
 }