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

Fixes for showing fees in both the product and tax tables

Browse Source
This commit is contained in:
David Bomba 2022-08-19 08:41:50 +10:00
parent 14f8541e4d
commit e716bb5a02
5 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Requests/Login/LoginRequest.php
View File

@ -47,15 +47,4 @@ class LoginRequest extends Request
]; ];
} }
// public function prepareForValidation()
// {
// $input = $this->all();
// // if(base64_decode(base64_encode($input['password'])) === $input['password'])
// // $input['password'] = base64_decode($input['password']);
// // nlog($input['password']);
// $this->replace($input);
// }
} }

3
app/Http/ValidationRules/Account/BlackListRule.php
View File

@ -24,7 +24,8 @@ class BlackListRule implements Rule
'vusra.com', 'vusra.com',
'fourthgenet.com', 'fourthgenet.com',
'arxxwalls.com', 'arxxwalls.com',
'superhostforumla.com' 'superhostforumla.com',
'wnpop.com',
]; ];
/** /**

2
app/Services/PdfMaker/Design.php
View File

@ -394,7 +394,7 @@ class Design extends BaseDesign
public function productTable(): array public function productTable(): array
{ {
$product_items = collect($this->entity->line_items)->filter(function ($item) { $product_items = collect($this->entity->line_items)->filter(function ($item) {
return $item->type_id == 1 || $item->type_id == 6; return $item->type_id == 1 || $item->type_id == 6 || $item->type_id == 5;
}); });
if (count($product_items) == 0) { if (count($product_items) == 0) {

4
app/Utils/Traits/MakesInvoiceValues.php
View File

@ -282,9 +282,9 @@ trait MakesInvoiceValues
} }
if ($table_type == '$task' && $item->type_id != 2) { if ($table_type == '$task' && $item->type_id != 2) {
if ($item->type_id != 4 && $item->type_id != 5) { // if ($item->type_id != 4 && $item->type_id != 5) {
continue; continue;
} // }
} }
$helpers = new Helpers(); $helpers = new Helpers();

39
tests/Unit/InvoiceTest.php
View File

@ -13,6 +13,7 @@ namespace Tests\Unit;
use App\Factory\InvoiceItemFactory; use App\Factory\InvoiceItemFactory;
use App\Helpers\Invoice\InvoiceSum; use App\Helpers\Invoice\InvoiceSum;
use App\Helpers\Invoice\InvoiceSumInclusive;
use App\Models\Invoice; use App\Models\Invoice;
use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Foundation\Testing\DatabaseTransactions;
use Tests\MockAccountData; use Tests\MockAccountData;
@ -41,11 +42,47 @@ class InvoiceTest extends TestCase
$this->invoice->line_items = $this->buildLineItems(); $this->invoice->line_items = $this->buildLineItems();
$this->invoice->usesinclusive_taxes = true; $this->invoice->uses_inclusive_taxes = true;
$this->invoice_calc = new InvoiceSum($this->invoice); $this->invoice_calc = new InvoiceSum($this->invoice);
} }
public function testInclusiveRounding()
{
$this->invoice->line_items = [];
$this->invoice->discount = 0;
$this->invoice->uses_inclusive_taxes = true;
$this->invoice->save();
$item = InvoiceItemFactory::create();
$item->quantity = 1;
$item->cost = 50;
$item->tax_name1 = "taxy";
$item->tax_rate1 = 19;
$line_items[] = $item;
$item = InvoiceItemFactory::create();
$item->quantity = 1;
$item->cost = 50;
$item->tax_name1 = "taxy";
$item->tax_rate1 = 19;
$line_items[] = $item;
$this->invoice->line_items = $line_items;
$this->invoice->save();
$invoice_calc = new InvoiceSumInclusive($this->invoice);
$invoice_calc->build();
// $this->invoice->save();
$this->assertEquals($invoice_calc->getTotalTaxes(), 15.96);
}
private function buildLineItems() private function buildLineItems()
{ {
$line_items = []; $line_items = [];