From 0fd97f3a03a2c5a7f9cf27e9fc1593f4b72c13f1 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 7 Jul 2020 20:35:54 +1000
Subject: [PATCH] Fixes for checkdata

---
 app/Console/Commands/CheckData.php     | 14 +++-----------
 app/Repositories/InvoiceRepository.php |  9 +++------
 config/ninja.php                       |  4 ++--
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index 3e8b3ff3aa70..17c8b764a62b 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -76,9 +76,6 @@ class CheckData extends Command
             config(['database.default' => $database]);
         }
 
-        if (! $this->option('client_id')) {
-            $this->checkPaidToDate();
-        }
 
         $this->checkInvoiceBalances();
         $this->checkInvoicePayments();
@@ -286,11 +283,6 @@ class CheckData extends Command
         }
     }
 
-    private function checkPaidToDate()
-    {
-        //Check the client paid to date value matches the sum of payments by the client
-    }
-
     private function checkInvoiceBalances()
     {
 
@@ -327,7 +319,7 @@ class CheckData extends Command
 
            $total_invoice_payments = 0;
 
-            foreach($client->invoices->where('is_deleted', false) as $invoice)
+            foreach($client->invoices as $invoice)
             {
                 $total_amount = $invoice->payments->sum('pivot.amount');
                 $total_refund = $invoice->payments->sum('pivot.refunded');
@@ -387,8 +379,8 @@ class CheckData extends Command
 
         foreach(Client::cursor() as $client)
         {
-            $invoice_balance = $client->invoices->where('is_deleted', false)->sum('balance');
-            $invoice_amounts = $client->invoices->where('is_deleted', false)->sum('amount') - $invoice_balance;
+            $invoice_balance = $client->invoices->sum('balance');
+            $invoice_amounts = $client->invoices->sum('amount') - $invoice_balance;
 
             $ledger = CompanyLedger::where('client_id', $client->id)->orderBy('id', 'DESC')->first();
 
diff --git a/app/Repositories/InvoiceRepository.php b/app/Repositories/InvoiceRepository.php
index 8a1d0a0ca6d7..fca09eb897ab 100644
--- a/app/Repositories/InvoiceRepository.php
+++ b/app/Repositories/InvoiceRepository.php
@@ -84,12 +84,9 @@ class InvoiceRepository extends BaseRepository
             return;
         }
 
-        $invoice->is_deleted = true;
-        $invoice->save();
-
-        $invoice->delete();
-
-        event(new InvoiceWasDeleted($invoice, $invoice->company));
+        $invoice->service()->handleCancellation()->save();
+        
+        $invoice = $this->invoice_repo->delete($invoice);
 
         return $invoice;
     }
diff --git a/config/ninja.php b/config/ninja.php
index 21197611dbe5..0fd26a26c041 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -12,8 +12,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => env('APP_URL', ''),
     'app_domain' => env('APP_DOMAIN', ''),
-    'app_version' => '5.0.11',
-    'minimum_client_version' => '5.0.11',
+    'app_version' => '5.0.12',
+    'minimum_client_version' => '5.0.12',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),
     'google_maps_api_key' => env('GOOGLE_MAPS_API_KEY'),