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 for options key pushing

Browse Source
This commit is contained in:
Benjamin Beganović 2021-09-15 17:21:31 +02:00
parent 00cf8b7023
commit 77f9c95139
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Services/Client/Statement.php
View File

@ -47,7 +47,9 @@ class Statement
public function run(): ?string public function run(): ?string
{ {
$this->setupEntity()->setupOptions(); $this
->setupOptions()
->setupEntity();
$html = new HtmlEngine($this->getInvitation()); $html = new HtmlEngine($this->getInvitation());
@ -111,10 +113,6 @@ class Statement
$this->entity = $this->getInvoices()->first(); $this->entity = $this->getInvoices()->first();
} }
if (count($this->getPayments()) >= 1) {
$this->entity = $this->getPayments()->first();
}
return $this; return $this;
} }
@ -125,19 +123,19 @@ class Statement
*/ */
protected function setupOptions(): self protected function setupOptions(): self
{ {
if (\array_key_exists('start_date', $this->options)) { if (! \array_key_exists('start_date', $this->options)) {
$this->options['start_date'] = now()->startOfYear()->format('Y-m-d'); $this->options['start_date'] = now()->startOfYear()->format('Y-m-d');
} }
if (\array_key_exists('end_date', $this->options)) { if (! \array_key_exists('end_date', $this->options)) {
$this->options['end_date'] = now()->format('Y-m-d'); $this->options['end_date'] = now()->format('Y-m-d');
} }
if (\array_key_exists('show_payments_table', $this->options)) { if (! \array_key_exists('show_payments_table', $this->options)) {
$this->options['show_payments_table'] = false; $this->options['show_payments_table'] = false;
} }
if (\array_key_exists('show_aging_table', $this->options)) { if (! \array_key_exists('show_aging_table', $this->options)) {
$this->options['show_aging_table'] = false; $this->options['show_aging_table'] = false;
} }
@ -182,7 +180,7 @@ class Statement
if ($this->entity instanceof Invoice || $this->entity instanceof Payment) { if ($this->entity instanceof Invoice || $this->entity instanceof Payment) {
return $this->entity->invitations->first(); return $this->entity->invitations->first();
} }
return false; return false;
} }