From fb36a6052fbb71d06b2d0c82ca198b9b48b781ff Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 18 Feb 2023 08:24:33 +1100
Subject: [PATCH] Fixes for conflicts

---
 app/DataMapper/Schedule/EmailStatement.php | 40 +++++++++-------------
 1 file changed, 17 insertions(+), 23 deletions(-)

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