- {{--TODO: pridat textove logo--}}
@if($user->invoiceProfile->logo)
 }})
+ @else
+
@@ -90,7 +91,7 @@
- {{ $user->invoiceProfile->company }}
@endif {{ $user->invoiceProfile->email }} @@ -80,7 +81,7 @@Dodávateľ:
-{{ $invoice->user['company'] }}
+{{ $invoice->user['company'] }}
{{ $invoice->user['registration_notes'] }}{{ $invoice->user['postal_code'] }}, {{ $invoice->user['country'] }}
+
- {{ invoice_item_only_tax_price($item, true) }}
+ {{ format_to_currency(invoice_item_only_tax_price($item)) }}
- {{ invoice_item_with_tax_price($item, true) }}
+ {{ format_to_currency(invoice_item_with_tax_price($item)) }}
@endif
@@ -203,64 +204,42 @@
{{--Item Summary--}}
- {{--TODO: doplnit vypis za danove sadzby--}}
- {{--TODO: dokoncit prepocitavanie zlav--}}
Faktúračné údaje:
@isset($invoice->user['ico']) @@ -191,10 +192,10 @@ @if($invoice->user['ic_dph'])-
@if($invoice->discount_type)
-
- +
- Zlava za doklad: - - -{{ invoice_total_discount($invoice, true) }} + -{{ $invoice->discount_type === 'percent' ? $invoice->discount_rate . '%' : format_to_currency($invoice->discount_rate) }} @endif - {{--VAT Payer--}} - @if($invoice->user['ic_dph'] && ! $invoice->discount_type) -
- - Cena bez DPH: - {{ format_to_currency($invoice->total_net) }} - -
- - DPH: - {{ format_to_currency($invoice->total_tax) }} - + {{--VAT Base--}} + @if($invoice->user['ic_dph']) +
- + VAT Base {{ $item['rate'] }}%: + {{ format_to_currency($item['total']) }} + + @endforeach +
- - Cena bez DPH: - - @if($invoice->discount_type === 'percent') - - {{ format_to_currency($invoice->total_net * ((100 - $invoice->discount_rate) / 100)) }} - @endif - @if($invoice->discount_type === 'value') - - {{ format_to_currency(($invoice->total_net + invoice_total_tax($invoice)) / ((100 - $invoice->discount_rate) / 100)) }} - @endif - - -
- - DPH: - @if($invoice->discount_type === 'percent') - - {{ format_to_currency(invoice_total_tax($invoice) * ((100 - $invoice->discount_rate) / 100)) }} - @endif - @if($invoice->discount_type === 'value') - - @endif - + {{--VAT Summary--}} + @if($invoice->user['ic_dph']) +
- + VAT {{ $item['rate'] }}%: + {{ format_to_currency($item['total']) }} + + @endforeach +
- Spolu k úhrade: - @if($invoice->user['ic_dph']) - {{ format_to_currency(invoice_total_net($invoice) + invoice_total_tax($invoice)) }} - @else - {{ format_to_currency(invoice_total_net($invoice)) }} - @endif + {{ format_to_currency(invoice_total($invoice)) }}
+ @foreach(invoice_tax_base($invoice) as $item)
+
@endif
- {{--VAT Payer with Discount--}}
- @if($invoice->user['ic_dph'] && $invoice->discount_type)
-
+ @foreach(invoice_tax_summary($invoice) as $item)
+
@endif
@if(is_route('invoice-debug') && $user->invoiceProfile->stamp)
- 
+ 
@endif
@if(! is_route('invoice-debug') && $user->invoiceProfile->stamp)
diff --git a/tests/Feature/Oasis/OasisInvoiceTest.php b/tests/Feature/Oasis/OasisInvoiceTest.php
index bf0ac7f5..93526063 100644
--- a/tests/Feature/Oasis/OasisInvoiceTest.php
+++ b/tests/Feature/Oasis/OasisInvoiceTest.php
@@ -66,7 +66,6 @@ class OasisInvoiceTest extends TestCase
];
$this->assertEquals(4, invoice_item_only_tax_price($item));
- $this->assertEquals('4,00 Kč', invoice_item_only_tax_price($item, true));
}
/**
@@ -82,7 +81,6 @@ class OasisInvoiceTest extends TestCase
];
$this->assertEquals(24, invoice_item_with_tax_price($item));
- $this->assertEquals('24,00 Kč', invoice_item_with_tax_price($item, true));
}
/**
@@ -91,8 +89,9 @@ class OasisInvoiceTest extends TestCase
public function it_test_invoice_total_net()
{
$invoice = [
- 'currency' => 'CZK',
- 'items' => [
+ 'discount_type' => null,
+ 'currency' => 'CZK',
+ 'items' => [
[
'description' => 'Test 1',
'amount' => 1,
@@ -108,54 +107,7 @@ class OasisInvoiceTest extends TestCase
]
];
- $this->assertEquals(170, invoice_total_net($invoice));
- $this->assertEquals('170,00 Kč', invoice_total_net($invoice, true));
- }
-
- /**
- * @test
- */
- public function it_test_invoice_total_discount_as_percent()
- {
- $invoice = [
- 'currency' => 'CZK',
- 'discount_type' => 'percent',
- 'discount_rate' => 15,
- 'items' => [
- [
- 'description' => 'Test 1',
- 'amount' => 1,
- 'tax_rate' => 0,
- 'price' => 200,
- ],
- ]
- ];
-
- $this->assertEquals(30, invoice_total_discount($invoice));
- $this->assertEquals('30,00 Kč', invoice_total_discount($invoice, true));
- }
-
- /**
- * @test
- */
- public function it_test_invoice_total_discount_as_value()
- {
- $invoice = [
- 'currency' => 'CZK',
- 'discount_type' => 'value',
- 'discount_rate' => 18,
- 'items' => [
- [
- 'description' => 'Test 1',
- 'amount' => 1,
- 'tax_rate' => 20,
- 'price' => 100,
- ],
- ]
- ];
-
- $this->assertEquals(18, invoice_total_discount($invoice));
- $this->assertEquals('18,00 Kč', invoice_total_discount($invoice, true));
+ $this->assertEquals(204, invoice_total($invoice));
}
/**
@@ -184,7 +136,6 @@ class OasisInvoiceTest extends TestCase
];
$this->assertEquals(40, invoice_total_tax($invoice));
- $this->assertEquals('40,00 Kč', invoice_total_tax($invoice, true));
}
/**