Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for accessor

This commit is contained in:
David Bomba 2025-11-18 14:41:39 +11:00
parent 226c881eef
commit cd3cf81f65
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/Report/TaxPeriodReport.php
View File

@ -536,7 +536,7 @@ class TaxPeriodReport extends BaseExport
$this->data['invoices'][] = [ $this->data['invoices'][] = [
$invoice->number, $invoice->number,
$invoice->date, $invoice->date,
$invoice->metadata->tax_report->tax_summary->adjustment, $state->metadata->tax_report->tax_summary->adjustment,
$state->metadata->tax_report->payment_history?->sum('amount') ?? 0, $state->metadata->tax_report->payment_history?->sum('amount') ?? 0,
$state->metadata->tax_report->tax_summary->tax_adjustment, $state->metadata->tax_report->tax_summary->tax_adjustment,
$state->metadata->tax_report->tax_summary->total_paid, $state->metadata->tax_report->tax_summary->total_paid,

17
tests/Feature/Export/TaxPeriodReportTest.php
View File

@ -199,7 +199,7 @@ class TaxPeriodReportTest extends TestCase
$transaction_event = $invoice->transaction_events()->first(); $transaction_event = $invoice->transaction_events()->first();
nlog($transaction_event->metadata->toArray()); // nlog($transaction_event->metadata->toArray());
$this->assertNotNull($transaction_event); $this->assertNotNull($transaction_event);
$this->assertEquals(330, $transaction_event->invoice_amount); $this->assertEquals(330, $transaction_event->invoice_amount);
$this->assertEquals('2025-10-01', $invoice->date); $this->assertEquals('2025-10-01', $invoice->date);
@ -321,7 +321,6 @@ class TaxPeriodReportTest extends TestCase
$this->assertEquals(30, $transaction_event->metadata->tax_report->tax_summary->total_taxes); $this->assertEquals(30, $transaction_event->metadata->tax_report->tax_summary->total_taxes);
$this->assertEquals(0, $transaction_event->invoice_paid_to_date); $this->assertEquals(0, $transaction_event->invoice_paid_to_date);
$this->travelTo(\Carbon\Carbon::createFromDate(2025, 11, 5)->startOfDay()); $this->travelTo(\Carbon\Carbon::createFromDate(2025, 11, 5)->startOfDay());
$line_items = []; $line_items = [];
@ -343,7 +342,7 @@ class TaxPeriodReportTest extends TestCase
$transaction_event = $invoice->transaction_events()->orderBy('timestamp', 'desc')->first(); $transaction_event = $invoice->transaction_events()->orderBy('timestamp', 'desc')->first();
nlog($transaction_event->metadata); // nlog($transaction_event->metadata);
$this->assertEquals('2025-11-30', $transaction_event->period->format('Y-m-d')); $this->assertEquals('2025-11-30', $transaction_event->period->format('Y-m-d'));
$this->assertEquals(440, $transaction_event->invoice_amount); $this->assertEquals(440, $transaction_event->invoice_amount);
$this->assertEquals("delta", $transaction_event->metadata->tax_report->tax_summary->status); $this->assertEquals("delta", $transaction_event->metadata->tax_report->tax_summary->status);
@ -352,6 +351,18 @@ class TaxPeriodReportTest extends TestCase
$this->assertEquals(10, $transaction_event->metadata->tax_report->tax_summary->tax_adjustment); $this->assertEquals(10, $transaction_event->metadata->tax_report->tax_summary->tax_adjustment);
$payload = [
'start_date' => '2025-11-01',
'end_date' => '2025-11-30',
'date_range' => 'custom',
'is_income_billed' => true,
];
$pl = new TaxPeriodReport($this->company, $payload);
$data = $pl->boot()->getData();
nlog($data);
} }
public function invoiceReportingOverMultiplePeriodsWithCashAccountingCheckAdjustments() public function invoiceReportingOverMultiplePeriodsWithCashAccountingCheckAdjustments()