diff --git a/app/Console/Commands/SendReminders.php b/app/Console/Commands/SendReminders.php index 1b6189eedef5..0f5c6ca7b272 100644 --- a/app/Console/Commands/SendReminders.php +++ b/app/Console/Commands/SendReminders.php @@ -134,10 +134,19 @@ class SendReminders extends Command private function sendScheduledReports() { - $scheduledReports = ScheduledReport::where('send_date', '<=', date('Y-m-d'))->get(); + $scheduledReports = ScheduledReport::where('send_date', '<=', date('Y-m-d')) + ->with('user', 'account.company') + ->get(); $this->info(count($scheduledReports) . ' scheduled reports'); foreach ($scheduledReports as $scheduledReport) { + $user = $scheduledReport->user; + $account = $scheduledReport->account; + + if (! $account->hasFeature(FEATURE_REPORTS)) { + continue; + } + $config = (array) json_decode($scheduledReport->config); $reportType = $config['report_type']; diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index be971dc7ee4a..2d58826768da 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -1917,6 +1917,7 @@ $LANG = array( 'enterprise_upgrade_feature1' => 'Set permissions for multiple-users', 'enterprise_upgrade_feature2' => 'Attach 3rd party files to invoices & expenses', 'much_more' => 'Much More!', + 'all_pro_fetaures' => 'Plus all pro features!', 'currency_symbol' => 'Symbol', 'currency_code' => 'Code', diff --git a/resources/views/partials/upgrade_modal.blade.php b/resources/views/partials/upgrade_modal.blade.php index 092bbd39a07b..b1db2d34151e 100644 --- a/resources/views/partials/upgrade_modal.blade.php +++ b/resources/views/partials/upgrade_modal.blade.php @@ -53,7 +53,7 @@