Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adjust the way we import credits from V4 to V5 - refactor check data script to reflect changes

Browse Source
This commit is contained in:
David Bomba 2020-10-18 20:25:32 +11:00
parent 708db5a991
commit 6f1f0ecebe
3 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/Console/Commands/CheckData.php
View File

@ -18,6 +18,7 @@ use App\Models\Client;
use App\Models\ClientContact; use App\Models\ClientContact;
use App\Models\CompanyLedger; use App\Models\CompanyLedger;
use App\Models\Contact; use App\Models\Contact;
use App\Models\Credit;
use App\Models\Invitation; use App\Models\Invitation;
use App\Models\Invoice; use App\Models\Invoice;
use App\Models\InvoiceInvitation; use App\Models\InvoiceInvitation;
@ -315,8 +316,9 @@ class CheckData extends Command
private function checkPaidToDates() private function checkPaidToDates()
{ {
$wrong_paid_to_dates = 0; $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; $total_invoice_payments = 0;
foreach ($client->invoices as $invoice) { foreach ($client->invoices as $invoice) {
@ -326,6 +328,15 @@ class CheckData extends Command
$total_invoice_payments += ($total_amount - $total_refund); $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)) { if (round($total_invoice_payments, 2) != round($client->paid_to_date, 2)) {
$wrong_paid_to_dates++; $wrong_paid_to_dates++;
@ -374,22 +385,22 @@ class CheckData extends Command
foreach (Client::cursor() as $client) { foreach (Client::cursor() as $client) {
$invoice_balance = $client->invoices->sum('balance'); $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) { // foreach ($client->invoices as $invoice) {
$credit_amounts += $invoice->credits->sum('amount'); // $credit_amounts += $invoice->credits->sum('amount');
} // }
/*To handle invoice reversals, we need to "ADD BACK" the credit amounts here*/ // /*To handle invoice reversals, we need to "ADD BACK" the credit amounts here*/
$client_paid_to_date = $client->paid_to_date + $credit_amounts; // $client_paid_to_date = $client->paid_to_date + $credit_amounts;
$ledger = CompanyLedger::where('client_id', $client->id)->orderBy('id', 'DESC')->first(); $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++; $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; $this->isValid = false;
} }

4
app/Jobs/Util/Import.php
View File

@ -724,8 +724,10 @@ class Import implements ShouldQueue
if($modified['amount'] >= 0) if($modified['amount'] >= 0)
$modified['invoices'][$key]['invoice_id'] = $this->transformId('invoices', $invoice['invoice_id']); $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]['credit_id'] = $this->transformId('credits', $invoice['invoice_id']);
$modified['credits'][$key]['amount'] = $modified['invoices'][$key]['amount'];
}
} }
} }

14
app/Repositories/Migration/PaymentMigrationRepository.php
View File

@ -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 = new \stdClass;
$fields->payment_id = $payment->id; $fields->payment_id = $payment->id;