diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php index d7edc9eccc19..740db09cef5e 100644 --- a/app/Http/Middleware/QueryLogging.php +++ b/app/Http/Middleware/QueryLogging.php @@ -52,8 +52,8 @@ class QueryLogging Log::info($request->method().' - '.$request->url().": $count queries - ".$time); - // if($count > 100) - // Log::info($queries); + if($count > 100) + Log::info($queries); } } diff --git a/resources/views/email/template/dark.blade.php b/resources/views/email/template/dark.blade.php index 2a14630d6866..641aba99a045 100644 --- a/resources/views/email/template/dark.blade.php +++ b/resources/views/email/template/dark.blade.php @@ -1,4 +1,4 @@ -@component('email.template.master', ['design' => 'dark', 'settings' => $settigns]) +@component('email.template.master', ['design' => 'dark', 'settings' => $settings]) @slot('header') @component('email.components.header', ['p' => $body, 'logo' => 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png']) diff --git a/tests/Feature/RecurringInvoicesCronTest.php b/tests/Feature/RecurringInvoicesCronTest.php index 557b731a7cb8..ebd65b533817 100644 --- a/tests/Feature/RecurringInvoicesCronTest.php +++ b/tests/Feature/RecurringInvoicesCronTest.php @@ -39,13 +39,17 @@ class RecurringInvoicesCronTest extends TestCase { parent::setUp(); - //RecurringInvoice::truncate(); - + RecurringInvoice::all()->each(function ($ri){ + $ri->forceDelete(); + }); + $this->makeTestData(); } public function testCountCorrectNumberOfRecurringInvoicesDue() { + + //spin up 5 valid and 1 invalid recurring invoices $recurring_invoices = RecurringInvoice::where('next_send_date', '<=', Carbon::now()->addMinutes(30))->get();