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

Fixes to check data script

Browse Source
This commit is contained in:
Hillel Coren 2016-08-25 17:29:55 +03:00
parent 1b19d09f79
commit f9a17a595d
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,10 +8,10 @@ use Symfony\Component\Console\Input\InputOption;
/* /*
################################################################## ##################################################################
WARNING: Please backup your database before running this script WARNING: Please backup your database before running this script
################################################################## ##################################################################
Since the application was released a number of bugs have inevitably been found. Since the application was released a number of bugs have inevitably been found.
Although the bugs have always been fixed in some cases they've caused the client's Although the bugs have always been fixed in some cases they've caused the client's
balance, paid to date and/or activity records to become inaccurate. This script will balance, paid to date and/or activity records to become inaccurate. This script will
check for errors and correct the data. check for errors and correct the data.
@ -24,7 +24,7 @@ php artisan ninja:check-data
Options: Options:
--client_id:<value> --client_id:<value>
Limits the script to a single client Limits the script to a single client
@ -50,7 +50,7 @@ class CheckData extends Command {
* @var string * @var string
*/ */
protected $description = 'Check/fix data'; protected $description = 'Check/fix data';
public function fire() public function fire()
{ {
$this->info(date('Y-m-d') . ' Running CheckData...'); $this->info(date('Y-m-d') . ' Running CheckData...');
@ -107,7 +107,7 @@ class CheckData extends Command {
if ($entityType != ENTITY_CLIENT) { if ($entityType != ENTITY_CLIENT) {
$records = $records->join('clients', 'clients.id', '=', "{$table}.client_id"); $records = $records->join('clients', 'clients.id', '=', "{$table}.client_id");
} }
$records = $records->where("{$table}.account_id", '!=', DB::raw("{$entityType}s.account_id")) $records = $records->where("{$table}.account_id", '!=', DB::raw("{$entityType}s.account_id"))
->get(["{$table}.id", 'clients.account_id', 'clients.user_id']); ->get(["{$table}.id", 'clients.account_id', 'clients.user_id']);
@ -136,12 +136,14 @@ class CheckData extends Command {
->join('payments', 'payments.client_id', '=', 'clients.id') ->join('payments', 'payments.client_id', '=', 'clients.id')
->join('invoices', 'invoices.id', '=', 'payments.invoice_id') ->join('invoices', 'invoices.id', '=', 'payments.invoice_id')
->where('payments.is_deleted', '=', 0) ->where('payments.is_deleted', '=', 0)
->where('payments.payment_status_id', '!=', 2)
->where('payments.payment_status_id', '!=', 3)
->where('invoices.is_deleted', '=', 0) ->where('invoices.is_deleted', '=', 0)
->groupBy('clients.id') ->groupBy('clients.id')
->havingRaw('clients.paid_to_date != sum(payments.amount) and clients.paid_to_date != 999999999.9999') ->havingRaw('clients.paid_to_date != sum(payments.amount - payments.refunded) 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->info(count($clients) . ' clients with incorrect paid to date'); $this->info(count($clients) . ' clients with incorrect paid to date');
if ($this->option('fix') == 'true') { if ($this->option('fix') == 'true') {
foreach ($clients as $client) { foreach ($clients as $client) {
DB::table('clients') DB::table('clients')
@ -166,14 +168,14 @@ class CheckData extends Command {
->where('invoices.is_recurring', '=', 0) ->where('invoices.is_recurring', '=', 0)
->havingRaw('abs(clients.balance - sum(invoices.balance)) > .01 and clients.balance != 999999999.9999'); ->havingRaw('abs(clients.balance - sum(invoices.balance)) > .01 and clients.balance != 999999999.9999');
} }
$clients = $clients->groupBy('clients.id', 'clients.balance', 'clients.created_at') $clients = $clients->groupBy('clients.id', 'clients.balance', 'clients.created_at')
->orderBy('clients.id', 'DESC') ->orderBy('accounts.company_id', 'DESC')
->get(['clients.account_id', 'clients.id', 'clients.balance', 'clients.paid_to_date', DB::raw('sum(invoices.balance) actual_balance')]); ->get(['accounts.company_id', 'clients.account_id', 'clients.id', 'clients.balance', 'clients.paid_to_date', DB::raw('sum(invoices.balance) actual_balance')]);
$this->info(count($clients) . ' clients with incorrect balance/activities'); $this->info(count($clients) . ' clients with incorrect balance/activities');
foreach ($clients as $client) { foreach ($clients as $client) {
$this->info("=== Client:{$client->id} Balance:{$client->balance} Actual Balance:{$client->actual_balance} ==="); $this->info("=== Company: {$client->company_id} Account:{$client->account_id} Client:{$client->id} Balance:{$client->balance} Actual Balance:{$client->actual_balance} ===");
$foundProblem = false; $foundProblem = false;
$lastBalance = 0; $lastBalance = 0;
$lastAdjustment = 0; $lastAdjustment = 0;
@ -212,7 +214,7 @@ class CheckData extends Command {
if ($activity->activity_type_id == ACTIVITY_TYPE_CREATE_INVOICE if ($activity->activity_type_id == ACTIVITY_TYPE_CREATE_INVOICE
|| $activity->activity_type_id == ACTIVITY_TYPE_CREATE_QUOTE) { || $activity->activity_type_id == ACTIVITY_TYPE_CREATE_QUOTE) {
// Get original invoice amount // Get original invoice amount
$update = DB::table('activities') $update = DB::table('activities')
->where('invoice_id', '=', $activity->invoice_id) ->where('invoice_id', '=', $activity->invoice_id)
@ -354,4 +356,4 @@ class CheckData extends Command {
]; ];
} }
} }