Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 16:54:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge check data changes

Browse Source
This commit is contained in:
Hillel Coren 2017-10-22 10:12:56 +03:00
parent 42d9282a9e
commit e888c60eb2
1 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,8 +76,9 @@ class CheckData extends Command
$this->checkDraftSentInvoices(); $this->checkDraftSentInvoices();
} }
//$this->checkInvoices(); $this->checkInvoices();
$this->checkBalances(); $this->checkInvoiceBalances();
$this->checkClientBalances();
$this->checkContacts(); $this->checkContacts();
$this->checkUserAccounts(); $this->checkUserAccounts();
@ -96,7 +97,7 @@ class CheckData extends Command
Mail::raw($this->log, function ($message) use ($errorEmail, $database) { Mail::raw($this->log, function ($message) use ($errorEmail, $database) {
$message->to($errorEmail) $message->to($errorEmail)
->from(CONTACT_EMAIL) ->from(CONTACT_EMAIL)
->subject("Check-Data [{$database}]: " . strtoupper($this->isValid ? RESULT_SUCCESS : RESULT_FAILURE)); ->subject("Check-Data: " . strtoupper($this->isValid ? RESULT_SUCCESS : RESULT_FAILURE) . " [{$database}]");
}); });
} elseif (! $this->isValid) { } elseif (! $this->isValid) {
throw new Exception('Check data failed!!'); throw new Exception('Check data failed!!');
@ -530,21 +531,27 @@ class CheckData extends Command
{ {
// update client paid_to_date value // update client paid_to_date value
$clients = DB::table('clients') $clients = DB::table('clients')
->join('payments', 'payments.client_id', '=', 'clients.id') ->leftJoin('invoices', function($join) {
->join('invoices', 'invoices.id', '=', 'payments.invoice_id') $join->on('invoices.client_id', '=', 'clients.id')
->where('payments.is_deleted', '=', 0) ->where('invoices.is_deleted', '=', 0);
})
->leftJoin('payments', function($join) {
$join->on('payments.invoice_id', '=', 'invoices.id')
->where('payments.payment_status_id', '!=', 2) ->where('payments.payment_status_id', '!=', 2)
->where('payments.payment_status_id', '!=', 3) ->where('payments.payment_status_id', '!=', 3)
->where('invoices.is_deleted', '=', 0) ->where('payments.is_deleted', '=', 0);
})
->where('clients.updated_at', '>', '2017-10-01')
->groupBy('clients.id') ->groupBy('clients.id')
->havingRaw('clients.paid_to_date != sum(payments.amount - payments.refunded) and clients.paid_to_date != 999999999.9999') ->havingRaw('clients.paid_to_date != sum(coalesce(payments.amount - payments.refunded, 0)) and clients.paid_to_date != 999999999.9999')
->get(['clients.id', 'clients.paid_to_date', DB::raw('sum(payments.amount) as amount')]); ->get(['clients.id', 'clients.paid_to_date', DB::raw('sum(coalesce(payments.amount - payments.refunded, 0)) as amount')]);
$this->logMessage(count($clients) . ' clients with incorrect paid to date'); $this->logMessage(count($clients) . ' clients with incorrect paid to date');
if (count($clients) > 0) { if (count($clients) > 0) {
$this->isValid = false; $this->isValid = false;
} }
/*
if ($this->option('fix') == 'true') { if ($this->option('fix') == 'true') {
foreach ($clients as $client) { foreach ($clients as $client) {
DB::table('clients') DB::table('clients')
@ -552,9 +559,31 @@ class CheckData extends Command
->update(['paid_to_date' => $client->amount]); ->update(['paid_to_date' => $client->amount]);
} }
} }
*/
} }
private function checkBalances() private function checkInvoiceBalances()
{
$invoices = DB::table('invoices')
->leftJoin('payments', function($join) {
$join->on('payments.invoice_id', '=', 'invoices.id')
->where('payments.payment_status_id', '!=', 2)
->where('payments.payment_status_id', '!=', 3)
->where('payments.is_deleted', '=', 0);
})
->where('invoices.updated_at', '>', '2017-10-01')
->groupBy('invoices.id')
->havingRaw('(invoices.amount - invoices.balance) != coalesce(sum(payments.amount - payments.refunded), 0)')
->get(['invoices.id', 'invoices.amount', 'invoices.balance', DB::raw('coalesce(sum(payments.amount - payments.refunded), 0)')]);
$this->logMessage(count($invoices) . ' invoices with incorrect balances');
if (count($invoices) > 0) {
$this->isValid = false;
}
}
private function checkClientBalances()
{ {
// find all clients where the balance doesn't equal the sum of the outstanding invoices // find all clients where the balance doesn't equal the sum of the outstanding invoices
$clients = DB::table('clients') $clients = DB::table('clients')