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

Minor fixeS

Browse Source
This commit is contained in:
David Bomba 2023-11-07 20:04:56 +11:00
parent 7de0cd99f1
commit 2c567a0d95
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Jobs/Ledger/UpdateLedger.php
View File

@ -40,18 +40,25 @@ class UpdateLedger implements ShouldQueue
*/ */
public function handle() :void public function handle() :void
{ {
// nlog("Updating company ledger for client ". $this->company_ledger_id); nlog("Updating company ledger for client ". $this->company_ledger_id);
MultiDB::setDb($this->db); MultiDB::setDb($this->db);
$cl = CompanyLedger::find($this->company_ledger_id); $cl = CompanyLedger::find($this->company_ledger_id);
$ledger_item = CompanyLedger::query()
->where('company_id', $cl->company_id)
->where('client_id', $cl->client_id)
->where('company_ledgerable_id', $cl->company_ledgerable_id)
->where('company_ledgerable_type', $cl->company_ledgerable_type)
->exists();
if(!$cl) if(!$cl)
return; return;
$entity = $cl->company_ledgerable; $entity = $cl->company_ledgerable;
$balance = $entity->calc()->getBalance(); $balance = $entity->calc()->getBalance();
$cl->adjustment = $balance - $this->start_amount; $cl->adjustment = $ledger_item ? $balance - $this->start_amount : $balance;
$parent_ledger = CompanyLedger::query() $parent_ledger = CompanyLedger::query()
->where('id', '<', $cl->id) ->where('id', '<', $cl->id)

2
app/Services/Invoice/MarkSent.php
View File

@ -46,7 +46,7 @@ class MarkSent extends AbstractService
// ->updateInvoiceBalance($adjustment, "Invoice {$this->invoice->number} marked as sent."); // ->updateInvoiceBalance($adjustment, "Invoice {$this->invoice->number} marked as sent.");
$this->invoice->ledger()->mutateInvoiceBalance($this->invoice->amount, "Invoice {$this->invoice->number} marked as sent."); $this->invoice->ledger()->mutateInvoiceBalance($this->invoice->amount, "Invoice {$this->invoice->number} marked as sent => {$this->invoice->amount}");
$this->invoice->client->service()->calculateBalance(); $this->invoice->client->service()->calculateBalance();