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:24:33 +11:00
parent 6b22ccd13b
commit fb36a6052f
1 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/DataMapper/Schedule/EmailStatement.php
View file

@ -11,19 +11,11 @@
namespace App\DataMapper\Schedule; namespace App\DataMapper\Schedule;
<<<<<<< HEAD:app/DataMapper/Schedule/ClientStatement.php
use App\Models\Client;
use stdClass;
class ClientStatement
=======
class EmailStatement class EmailStatement
>>>>>>> 63a7a1185 (Minor fixes for types):app/DataMapper/Schedule/EmailStatement.php
{ {
/** /**
* Defines the template name * Defines the template name
* *
* @var string * @var string
*/ */
public string $template = 'email_statement'; public string $template = 'email_statement';
@ -32,7 +24,7 @@ class EmailStatement
* An array of clients hashed_ids * An array of clients hashed_ids
* *
* Leave blank if this action should apply to all clients * Leave blank if this action should apply to all clients
* *
* @var array * @var array
*/ */
public array $clients = []; public array $clients = [];
@ -40,17 +32,21 @@ class EmailStatement
/** /**
* The consts to be used to define the date_range variable of the statement * The consts to be used to define the date_range variable of the statement
*/ */
public const THIS_MONTH = 'this_month'; public const LAST7 = "last7_days";
public const THIS_QUARTER = 'this_quarter'; public const LAST30 = "last30_days";
public const THIS_YEAR = 'this_year'; public const LAST365 = "last365_days";
public const PREVIOUS_MONTH = 'previous_month'; public const THIS_MONTH = "this_month";
public const PREVIOUS_QUARTER = 'previous_quarter'; public const LAST_MONTH = "last_month";
public const PREVIOUS_YEAR = 'previous_year'; public const THIS_QUARTER = "this_quarter";
public const CUSTOM_RANGE = "custom_range"; public const LAST_QUARTER = "last_quarter";
public const THIS_YEAR = "this_year";
public const LAST_YEAR = "last_year";
public const CUSTOM_RANGE = "custom";
/** /**
* The date range the statement should include * The date range the statement should include
* *
* @var string * @var string
*/ */
public string $date_range = 'this_month'; public string $date_range = 'this_month';
@ -58,7 +54,7 @@ class EmailStatement
/** /**
* If a custom range is select for the date range then * If a custom range is select for the date range then
* the start_date should be supplied in Y-m-d format * the start_date should be supplied in Y-m-d format
* *
* @var string * @var string
*/ */
public string $start_date = ''; public string $start_date = '';
@ -66,7 +62,7 @@ class EmailStatement
/** /**
* If a custom range is select for the date range then * If a custom range is select for the date range then
* the end_date should be supplied in Y-m-d format * the end_date should be supplied in Y-m-d format
* *
* @var string * @var string
*/ */
public string $end_date = ''; public string $end_date = '';
@ -91,10 +87,8 @@ class EmailStatement
* String const which defines whether * String const which defines whether
* the invoices to be shown are either * the invoices to be shown are either
* paid or unpaid * paid or unpaid
* *
* @var string * @var string
*/ */
public string $status = 'paid'; // paid | unpaid public string $status = 'paid'; // paid | unpaid
} }