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

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

@ -11,16 +11,8 @@
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
* *
@ -40,13 +32,17 @@ 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
@ -95,6 +91,4 @@ class EmailStatement
* @var string * @var string
*/ */
public string $status = 'paid'; // paid | unpaid public string $status = 'paid'; // paid | unpaid
} }