diff --git a/app/Console/Commands/EncryptNinja.php b/app/Console/Commands/EncryptNinja.php index 37e0cd21d6df..162b574d8564 100644 --- a/app/Console/Commands/EncryptNinja.php +++ b/app/Console/Commands/EncryptNinja.php @@ -11,7 +11,6 @@ namespace App\Console\Commands; -use DirectoryIterator; use Illuminate\Console\Command; use Illuminate\Support\Facades\Storage; diff --git a/app/Http/Middleware/TokenAuth.php b/app/Http/Middleware/TokenAuth.php index 37776bb7c0c7..ab62859f2f9b 100644 --- a/app/Http/Middleware/TokenAuth.php +++ b/app/Http/Middleware/TokenAuth.php @@ -74,6 +74,7 @@ class TokenAuth */ app('queue')->createPayloadUsing(function () use ($company_token) { return ['db' => $company_token->company->db]; + // return ['db' => $company_token->company->db, 'is_premium' => $company_token->account->isPremium()]; }); //user who once existed, but has been soft deleted diff --git a/app/Jobs/Mail/NinjaMailer.php b/app/Jobs/Mail/NinjaMailer.php index 9dfd369de3ce..8f5de94390ae 100644 --- a/app/Jobs/Mail/NinjaMailer.php +++ b/app/Jobs/Mail/NinjaMailer.php @@ -34,6 +34,7 @@ class NinjaMailer extends Mailable */ public function build() { + $from_name = config('mail.from.name'); if (property_exists($this->mail_obj, 'from_name')) { diff --git a/app/Models/Account.php b/app/Models/Account.php index 7249f4308085..32b81723e4a2 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -294,6 +294,11 @@ class Account extends BaseModel return Ninja::isNinja() ? ($this->isPaidHostedClient() && !$this->isTrial()) : $this->hasFeature(self::FEATURE_WHITE_LABEL); } + public function isPremium(): bool + { + return Ninja::isHosted() && $this->isPaidHostedClient() && !$this->isTrial() && Carbon::createFromTimestamp($this->created_at)->diffInMonths() > 2; + } + public function isPaidHostedClient(): bool { if (!Ninja::isNinja()) { diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php index 7c8199142f9e..4f71bdf6a2a6 100644 --- a/app/Providers/ComposerServiceProvider.php +++ b/app/Providers/ComposerServiceProvider.php @@ -24,6 +24,18 @@ class ComposerServiceProvider extends ServiceProvider public function boot() { view()->composer('portal.*', PortalComposer::class); + + // view()->composer( + // ['email.admin.generic', 'email.client.generic'], + // function ($view) { + // $view->with( + // 'template', + // Ninja::isHosted() + // ); + // } + // ); + + } /** diff --git a/app/Providers/MultiDBProvider.php b/app/Providers/MultiDBProvider.php index 8ff9c569dca2..4f01911ea087 100644 --- a/app/Providers/MultiDBProvider.php +++ b/app/Providers/MultiDBProvider.php @@ -33,6 +33,7 @@ class MultiDBProvider extends ServiceProvider */ public function register() { + $this->app['events']->listen( JobProcessing::class, function ($event) {