Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 06:54:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

FIxes for check data

Browse Source
This commit is contained in:
David Bomba 2022-05-07 09:50:25 +10:00
parent b7e00952fa
commit 37ea391ae4
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -699,7 +699,7 @@ ORDER BY clients.id;
invoices ON invoices ON
clients.id=invoices.client_id clients.id=invoices.client_id
WHERE invoices.is_deleted = false WHERE invoices.is_deleted = false
AND invoices.status_id > 1 AND invoices.status_id IN (2,3)
GROUP BY clients.id GROUP BY clients.id
HAVING invoice_balance != clients.balance HAVING invoice_balance != clients.balance
ORDER BY clients.id; ORDER BY clients.id;
@ -722,21 +722,16 @@ ORDER BY clients.id;
{ {
$client = (array)$client; $client = (array)$client;
// $credit_balance = Credit::withTrashed()->where('is_deleted', 0)
// ->where('client_id', $client['client_id'])
// ->where('status_id', '>', 1)->sum('balance');
// $invoice_balance = $client['invoice_balance'] - $credit_balance;
$invoice_balance = $client['invoice_balance']; $invoice_balance = $client['invoice_balance'];
$ledger = CompanyLedger::where('client_id', $client['client_id'])->orderBy('id', 'DESC')->first(); // $ledger = CompanyLedger::where('client_id', $client['client_id'])->orderBy('id', 'DESC')->first();
if ($ledger && (string) $invoice_balance != (string) $client['client_balance']) { if ((string) $invoice_balance != (string) $client['client_balance']) {
$this->wrong_paid_to_dates++; $this->wrong_paid_to_dates++;
$client_object = Client::withTrashed()->find($client['client_id']); $client_object = Client::withTrashed()->find($client['client_id']);
$this->logMessage($client_object->present()->name.' - '.$client_object->id." - calculated client balances do not match Invoice Balances = {$invoice_balance} - Client Balance = ".rtrim($client['client_balance'], '0'). " Ledger balance = {$ledger->balance}"); $this->logMessage($client_object->present()->name.' - '.$client_object->id." - calculated client balances do not match Invoice Balances = {$invoice_balance} - Client Balance = ".rtrim($client['client_balance'], '0'));
if($this->option('ledger_balance')){ if($this->option('ledger_balance')){
@ -745,10 +740,10 @@ ORDER BY clients.id;
$client_object->balance = $invoice_balance; $client_object->balance = $invoice_balance;
$client_object->save(); $client_object->save();
$ledger->adjustment = $invoice_balance; // $ledger->adjustment = $invoice_balance;
$ledger->balance = $invoice_balance; // $ledger->balance = $invoice_balance;
$ledger->notes = 'Ledger Adjustment'; // $ledger->notes = 'Ledger Adjustment';
$ledger->save(); // $ledger->save();
} }
@ -799,7 +794,7 @@ ORDER BY clients.id;
ON invoices.client_id = clients.id ON invoices.client_id = clients.id
WHERE invoices.is_deleted = 0 WHERE invoices.is_deleted = 0
AND clients.is_deleted = 0 AND clients.is_deleted = 0
AND invoices.status_id != 1 AND invoices.status_id IN (2,3)
GROUP BY clients.id GROUP BY clients.id
HAVING(invoices_balance != clients.balance) HAVING(invoices_balance != clients.balance)
ORDER BY clients.id; ORDER BY clients.id;

2
app/Http/Controllers/ClientPortal/InvitationController.php
View File

@ -165,6 +165,8 @@ class InvitationController extends Controller
public function routerForDownload(string $entity, string $invitation_key) public function routerForDownload(string $entity, string $invitation_key)
{ {
set_time_limit(45);
if(Ninja::isHosted()) if(Ninja::isHosted())
return $this->returnRawPdf($entity, $invitation_key); return $this->returnRawPdf($entity, $invitation_key);