Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 05:34:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve resolution of decimal calculations

Browse Source
This commit is contained in:
David Bomba 2023-08-31 15:16:53 +10:00
parent 08f3ba06a4
commit 01af6cb284
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Export/CSV/PurchaseOrderItemExport.php
View File

@ -109,7 +109,7 @@ class PurchaseOrderItemExport extends BaseExport
$transformed_purchase_order = $this->buildRow($purchase_order); $transformed_purchase_order = $this->buildRow($purchase_order);
$transformed_items = []; $transformed_items = [];
nlog($purchase_order->toArray());
foreach ($purchase_order->line_items as $item) { foreach ($purchase_order->line_items as $item) {
$item_array = []; $item_array = [];

12
app/Helpers/Invoice/InvoiceItemSum.php
View File

@ -333,18 +333,6 @@ class InvoiceItemSum
return $this; return $this;
} }
public function getRoundedLineTotal(): float
{
$total = 0;
foreach($this->line_items as $item)
{
$total += round($item->line_total, $this->currency->precision);
}
return $total;
}
public function getLineTotal() public function getLineTotal()
{ {
return $this->item->line_total; return $this->item->line_total;

1
app/Models/Scheduler.php
View File

@ -168,7 +168,6 @@ class Scheduler extends BaseModel
$next_run = null; $next_run = null;
} }
$this->next_run_client = $next_run ?: null; $this->next_run_client = $next_run ?: null;
$this->next_run = $next_run ? $next_run->copy()->addSeconds($offset) : null; $this->next_run = $next_run ? $next_run->copy()->addSeconds($offset) : null;
$this->save(); $this->save();

14
tests/Feature/Scheduler/SchedulerTest.php
View File

@ -19,15 +19,15 @@ use Tests\MockAccountData;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use App\Models\RecurringInvoice; use App\Models\RecurringInvoice;
use App\Factory\SchedulerFactory; use App\Factory\SchedulerFactory;
use App\Services\Scheduler\EmailReport;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\Session;
use App\DataMapper\Schedule\EmailStatement; use App\DataMapper\Schedule\EmailStatement;
use Illuminate\Validation\ValidationException; use Illuminate\Validation\ValidationException;
use Illuminate\Foundation\Testing\WithoutEvents; use Illuminate\Foundation\Testing\WithoutEvents;
use App\Services\Scheduler\EmailStatementService; use App\Services\Scheduler\EmailStatementService;
use App\Services\Scheduler\EmailReport;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Routing\Middleware\ThrottleRequests; use Illuminate\Routing\Middleware\ThrottleRequests;
use Illuminate\Foundation\Testing\DatabaseTransactions;
/** /**
* @test * @test
@ -95,7 +95,7 @@ class SchedulerTest extends TestCase
$data = [ $data = [
'name' => 'A test product sales scheduler', 'name' => 'A test product sales scheduler',
'frequency_id' => RecurringInvoice::FREQUENCY_MONTHLY, 'frequency_id' => RecurringInvoice::FREQUENCY_MONTHLY,
'next_run' => now()->format('Y-m-d'), 'next_run' => now()->startOfDay()->format('Y-m-d'),
'template' => 'email_report', 'template' => 'email_report',
'parameters' => [ 'parameters' => [
'date_range' => EmailStatement::LAST_MONTH, 'date_range' => EmailStatement::LAST_MONTH,
@ -132,8 +132,10 @@ class SchedulerTest extends TestCase
$this->assertNotNull($scheduler); $this->assertNotNull($scheduler);
$export = (new EmailReport($scheduler))->run(); $export = (new EmailReport($scheduler))->run();
$this->assertEquals(now()->addMonth()->format('Y-m-d'), $scheduler->next_run->format('Y-m-d')); nlog($scheduler->fresh()->toArray());
$this->assertEquals(now()->startOfDay()->addMonthNoOverflow()->format('Y-m-d'), $scheduler->next_run->format('Y-m-d'));
} }
@ -179,7 +181,7 @@ class SchedulerTest extends TestCase
$export = (new EmailReport($scheduler))->run(); $export = (new EmailReport($scheduler))->run();
$this->assertEquals(now()->addMonth()->format('Y-m-d'), $scheduler->next_run->format('Y-m-d')); $this->assertEquals(now()->addMonthNoOverflow()->format('Y-m-d'), $scheduler->next_run->format('Y-m-d'));
} }
@ -222,7 +224,7 @@ class SchedulerTest extends TestCase
$export = (new EmailReport($scheduler))->run(); $export = (new EmailReport($scheduler))->run();
$this->assertEquals(now()->addMonth()->format('Y-m-d'), $scheduler->next_run->format('Y-m-d')); $this->assertEquals(now()->addMonthNoOverflow()->format('Y-m-d'), $scheduler->next_run->format('Y-m-d'));
} }