tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for conflicts

Browse source
This commit is contained in:
David Bomba 2023-02-18 08:30:59 +11:00
parent fb36a6052f
commit db47163eb3
3 changed files with 0 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Services/Email/EmailObject.php
View file

@ -11,12 +11,6 @@
namespace App\Services\Email;
<<<<<<< HEAD
use App\Models\Client;
use App\Models\ClientContact;
use App\Models\Company;
=======
>>>>>>> 63a7a1185 (Minor fixes for types)
use App\Models\User;
use App\Models\Client;
use App\Models\Vendor;
@ -83,15 +77,9 @@ class EmailObject
public ?int $entity_id = null;
<<<<<<< HEAD
public ?string $entity_class = null;
public array $variables = [];
}
=======
public array $variables = [];
public ?Company $company = null;
}
>>>>>>> 63a7a1185 (Minor fixes for types)

14
app/Services/Scheduler/SchedulerService.php
View file

@ -15,12 +15,9 @@ use App\Models\Client;
use App\Models\RecurringInvoice;
use App\Models\Scheduler;
use App\Utils\Traits\MakesDates;
<<<<<<< HEAD
use App\Utils\Traits\MakesHash;
use Carbon\Carbon;
=======
use App\DataMapper\Schedule\EmailStatement;
>>>>>>> 63a7a1185 (Minor fixes for types)
class SchedulerService
{
@ -97,16 +94,6 @@ class SchedulerService
private function calculateStartAndEndDates(): array
{
return match ($this->scheduler->parameters['date_range']) {
<<<<<<< HEAD
'this_month' => [now()->startOfDay()->firstOfMonth()->format('Y-m-d'), now()->startOfDay()->lastOfMonth()->format('Y-m-d')],
'this_quarter' => [now()->startOfDay()->firstOfQuarter()->format('Y-m-d'), now()->startOfDay()->lastOfQuarter()->format('Y-m-d')],
'this_year' => [now()->startOfDay()->firstOfYear()->format('Y-m-d'), now()->startOfDay()->lastOfYear()->format('Y-m-d')],
'previous_month' => [now()->startOfDay()->subMonthNoOverflow()->firstOfMonth()->format('Y-m-d'), now()->startOfDay()->subMonthNoOverflow()->lastOfMonth()->format('Y-m-d')],
'previous_quarter' => [now()->startOfDay()->subQuarterNoOverflow()->firstOfQuarter()->format('Y-m-d'), now()->startOfDay()->subQuarterNoOverflow()->lastOfQuarter()->format('Y-m-d')],
'previous_year' => [now()->startOfDay()->subYearNoOverflow()->firstOfYear()->format('Y-m-d'), now()->startOfDay()->subYearNoOverflow()->lastOfYear()->format('Y-m-d')],
'custom_range' => [$this->scheduler->parameters['start_date'], $this->scheduler->parameters['end_date']],
default => [now()->startOfDay()->firstOfMonth()->format('Y-m-d'), now()->startOfDay()->lastOfMonth()->format('Y-m-d')],
=======
EmailStatement::LAST7 => [now()->startOfDay()->subDays(7)->format('Y-m-d'), now()->startOfDay()->format('Y-m-d')],
EmailStatement::LAST30 => [now()->startOfDay()->subDays(30)->format('Y-m-d'), now()->startOfDay()->format('Y-m-d')],
EmailStatement::LAST365 => [now()->startOfDay()->subDays(365)->format('Y-m-d'), now()->startOfDay()->format('Y-m-d')],
@ -118,7 +105,6 @@ class SchedulerService
EmailStatement::LAST_YEAR => [now()->startOfDay()->subYearNoOverflow()->firstOfYear()->format('Y-m-d'), now()->startOfDay()->subYearNoOverflow()->lastOfYear()->format('Y-m-d')],
EmailStatement::CUSTOM_RANGE => [$this->scheduler->parameters['start_date'], $this->scheduler->parameters['end_date']],
default => [now()->startOfDay()->firstOfMonth()->format('Y-m-d'), now()->startOfDay()->lastOfMonth()->format('Y-m-d')],
>>>>>>> 63a7a1185 (Minor fixes for types)
};
}

3
tests/Feature/Scheduler/SchedulerTest.php
View file

@ -15,14 +15,11 @@ use App\Factory\SchedulerFactory;
use App\Models\Client;
use App\Models\RecurringInvoice;
use App\Models\Scheduler;
use App\Services\Scheduler\SchedulerService;
use App\Utils\Traits\MakesHash;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Session;
use App\DataMapper\Schedule\EmailStatement;
use App\Services\Scheduler\SchedulerService;
use Illuminate\Validation\ValidationException;
use Illuminate\Foundation\Testing\WithoutEvents;
use Illuminate\Routing\Middleware\ThrottleRequests;
use Illuminate\Support\Facades\Session;