From 6f1f0ecebe8309db30c1a836572fba7fbff3cd0b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 18 Oct 2020 20:25:32 +1100
Subject: [PATCH] Adjust the way we import credits from V4 to V5 - refactor
 check data script to reflect changes

---
 app/Console/Commands/CheckData.php            | 31 +++++++++++++------
 app/Jobs/Util/Import.php                      |  4 ++-
 .../Migration/PaymentMigrationRepository.php  | 14 +++++++++
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index f7c63b8085da..b681a12bce6d 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -18,6 +18,7 @@ use App\Models\Client;
 use App\Models\ClientContact;
 use App\Models\CompanyLedger;
 use App\Models\Contact;
+use App\Models\Credit;
 use App\Models\Invitation;
 use App\Models\Invoice;
 use App\Models\InvoiceInvitation;
@@ -315,8 +316,9 @@ class CheckData extends Command
     private function checkPaidToDates()
     {
         $wrong_paid_to_dates = 0;
+        $credit_total_applied = 0;
 
-        Client::withTrashed()->cursor()->each(function ($client) use ($wrong_paid_to_dates) {
+        Client::withTrashed()->cursor()->each(function ($client) use ($wrong_paid_to_dates, $credit_total_applied) {
             $total_invoice_payments = 0;
 
             foreach ($client->invoices as $invoice) {
@@ -326,6 +328,15 @@ class CheckData extends Command
                 $total_invoice_payments += ($total_amount - $total_refund);
             }
 
+            foreach($client->payments as $payment)
+            {
+              $credit_total_applied += $payment->paymentables->where('paymentable_type', App\Models\Credit::class)->sum(\DB::raw('amount'));
+            }
+
+            $total_invoice_payments += $credit_total_applied;
+
+            info("total invoice payments = {$total_invoice_payments} with client paid to date of of {$client->paid_to_date}");
+
             if (round($total_invoice_payments, 2) != round($client->paid_to_date, 2)) {
                 $wrong_paid_to_dates++;
 
@@ -374,22 +385,22 @@ class CheckData extends Command
 
         foreach (Client::cursor() as $client) {
             $invoice_balance = $client->invoices->sum('balance');
-            $invoice_amounts = $client->invoices->sum('amount') - $invoice_balance;
+            // $invoice_amounts = $client->invoices->sum('amount') - $invoice_balance;
 
-            $credit_amounts = 0;
+            // $credit_amounts = 0;
 
-            foreach ($client->invoices as $invoice) {
-                $credit_amounts += $invoice->credits->sum('amount');
-            }
+            // foreach ($client->invoices as $invoice) {
+            //     $credit_amounts += $invoice->credits->sum('amount');
+            // }
 
-            /*To handle invoice reversals, we need to "ADD BACK" the credit amounts here*/
-            $client_paid_to_date = $client->paid_to_date + $credit_amounts;
+            // /*To handle invoice reversals, we need to "ADD BACK" the credit amounts here*/
+            // $client_paid_to_date = $client->paid_to_date + $credit_amounts;
 
             $ledger = CompanyLedger::where('client_id', $client->id)->orderBy('id', 'DESC')->first();
 
-            if ($ledger && (string) $invoice_amounts != (string) $client_paid_to_date) {
+            if ($ledger && (string) $invoice_balance != (string) $client->balance) {
                 $wrong_paid_to_dates++;
-                $this->logMessage($client->present()->name.' - '.$client->id." - client paid to dates do not match {$invoice_amounts} - ".rtrim($client_paid_to_date, '0'));
+                $this->logMessage($client->present()->name.' - '.$client->id." - client paid to dates do not match {$invoice_balance} - ".rtrim($client->balance, '0'));
 
                 $this->isValid = false;
             }
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index 400c393d605f..b2754b8ec08c 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -724,8 +724,10 @@ class Import implements ShouldQueue
 
                     if($modified['amount'] >= 0)
                         $modified['invoices'][$key]['invoice_id'] = $this->transformId('invoices', $invoice['invoice_id']);
-                    else
+                    else{
                         $modified['credits'][$key]['credit_id'] = $this->transformId('credits', $invoice['invoice_id']);
+                        $modified['credits'][$key]['amount'] = $modified['invoices'][$key]['amount'];
+                    }
 
                 }
             }
diff --git a/app/Repositories/Migration/PaymentMigrationRepository.php b/app/Repositories/Migration/PaymentMigrationRepository.php
index b8a057b4b1ef..505576b13f57 100644
--- a/app/Repositories/Migration/PaymentMigrationRepository.php
+++ b/app/Repositories/Migration/PaymentMigrationRepository.php
@@ -117,6 +117,20 @@ class PaymentMigrationRepository extends BaseRepository
             });
         }
 
+        if (array_key_exists('credits', $data) && is_array($data['credits']) && count($data['credits']) > 0) {
+            $credit_totals = array_sum(array_column($data['credits'], 'amount'));
+
+            $credits = Credit::whereIn('id', array_column($data['credits'], 'credit_id'))->get();
+
+            $payment->credits()->saveMany($credits);
+
+            $payment->credits->each(function ($cre) use ($credit_totals) {
+                $cre->pivot->amount = $credit_totals;
+                $cre->pivot->save();
+            });
+        }
+
+
         $fields = new \stdClass;
 
         $fields->payment_id = $payment->id;