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

Improved checks

Browse Source
This commit is contained in:
Hillel Coren 2017-10-22 00:38:31 +03:00
parent e62213d221
commit 855576018b
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,8 @@ class CheckData extends Command
} }
$this->checkInvoices(); $this->checkInvoices();
$this->checkBalances(); $this->checkInvoiceBalances();
$this->checkClientBalances();
$this->checkContacts(); $this->checkContacts();
$this->checkUserAccounts(); $this->checkUserAccounts();
@ -530,14 +531,14 @@ 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('payments', function($join) {
->join('invoices', 'invoices.id', '=', 'payments.invoice_id') $join->on('payments.client_id', '=', 'clients.id')
->where('payments.is_deleted', '=', 0)
->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);
})
->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 != coalesce(sum(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(payments.amount) as amount')]);
$this->logMessage(count($clients) . ' clients with incorrect paid to date'); $this->logMessage(count($clients) . ' clients with incorrect paid to date');
@ -554,7 +555,28 @@ class CheckData extends Command
} }
} }
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')