gitmedia/mivita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug Netto in Card to Brutto

Browse source
This commit is contained in:
Kevin Adametz 2019-06-11 14:35:33 +02:00
parent ebac67b81f
commit 8cae2f92a4
7 changed files with 254 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/views/web/templates/card.blade.php
View file

@ -211,12 +211,12 @@
<span class="pull-left small">Versandkosten:</span>
</div>
<hr class="mt-4 mb-4">
<div class="clearfix mb-2">
<div class="clearfix mb-2" style="font-size: 90%">
<span class="pull-right small">{{ Yard::instance('shopping')->subtotalWithShipping() }} €</span>
<span class="pull-left small">Summe ohne MwSt:</span>
</div>
<div class="clearfix mb-2">
<div class="clearfix mb-2" style="font-size: 90%">
<span class="pull-right small">{{ Yard::instance('shopping')->taxWithShipping() }} €</span>
<span class="pull-left small"> zzgl. {{ Yard::getTaxRate() }} % MwSt:</span>
</div>

4
resources/views/web/templates/checkout.blade.php
View file

@ -584,12 +584,12 @@
<hr class="mt-4 mb-4">
<div class="clearfix mb-2">
<div class="clearfix mb-2" style="font-size: 90%">
<span class="pull-right small">{{ Yard::instance('shopping')->subtotalWithShipping() }} €</span>
<span class="pull-left small">Summe ohne MwSt:</span>
</div>
<div class="clearfix mb-2">
<div class="clearfix mb-2" style="font-size: 90%">
<span class="pull-right small">{{ Yard::instance('shopping')->taxWithShipping() }} €</span>
<span class="pull-left small"> zzgl. {{ Yard::getTaxRate() }} % MwSt:</span>
</div>

4
resources/views/web/user/layouts/includes/header.blade.php
View file

@ -100,7 +100,7 @@
</span>
&nbsp;
@if(Yard::instance('shopping')->count())
<span class="">{{ \Yard::instance('shopping')->subtotal() }} € </span>
<span class="">{{ \Yard::instance('shopping')->total() }} € </span>
@endif
</a>
<div class="quick-cart-box" style="display: @if(Session::has('show-card-after-add')) block @else none @endif">
@ -123,7 +123,7 @@
<!-- quick cart footer -->
<div class="quick-cart-footer clearfix">
<div class="text-left">
<strong>Zwischensumme:</strong> <strong class="pull-right">{{ Yard::instance('shopping')->subtotal() }} €</strong>
<strong>Zwischensumme:</strong> <strong class="pull-right">{{ Yard::instance('shopping')->total() }} €</strong>
<br>
<em style="font-size: 0.9em">inkl. MwSt. zzgl. Versandkosten</em>
</div>