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

Country Prices | Homeparty | Shop | Order

Browse source
This commit is contained in:
Kevin Adametz 2021-08-27 18:53:12 +02:00
parent 51d81d8ec6
commit 39d1e93416
284 changed files with 784 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

22
resources/views/admin/sales/_detail_homparty.blade.php
View file

@ -7,9 +7,9 @@
<th>{{__('Produkt')}}</th>
<th>{{__('Anzahl')}}</th>
<th>{{__('Marge')}}</th>
<th class="text-right">{{__('EK-Preis')}}</th>
<th class="text-right">{{__('Points')}}</th>
<th class="text-right">{{__('Verdienst')}}</th>
<th class="text-right">{{__('EK-Preis')}}</th>
<th class="text-right">{{__('VK-Preis')}}</th>
</tr>
</thead>
@ -34,9 +34,6 @@
<td>
{{ $value->margin }}%
</td>
<td class="text-right">
{{ $value->getFormattedTotalEKPrice() }} &euro;
</td>
<td class="text-right">
{{ $value->getFormattedTotalPoints() }}
</td>
@ -46,6 +43,9 @@
<td class="text-right">
{{ $value->getFormattedTotalPrice() }} &euro;
</td>
<td class="text-right">
{{ $value->getFormattedTotalEKPrice() }} &euro;
</td>
</tr>
@endforeach
@ -69,24 +69,24 @@
<tr>
<td colspan="5" class="text-left">Versandkosten</td>
<td>&nbsp;</td>
<td class="text-right">&nbsp;</td>
<td class="text-right">{{ Util::formatNumber($user_cart['shipping_price'])}} &euro;</td>
<td class="text-right">{{ Util::formatNumber($user_cart['shipping_price'])}} &euro;</td>
</tr>
@endif
<tr>
<td colspan="4" class="border-top"><strong>Gesamt:</strong></td>
<td class="border-top text-right"><strong>{{Util::formatNumber($user_cart['ek_price'])}} &euro;</strong></td>
<td class="border-top text-right"><strong>{{$user_cart['points']}}</strong></td>
<td class="border-top text-right"><strong>{{Util::formatNumber($user_cart['income_price'])}} &euro;</strong></td>
<td class="border-top text-right"><strong>{{Util::formatNumber($user_cart['price'])}} &euro;</strong></td>
<td class="border-top text-right"><strong>{{Util::formatNumber($user_cart['ek_price'])}} &euro;</strong></td>
</tr>
@else
@if($hp_order['is_bonus'])
<tr class="foot-small">
<td colspan="5" class="text-left">Gutschrift Homeparty Gutschein</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td class="text-right">- {{ Util::formatNumber($hp_order['bonus_value']) }} &euro;</td>
<td class="text-right">- {{ Util::formatNumber($hp_order['bonus_value']) }} &euro;</td>
</tr>
@endif
@ -94,16 +94,17 @@
<tr class="foot-small">
<td colspan="5" class="text-left">Gutschrift Bonus</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td class="text-right">- {{ Util::formatNumber($hp_order['bonus_coupon']) }} &euro;</td>
<td class="text-right">- {{ Util::formatNumber($hp_order['bonus_coupon']) }} &euro;</td>
</tr>
@endif
@if($hp_order['is_bonus'])
<tr class="foot-small">
<td colspan="5" class="text-left">Abzug Points durch Gutschein</td>
<td colspan="4" class="text-left">Abzug Points durch Gutschein</td>
<td class="text-right">- {{ $hp_order['bonus_points_diff'] }} </td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
@endif
<tr class="foot-small">
@ -114,10 +115,11 @@
</tr>
<tr>
<td colspan="4" class="border-top"><strong>Summen:</strong></td>
<td class="border-top text-right"><strong>{{Util::formatNumber($user_cart['ek_price'])}} &euro;</strong></td>
<td class="border-top text-right"><strong>{{$user_cart['points']}}</strong></td>
<td class="border-top text-right"><strong>{{Util::formatNumber($user_cart['income_price'])}} &euro;</strong></td>
<td class="border-top text-right"><strong>{{Util::formatNumber($user_cart['price'])}} &euro;</strong></td>
<td class="border-top text-right"><strong>{{Util::formatNumber($user_cart['ek_price'])}} &euro;</strong></td>
</tr>
@endif

10
resources/views/admin/sales/_detail_homparty_total.blade.php
View file

@ -3,10 +3,10 @@
<thead>
<tr>
<th>Gesamt</th>
<th class="text-right">{{__('EK-Preis')}}</th>
<th class="text-right">{{__('Points')}}</th>
<th class="text-right">{{__('Verdienst')}}</th>
<th class="text-right">{{__('VK-Preis')}}</th>
<th class="text-right">{{__('EK-Preis')}}</th>
</tr>
</thead>
<tbody>
@ -28,10 +28,10 @@
<td colspan="1" class="border-top">
<strong>Gesamtsummen:</strong>
</td>
<td class="border-top text-right"><strong>{{ Util::formatNumber($hp_order['ek_price'])}} &euro;</strong></td>
<td class="border-top text-right"><strong>{{ $hp_order['points']}}</strong></td>
<td class="border-top text-right"><strong>{{ $hp_order['points'] - $hp_order['bonus_points_diff'] }}</strong></td>
<td class="border-top text-right"><strong>{{ Util::formatNumber($hp_order['income_price'])}} &euro;</strong></td>
<td class="border-top text-right"><strong>{{ Util::formatNumber($hp_order['price'])}} &euro;</strong></td>
<td class="border-top text-right"><strong>{{ Util::formatNumber($hp_order['ek_price'])}} &euro;</strong></td>
</tr>
<tr class="foot-small">
<td colspan="1" class="text-muted">
@ -39,9 +39,9 @@
</td>
<td class="">&nbsp;</td>
<td class="">&nbsp;</td>
<td class="">&nbsp;</td>
<td class="text-muted text-right">{{ Util::formatNumber($hp_order['price_net'])}} &euro;</td>
<td class="text-muted text-right">{{ Util::formatNumber($hp_order['ek_price_net'])}} &euro;</td>
</tr>
<tr class="foot-small">
<td colspan="1" class="text-muted">
@ -49,9 +49,9 @@
</td>
<td class="">&nbsp;</td>
<td class="">&nbsp;</td>
<td class="">&nbsp;</td>
<td class="text-muted text-right">{{ Util::formatNumber($hp_order['price']-$hp_order['price_net'])}} &euro;</td>
<td class="text-muted text-right">{{ Util::formatNumber($hp_order['ek_price']-$hp_order['ek_price_net'])}} &euro;</td>
</tr>
</tfoot>
</table>

16
resources/views/emails/homeparty_detail.blade.php
View file

@ -6,6 +6,7 @@
<th>{{__('Produkt')}}</th>
<th style="color:#37302d; text-align: right;">{{__('Anzahl')}}</th>
<th style="color:#37302d; text-align: right;">{{__('VK-Preis')}}</th>
<th style="color:#37302d; text-align: right;">{{__('EK-Preis')}}</th>
</tr>
@foreach($homeparty_guest->homeparty_user_order_items as $value)
@ -20,7 +21,9 @@
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ $value->getFormattedTotalPrice() }} &euro;
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ $value->getFormattedTotalEKPrice() }} &euro;
</td>
</tr>
@endforeach
@ -42,7 +45,7 @@
@if($homeparty_guest->getDelivery() === 'direct')
<tr>
<td colspan="2" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">Versandkosten</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">{{ Util::formatNumber($user_cart['shipping_price'])}} &euro;</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">{{ Util::formatNumber($user_cart['shipping_price'])}} &euro;</td>
</tr>
@endif
@ -50,19 +53,20 @@
<tr>
<td colspan="2" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;"><strong>Gesamt:</strong></td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;"><strong>{{Util::formatNumber($user_cart['price'])}} &euro;</strong></td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;"><strong>{{Util::formatNumber($user_cart['ek_price'])}} &euro;</strong></td>
</tr>
@else
@if($hp_order['is_bonus'])
<tr>
<td colspan="2" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">Gutschrift Homeparty Gutschein</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">- {{ Util::formatNumber($hp_order['bonus_value']) }} &euro;</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">- {{ Util::formatNumber($hp_order['bonus_value']) }} &euro;</td>
</tr>
@endif
@if($hp_order['is_bonus_coupon'])
<tr>
<td colspan="2" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">Gutschrift Bonus</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">- {{ Util::formatNumber($hp_order['bonus_coupon']) }} &euro;</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">- {{ Util::formatNumber($hp_order['bonus_coupon']) }} &euro;</td>
</tr>
@endif
@ -70,13 +74,13 @@
@endif
<tr>
<td colspan="2" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">Versandkosten:</td>
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">Versandkosten:</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">{{Util::formatNumber($user_cart['shipping_price'])}} &euro;</td>
</tr>
<tr>
<td colspan="2" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;"><strong>Summen:</strong></td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;"><strong>{{Util::formatNumber($user_cart['price'])}} &euro;</strong></td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;"><strong>{{Util::formatNumber($user_cart['ek_price'])}} &euro;</strong></td>
</tr>
@endif
</table>

13
resources/views/emails/homeparty_detail_total.blade.php
View file

@ -5,6 +5,7 @@
<tr>
<th>Gesamt</th>
<th style="color:#37302d; text-align: right;">{{__('VK-Preis')}}</th>
<th style="color:#37302d; text-align: right;">{{__('EK-Preis')}}</th>
</tr>
@if($hp_order['is_bonus'])
<tr class="foot-small">
@ -15,22 +16,26 @@
</tr>
@endif
<tr class="foot-small">
<td colspan="2" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<strong>Gesamtsummen:</strong>
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;"><strong>{{ Util::formatNumber($hp_order['price'])}} &euro;</strong></td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;"><strong>{{ Util::formatNumber($hp_order['ek_price'])}} &euro;</strong></td>
</tr>
<tr class="foot-small">
<td colspan="2" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
Summe ohne MwSt:
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">{{ Util::formatNumber($hp_order['price_net'])}} &euro;</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">{{ Util::formatNumber($hp_order['ek_price_net'])}} &euro;</td>
</tr>
<tr class="foot-small">
<td colspan="2" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<tr class="foot-small" >
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
Enthaltene MwSt:
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">{{ Util::formatNumber($hp_order['price']-$hp_order['price_net'])}} &euro;</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">{{ Util::formatNumber($hp_order['ek_price']-$hp_order['ek_price_net'])}} &euro;</td>
</tr>

4
resources/views/layouts/includes/layout-sidenav.blade.php
View file

@ -74,7 +74,7 @@
</ul>
</li>
@endif
@if(Auth::user()->isActiveAccount() && \App\Services\Util::checkUserLandIsNot(Auth::user()))
@if(Auth::user()->isActiveAccount())
<li class="sidenav-item @if(Request::is('user/orders', 'user/order/*')) open @endif">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-ios-cart"></i>
@ -90,7 +90,7 @@
</ul>
</li>
@endif
@if(Auth::user()->isActiveAccount() && \App\Services\Util::checkUserLandIsNot(Auth::user()))
@if(Auth::user()->isActiveAccount())
<li class="sidenav-item @if(Request::is('user/homepartys', 'user/homeparty/*')) open @endif">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-ios-pizza"></i>

5
resources/views/user/homeparty/detail.blade.php
View file

@ -12,12 +12,11 @@
</div>
<a href="{{route('user_homepartys')}}" class="btn btn-sm btn-default float-right">zurück</a>
</h4>
<div class="nav-tabs-top mb-4">
<ul class="nav nav-tabs nav-responsive-xl">
@if(!$step || $step >= 1)
<li class="nav-item">
<a class="nav-link @if(!$step || $step == 10) active @endif" data-toggle="tab" href="#navs-top-homeparty">Auszeitparty</a>
<a class="nav-link @if(!$step || $step == 1 || $step == 10) active @endif" data-toggle="tab" href="#navs-top-homeparty">Auszeitparty</a>
</li>
@endif
@if($homeparty->id)
@ -35,7 +34,7 @@
</ul>
<div class="tab-content">
<div class="tab-pane fade @if(!$step || $step == 10) active show @endif" id="navs-top-homeparty">
<div class="tab-pane fade @if(!$step || $step == 1 || $step == 10) active show @endif" id="navs-top-homeparty">
{!! Form::open(['url' => route('user_homeparty_detail', [$homeparty->id, 10]), 'class' => 'form-horizontal', 'id'=>'homeparty-party-form-validation']) !!}
<h5 class="card-header">
<div class="row">

3
resources/views/user/homeparty/order.blade.php
View file

@ -78,6 +78,9 @@
.table .min-width-80 {
min-width: 160px;
}
.bg-warning-light {
background-color: rgba(255, 217, 80, 0.6) !important;
}
</style>
<h4 class="font-weight-bold py-2 mb-2 d-flex justify-content-between align-items-center w-100 ">
<div>{{ __('navigation.my_homeparty') }} / {{ $homeparty->name }} - {{ $homeparty->date }}</div>

8
resources/views/user/homeparty/show_calc_bonus_host.blade.php
View file

@ -48,10 +48,10 @@
</tr>
@endif
<tr class="foot-small">
<td colspan="5" class="text-left bg-warning">Versandkosten:</td>
<td class="bg-warning">&nbsp;</td>
<td class="text-right bg-warning">&nbsp;</td>
<td class="text-right bg-warning">
<td colspan="5" class="text-left bg-warning-light">Versandkosten:</td>
<td class="bg-warning-light">&nbsp;</td>
<td class="text-right bg-warning-light">&nbsp;</td>
<td class="text-right bg-warning-light">
<div class="no-line-break">{{$user_cart->getFormattedShippingPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('ShippingPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>

24
resources/views/user/homeparty/show_products_order.blade.php
View file

@ -61,19 +61,19 @@
<td class="text-right">
<div class="no-line-break">{{ $value->getFormattedTotalIncomePrice() }} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $value->getCurrencyByKey('TotalIncomePrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ $value->getCurrencyByKey('TotalIncomePrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-right">
<div class="no-line-break">{{ $value->getFormattedTotalPrice() }} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $value->getCurrencyByKey('TotalPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ $value->getCurrencyByKey('TotalPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-right">
<div class="no-line-break">{{ $value->getFormattedTotalEKPrice() }} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $value->getCurrencyByKey('TotalEKPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ $value->getCurrencyByKey('TotalEKPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@ -107,18 +107,18 @@
</tr>
@if($homeparty_guest->getDelivery() === 'direct')
<tr>
<td colspan="5" class="text-left bg-warning">Versandkosten</td>
<td class="bg-warning">&nbsp;</td>
<td class="text-right bg-warning">
<td colspan="5" class="text-left bg-warning-light">Versandkosten</td>
<td class="bg-warning-light">&nbsp;</td>
<td class="text-right bg-warning-light">
<div class="no-line-break">{{$user_cart->getFormattedShippingPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('ShippingPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('ShippingPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-right bg-warning">
<td class="text-right bg-warning-light">
<div class="no-line-break">{{$user_cart->getFormattedShippingPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('ShippingPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('ShippingPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@ -131,19 +131,19 @@
<td class="border-top text-right">
<div class="no-line-break"><strong>{{$user_cart->getFormattedIncomePrice()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('IncomePrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('IncomePrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{$user_cart->getFormattedPrice()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('Price') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('Price') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{$user_cart->getFormattedEkPrice()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('EkPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('EkPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>

64
resources/views/user/homeparty/show_total_order.blade.php
View file

@ -22,31 +22,33 @@
<td class="text-right">
<div class="no-line-break">{{$user_cart->getFormattedIncomePrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('IncomePrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('IncomePrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-right">
<div class="no-line-break">{{$user_cart->getFormattedPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('Price') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('Price') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-right">
<div class="no-line-break">{{$user_cart->getFormattedEkPrice()}} &euro;</div>
<div class="no-line-break">{{$user_cart->getFormattedEkPriceWithout()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('EkPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('EkPriceWithout') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
<tr>
<td class="text-left bg-warning" colspan="4">Enthaltende Versandkosten:</td>
<td class="text-right bg-warning">
<div class="no-line-break">{{$user_cart->getFormattedShippingPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('ShippingPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@if($user_cart->shipping_price > 0)
<tr>
<td class="text-left bg-warning-light" colspan="4">Versandkosten:</td>
<td class="text-right bg-warning-light">
<div class="no-line-break">{{$user_cart->getFormattedShippingPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('ShippingPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@endif
@endif
@if($homeparty->homeparty_guests)
@ -63,26 +65,38 @@
<td class="text-right">
<div class="no-line-break">{{$user_cart->getFormattedIncomePrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('IncomePrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('IncomePrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-right">
<div class="no-line-break">{{$user_cart->getFormattedPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('Price') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('Price') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-right">
<div class="no-line-break">{{$user_cart->getFormattedEkPrice()}} &euro;</div>
<div class="no-line-break">{{$user_cart->getFormattedEkPriceWithout()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('EkPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('EkPriceWithout') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@if($user_cart->shipping_price > 0)
<tr>
<td class="text-left bg-warning-light" colspan="4">Versandkosten:</td>
<td class="text-right bg-warning-light">
<div class="no-line-break">{{$user_cart->getFormattedShippingPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('ShippingPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@endif
@endforeach
@endif
</tbody>
<tfoot>
@if(\App\Services\HomepartyCart::$is_bonus)
@ -104,19 +118,19 @@
<td class="border-top text-right">
<div class="no-line-break"><strong>{{\App\Services\HomepartyCart::getFormattedIncomePrice()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('IncomePrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ \App\Services\HomepartyCart::getCurrencyByKey('IncomePrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{\App\Services\HomepartyCart::getFormattedPrice()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('Price') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ \App\Services\HomepartyCart::getCurrencyByKey('Price') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{\App\Services\HomepartyCart::getFormattedEkPrice()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('EkPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ \App\Services\HomepartyCart::getCurrencyByKey('EkPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@ -142,13 +156,13 @@
<td class="text-muted text-right">
<div class="no-line-break">{{\App\Services\HomepartyCart::getFormattedPriceNet()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('PriceNet') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ \App\Services\HomepartyCart::getCurrencyByKey('PriceNet') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-muted text-right">
<div class="no-line-break">{{\App\Services\HomepartyCart::getFormattedEkPriceNet()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('EkPriceNet') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ \App\Services\HomepartyCart::getCurrencyByKey('EkPriceNet') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@ -162,13 +176,13 @@
<td class="text-muted text-right">
<div class="no-line-break">{{\App\Services\HomepartyCart::getFormattedPriceTax()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('PriceTax') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ \App\Services\HomepartyCart::getCurrencyByKey('PriceTax') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-muted text-right">
<div class="no-line-break">{{\App\Services\HomepartyCart::getFormattedEkPriceTax()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('EkPriceTax') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ \App\Services\HomepartyCart::getCurrencyByKey('EkPriceTax') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>

8
resources/views/user/membership/_change.blade.php
View file

@ -6,6 +6,7 @@
<div class="card-body">
{!! Form::open(['url' => route('user_membership_store', ['change_order']), 'class' => 'form-horizontal']) !!}
<div class="table-responsive">
<table class="table table- m-0">
<tbody class="switchers-stacked">
@ -33,7 +34,12 @@
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle p-4">{{$product->getFormattedPrice()}} EUR / p.a.</td>
<td class="text-right font-weight-semibold align-middle p-4">
<span class="no-line-break">{{ $product->getFormattedPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) }} €</span> /p.a.
@if(\App\Services\UserService::$user_country->currency)
<span class="no-line-break">{!! $product->getFormattedPriceCurrencyWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) !!}</span>
@endif
</td>
</tr>
@endforeach

29
resources/views/user/membership/_payment_order.blade.php
View file

@ -6,6 +6,27 @@
<div class="card-body">
<h5>Dein gebuchtes Paket</h5>
{!! Form::open(['url' => route('user_membership_store', ['payment_order']), 'class' => 'form-horizontal']) !!}
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Bestellland</div>
{{ App\Services\UserService::getOrderInfo('billing_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Lieferland</div>
{{ App\Services\UserService::getOrderInfo('shipping_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">MwSt</div>
{{ App\Services\UserService::getOrderInfo('tax_free') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Reverse Charge Verfahren</div>
{{ App\Services\UserService::getOrderInfo('user_reverse_charge') }}
</div>
</div>
<div class="table-responsive">
<table class="table table- m-0">
<tbody class="switchers-stacked">
@ -33,7 +54,13 @@
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle p-4">{{$product->getFormattedPrice()}} EUR / p.a.</td>
<td class="text-right font-weight-semibold align-middle p-4">
<span class="no-line-break">{{ $product->getFormattedPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) }} €</span> /p.a.
@if(\App\Services\UserService::$user_country->currency)
<span class="no-line-break">{!! $product->getFormattedPriceCurrencyWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) !!}</span>
@endif
</td>
</tr>
@endif
@endforeach

36
resources/views/user/membership/_upgrade.blade.php
View file

@ -1,5 +1,30 @@
{!! Form::open(['url' => route('user_membership_store', ['upgrade_order']), 'class' => 'form-horizontal']) !!}
<div class="card mb-4">
<div class="card-body">
{!! Form::open(['url' => route('user_membership_store', ['change_order']), 'class' => 'form-horizontal']) !!}
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Bestellland</div>
{{ App\Services\UserService::getOrderInfo('billing_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Lieferland</div>
{{ App\Services\UserService::getOrderInfo('shipping_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">MwSt</div>
{{ App\Services\UserService::getOrderInfo('tax_free') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Reverse Charge Verfahren</div>
{{ App\Services\UserService::getOrderInfo('user_reverse_charge') }}
</div>
</div>
<input type="hidden" name="qty" value="{{$diff_months}}">
<div class="table-responsive">
<table class="table table- m-0">
@ -27,11 +52,16 @@
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle p-4">{{$product->getFormattedPrice()}} EUR / Monat</td>
<td class="text-right font-weight-semibold align-middle p-4">
<span class="no-line-break">{{ $product->getFormattedPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) }} €</span> Monat
@if(\App\Services\UserService::$user_country->currency)
<span class="no-line-break">{!! $product->getFormattedPriceCurrencyWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) !!}</span>
@endif
</td>
</tr>
<tr>
<td colspan="2" class="text-right">Restlaufzeit: {{$diff_months}} @if($diff_months==1) Monat @else Monate @endif</td>
<td class="text-right font-weight-semibold"> {!! Util::formatNumber($diff_months * $product->price) !!} EUR</td>
<td class="text-right font-weight-semibold"> {!! Util::formatNumber($diff_months * $product->getPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country)) !!} EUR</td>
</tr>
@endforeach
</tbody>
@ -42,5 +72,7 @@
<button type="submit" class="btn btn-secondary">{{ __('wählen und weiter zur Kasse') }}</button>&nbsp;
<br><br>
<em class="small text-center"> <i class="fa fa-lock"></i> Du wirst auf unseren checkout Server weitergeletet, die Verbindung ist SSL verschlüsselt.</em>
</div>
</div>
</div>
{!! Form::close() !!}

43
resources/views/user/wizard/_payment.blade.php
View file

@ -1,5 +1,23 @@
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Bestellland</div>
{{ App\Services\UserService::getOrderInfo('billing_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Lieferland</div>
{{ App\Services\UserService::getOrderInfo('shipping_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">MwSt</div>
{{ App\Services\UserService::getOrderInfo('tax_free') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Reverse Charge Verfahren</div>
{{ App\Services\UserService::getOrderInfo('user_reverse_charge') }}
</div>
</div>
{!! Form::open(['url' => route('wizard_store_payment', [20]), 'class' => 'form-horizontal']) !!}
<div class="table-responsive">
<table class="table table- m-0" id="membership_package_payment">
@ -9,7 +27,9 @@
<tr>
<td class="text-center align-middle px-0">
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" data-price="{{$product->price}}" value="{{$product->id}}" name="switchers-package-wizard" @if($counter == 2) checked @endif >
<input type="radio" class="switcher-input"
data-price="{{$product->getPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country)}}"
value="{{$product->id}}" name="switchers-package-wizard" @if($counter == 2) checked @endif >
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
@ -28,7 +48,12 @@
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle p-4">{{$product->getFormattedPrice()}} EUR / p.a.</td>
<td class="text-right font-weight-semibold align-middle p-4">
<span class="no-line-break">{{ $product->getFormattedPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) }} €</span> /p.a.
@if(\App\Services\UserService::$user_country->currency)
<span class="no-line-break">{!! $product->getFormattedPriceCurrencyWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) !!}</span>
@endif
</td>
</tr>
@php($counter++)
@endforeach
@ -44,7 +69,9 @@
<tr>
<td class="text-center align-middle px-0">
<label class="switcher switcher-square switcher-secondary">
<input type="checkbox" class="switcher-input" data-price="{{$product->price}}" name="products_on_board[]" value="{{$product->id}}">
<input type="checkbox" class="switcher-input"
data-price="{{$product->getPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country)}}"
name="products_on_board[]" value="{{$product->id}}">
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
@ -63,7 +90,12 @@
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle p-4">{{$product->getFormattedPrice()}} EUR / p.a.</td>
<td class="text-right font-weight-semibold align-middle p-4">
<span class="no-line-break">{{ $product->getFormattedPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) }} €</span>
@if(\App\Services\UserService::$user_country->currency)
<span class="no-line-break">{!! $product->getFormattedPriceCurrencyWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) !!}</span>
@endif
</td>
</tr>
@endforeach
</tbody>
@ -79,7 +111,8 @@
</label>
<hr>
<div class="float-right">
<strong>Gesamtsumme: <span id="card_total_price">0</span> €</strong>
<strong>Gesamtsumme @if(\App\Services\UserService::getTaxFree()) netto @else brutto @endif: <span id="card_total_price">0</span> €</strong>
</div>
<button type="submit" class="btn btn-secondary">{{ __('wählen und weiter zur Kasse') }}</button>&nbsp;
<br><br>

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

@ -229,10 +229,6 @@
</div>
</div>
@foreach(Yard::instance('shopping')->content() as $row)
@php($product = \App\Models\Product::find($row->id))
@ -263,9 +259,17 @@
<div class="col-xs-6 col-sm-3 col-md-2 text-left font-semi-bold price-single">
<div style="">{{ $row->price() }} &euro;</div>
<div class="small">{{$product->getBasePriceFormattedFull()}}</div>
<div class="small">inkl. {{ number_format($row->taxRate, 0)}}% MwSt.</div>
<!---->
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('price', $row, 2) }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
<div class="small">{{ $product->getBasePriceFormattedFullWith(Yard::instance('shopping')->getUserTaxFree(), false, Yard::instance('shopping')->getUserCountry()) }}</div>
<div class="small">
@if(Yard::instance('shopping')->getUserTaxFree())
* Preis netto
@else
* inkl. {{ number_format($row->taxRate, 0)}}% MwSt.% MwSt.
@endif
</div>
</div>
<div class="col-xs-6 col-sm-3 col-md-3 quantity">
@ -276,6 +280,10 @@
</div>
<div class="price-total text-right">
<span class="font-bold text-price-total">{{ $row->subtotal() }}</span> &euro;
@if(Yard::instance('shopping')->isPriceCurrency())
<br>
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('subtotal', $row, 2) }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</div>
</div>
@ -285,8 +293,6 @@
</div>
@endforeach
<a href="{{url(Util::getPostRoute().'card/delete')}}" class="btn btn-default btn-xs pull-left"><i class="glyphicon glyphicon-remove"></i> Warenkorb löschen</a>
<button type="submit" class="btn btn-xs btn-default pull-right "><i class="glyphicon glyphicon-refresh"></i> Warenkorb aktualisieren</button>
<div class="clearfix"></div>
@ -315,28 +321,41 @@
<hr class="mt-4 mb-4">
<div class="clearfix mb-2">
<span class="pull-right small"> {{ Yard::instance('shopping')->getShippingCountryName() }}</span>
<span class="pull-left small">Lieferland:</span>
</div>
{{-- <div class="clearfix mb-2">
<div class=" small">Lieferland:</div>
<div class="small">
<form action="{{ url(Util::getPostRoute().'card/show') }}" method="GET" style="margin-bottom: 0;">
<form action="{{ url(Util::getPostRoute().'card/show') }}" method="GET" style="margin-bottom: 0;">
<select name="selected_country" class="form-control" onchange="this.form.submit()">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId(), false) !!}
</select>
</form>
</div>
</div>
</div>--}}
<div class="clearfix mb-2">
<span class="pull-right small">{{ Yard::instance('shopping')->shipping() }} € </span>
<span class="pull-left small"><a href="{{ url('/versandkosten') }}" style="color:#666666;text-decoration: underline">Versandkosten</a>:</span>
</div>
<hr class="mt-4 mb-4">
<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" 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>
@if(Yard::instance('shopping')->getUserTaxFree())
<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 netto:</span>
</div>
@else
<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" 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>
@endif
<hr />
<span class="clearfix ">
<span class="pull-right size-20"><strong>{{ Yard::instance('shopping')->totalWithShipping() }} €</strong></span>

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

@ -264,16 +264,28 @@
@endif
</div>
</div>
{!! Form::hidden('billing_state', $shopping_user->billing_state) !!}
{!! Form::hidden('billing_country_id', \App\Services\Shop::getShippingCountryCountryId($shopping_user->billing_state)) !!}
<div class="row">
<div class="col-md-12 col-sm-12">
<label class="mt-0 fs-14 fw-400" for="billing_state">Land *</label>
<label class="mt-0 fs-14 fw-400" for="billing_state">Land *</label>
<div class="text-normal">{{ $shopping_user->billing_country->getLocated() }}</div>
<span class="info-small">Das Land kann nicht mehr geändert werden.</span>
</div>
</div>
{{--<div class="row">
<div class="col-md-12 col-sm-12">
<label class="mt-0 fs-14 fw-400" for="billing_state">Land *</label>
<select id="billing_state" name="billing_state" class="form-control" required>
{!! HTMLHelper::getCountriesForShipping($shopping_user->billing_state) !!}
</select>
<input type="hidden" name="billing_country_id" value="{{ \App\Services\Shop::getShippingCountryCountryId($shopping_user->billing_state)}}">
<span class="info-small" id="show_shipping_country_info">Bei der Änderung des Lieferlandes werden die Versandkosten neu berechnet.</span>
</div>
</div>
</div> --}}
<div class="row">
<div class="col-md-12 col-sm-12">
@ -308,8 +320,7 @@
{!! Form::hidden('billing_phone', $shopping_user->billing_phone) !!}
{!! Form::hidden('billing_email', $shopping_user->billing_email) !!}
{!! Form::hidden('billing_state', $shopping_user->billing_state) !!}
{!! Form::hidden('billing_country_id', \App\Services\Shop::getShippingCountryCountryId($shopping_user->billing_state)) !!}
{!! Form::hidden('billing_country_id', $shopping_user->billing_country_id) !!}
<div class="row">
<style>
.ex-small {
@ -395,6 +406,19 @@
@endif
</div>
</div>
@if($shopping_user->is_from !== 'homeparty')
@if($shopping_user->is_from === 'membership' || $shopping_user->is_from === 'wizard')
{!! Form::hidden('same_as_billing', $shopping_user->same_as_billing) !!}
<div class="row" style="display: none">
<div class="col-lg-12 nomargin clearfix">
<hr>
<label class="mt-0 fs-14 fw-500 checkbox pull-left disabled">
{!! Form::checkbox('same_as_billing', 1, $shopping_user->same_as_billing, ['id'=>'shipswitch', 'disabled'=>true]) !!}
<i></i> <span class="weight-400">Abweichende Lieferadresse</span>
</label>
</div>
</div>
@else
<div class="row" @if($is_from === 'user_order') style="display: none" @endif>
<div class="col-lg-12 nomargin clearfix">
<hr>
@ -404,6 +428,8 @@
</label>
</div>
</div>
@endif
@endif
</fieldset>
<!-- /BILLING -->
@ -507,7 +533,6 @@
</div>
</div>
@if($is_from === 'user_order')
{!! Form::hidden('shipping_state', $shopping_user->shipping_state) !!}
{!! Form::hidden('shipping_country_id', \App\Services\Shop::getShippingCountryCountryId($shopping_user->shipping_state)) !!}
@ -519,7 +544,21 @@
</div>
</div>
@else
<div class="row">
{!! Form::hidden('shipping_state', $shopping_user->shipping_state) !!}
{!! Form::hidden('shipping_country_id', \App\Services\Shop::getShippingCountryCountryId($shopping_user->shipping_state)) !!}
<div class="row">
<div class="col-md-12 col-sm-12">
<label class="mt-0 fs-14 fw-400" for="shipping_state">Lieferland *</label>
<div class="text-normal">{{ $shopping_user->shipping_country->getLocated() }}</div>
@if($is_from === 'membership' || $is_from === 'wizard')
<span class="info-small">Das Lieferland kann nur im Salescenter geändert werden.</span>
@else
<span class="info-small">Das Lieferland kann nicht geändert werden.</span>
@endif
</div>
</div>
{{-- <div class="row">
<div class="col-md-12 col-sm-12">
<input type="hidden" name="shipping_country_id" value="{{ \App\Services\Shop::getShippingCountryCountryId($shopping_user->shipping_state) }}">
<label class="mt-0 fs-14 fw-400" for="shipping_state">Lieferland *</label>
@ -529,6 +568,7 @@
<span class="info-small">Bei der Änderung des Landes werden die Versandkosten neu berechnet.</span>
</div>
</div>
--}}
@endif
<div class="row">
@ -815,6 +855,7 @@
<span class="pull-left small">Versandkosten:</span>
</div>
@else
<div class="clearfix mb-2">
<span class="pull-right text-right">
<div class="no-line-break">{{ Yard::instance('shopping')->total() }} €</div>
@ -824,11 +865,8 @@
</span>
<strong class="pull-left">Zwischensumme:</strong>
</div>
@if($shopping_user->is_from !== 'homeparty')
<hr class="mt-4 mb-4">
<div class="clearfix mb-2">
<span class="pull-right small text-right">
<div class="no-line-break">{{ Yard::instance('shopping')->shipping() }} €</div>
@ -847,7 +885,6 @@
<span class="pull-left small">Lieferland:</span>
</div>
<hr class="mt-4 mb-4">
<div class="clearfix mb-2" style="font-size: 90%">
@ -869,9 +906,20 @@
</span>
<span class="pull-left small"> zzgl. {{-- Yard::getTaxRate() --}} MwSt:</span>
</div>
<hr />
<div class="clearfix">
<span class="pull-right size-20 text-right">
<strong><div class="no-line-break">{{ Yard::instance('shopping')->totalWithShipping() }} €</div></strong>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('totalWithShipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</span>
<strong class="pull-left">Gesamtsumme:</strong>
</div>
@else
<hr class="mt-4 mb-4">
@if(!$shopping_data['user_tax_free'])
<div class="clearfix mb-2" style="font-size: 90%">
<span class="pull-right small text-right">
<div class="no-line-break">{!! $shopping_data['shop_price_net'] !!} €</div>
@ -881,6 +929,7 @@
</span>
<span class="pull-left small">Summe ohne MwSt:</span>
</div>
@endif
<div class="clearfix mb-2" style="font-size: 90%">
<span class="pull-right small text-right">
@ -891,18 +940,19 @@
</span>
<span class="pull-left small"> zzgl. {{-- Yard::getTaxRate() --}} MwSt:</span>
</div>
@endif
<hr />
<hr />
<div class="clearfix">
<span class="pull-right size-20 text-right">
<strong><div class="no-line-break">{{ Yard::instance('shopping')->totalWithShipping() }} €</div></strong>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('totalWithShipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</span>
<strong class="pull-left">Gesamtsumme:</strong>
</div>
<div class="clearfix">
<span class="pull-right size-20 text-right">
<div class="no-line-break">{!! $shopping_data['shop_price'] !!} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->convertCurrency($shopping_data['shop_price']) }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</span>
<strong class="pull-left">Gesamtsumme:</strong>
</div>
@endif
<button type="submit" class="btn btn-primary btn-lg btn-block size-18 btn-text-500 mt-4 faa-parent animated-hover"><i class="fa fa-mail-forward faa-horizontal"></i> Jetzt kaufen</button>
<hr><p class="text-center" style="line-height: 1.2em;"><em class="small text-center"> <i class="fa fa-lock"></i> Sind alle Deine Angaben vollsätndig ausgefüllt, klicke auf "Jetzt kaufen" und Du wist zu unserem Zahlungsanbieter weitergeleitet, die Verbindung wird ist SSL verschlüsselt.</em></p>
@ -953,10 +1003,12 @@
jQuery("#shipswitch").bind("click", function() {
jQuery('#shipping').slideToggle(200, function() {
// scroll down to shipping area.
if($('#billing_state').val() !== $('#shipping_state').val()){
/*
if($('#billing_state').val() !== $('#shipping_state').val()){
$('input[name="selected_country"]').val('change');
$('form#checkout_card_final').submit();
}
*/
if(jQuery('#shipping').is(":visible")) {
_scrollTo('#shipping', 150);
showShippingCountryFor('billing');

13
resources/views/web/templates/produkte-item.blade.php
View file

@ -46,15 +46,18 @@
<!-- /rating -->
@if($product->price_old > 0)
<div class="shop-item-price d-block text-danger mt-2">
<del class="text-muted" style="font-size: 0.85em"> {{ $product->getFormattedPriceOld() }} €</del>
{{ $product->getFormattedPrice() }} €
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{$product->getBasePriceFormattedFull()}}</div>
<del class="text-muted" style="font-size: 0.85em"> {{ $product->getFormattedPriceOldWith(Yard::instance('shopping')->getUserTaxFree(), false, Yard::instance('shopping')->getUserCountry()) }} €</del>
{{ $product->getFormattedPriceWith(Yard::instance('shopping')->getUserTaxFree(), false, Yard::instance('shopping')->getUserCountry()) }} €
{!! $product->getFormattedPriceCurrencyWith(Yard::instance('shopping')->getUserTaxFree(), false, Yard::instance('shopping')->getUserCountry()) !!}
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{ $product->getBasePriceFormattedFullWith(Yard::instance('shopping')->getUserTaxFree(), false, Yard::instance('shopping')->getUserCountry()) }}</div>
</div>
@else
<div class="shop-item-price d-block mt-2 text-muted">
{{ $product->getFormattedPrice() }} €
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{$product->getBasePriceFormattedFull()}}</div>
{{ $product->getFormattedPriceWith(Yard::instance('shopping')->getUserTaxFree(), false, Yard::instance('shopping')->getUserCountry()) }} €
{!! $product->getFormattedPriceCurrencyWith(Yard::instance('shopping')->getUserTaxFree(), false, Yard::instance('shopping')->getUserCountry()) !!}
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{ $product->getBasePriceFormattedFullWith(Yard::instance('shopping')->getUserTaxFree(), false, Yard::instance('shopping')->getUserCountry()) }}</div>
</div>
@endif
<!-- price -->

29
resources/views/web/templates/produkte-show.blade.php
View file

@ -35,9 +35,7 @@
<div class="container">
</div>
</section>
<!-- /PAGE HEADER -->
<!-- -->
<section>
<div class="container">
<div class="row">
@ -61,14 +59,11 @@
href="{{ route('product_image', [$product->imagesActive->first()->slug]) }}"
data-plugin-options='{"type":"image"}'><i
class="glyphicon glyphicon-search"></i></a>
<!-- image Extra: add .image-bw class to force black and white! -->
<img class="img-responsive"
src="{{ route('product_image', [$product->imagesActive->first()->slug]) }}"
width="1000" height="1500" alt="{{ $product->getLang('name') }}">
</figure>
</div>
<!-- Thumbnails (required height:100px) -->
<div data-for="zoom-primary" class="zoom-more owl-carousel owl-padding-3 featured"
data-plugin-options='{"singleItem": false, "autoPlay": false, "navigation": true, "pagination": false}'>
@php ($activ = 'active')
@ -81,7 +76,6 @@
@php ($activ = '')
@endforeach
</div>
<!-- /Thumbnails -->
@endif
</div>
<!-- /IMAGE -->
@ -92,18 +86,29 @@
{!! $product->getLang('copy') !!}
<hr/>
@if($user_shop)
@if($product->price_old > 0)
<div class="shop-item-price text-danger text-right">
<del class="text-muted" style="font-size: 0.85em"> {{ $product->getFormattedPriceOld() }} €</del>
{{ $product->getFormattedPrice() }} €
<del class="text-muted" style="font-size: 0.85em"> {{ $product->getFormattedPriceOldWith(Yard::instance('shopping')->getUserTaxFree(), false, Yard::instance('shopping')->getUserCountry()) }} €</del>
{{ $product->getFormattedPriceWith(Yard::instance('shopping')->getUserTaxFree(), false, Yard::instance('shopping')->getUserCountry()) }} €*
{!! $product->getFormattedPriceCurrencyWith(Yard::instance('shopping')->getUserTaxFree(), false, Yard::instance('shopping')->getUserCountry()) !!}
@else
<div class="shop-item-price text-right text-muted" style="line-height: 1.3em;">
{{ $product->getFormattedPrice() }} €
{{ $product->getFormattedPriceWith(Yard::instance('shopping')->getUserTaxFree(), false, Yard::instance('shopping')->getUserCountry()) }} €*
{!! $product->getFormattedPriceCurrencyWith(Yard::instance('shopping')->getUserTaxFree(), false, Yard::instance('shopping')->getUserCountry()) !!}
@endif<br>
<span style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{$product->getBasePriceFormattedFull()}}</span><br>
<span style="font-size: 13px; color:#6e6e6e; font-weight: 500;"><em>inkl. {{$product->getFormattedTax()}}% MwSt. <a href="{{ url('/versandkosten') }}" style="color:#666;text-decoration: underline">zzgl. Versandkosten</a></em></span>
<span style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{ $product->getBasePriceFormattedFullWith(Yard::instance('shopping')->getUserTaxFree(), false, Yard::instance('shopping')->getUserCountry()) }}</span><br>
<span style="font-size: 13px; color:#6e6e6e; font-weight: 500;">
<em>
@if(Yard::instance('shopping')->getUserTaxFree())
* Preise netto
@else
* inkl. {{$product->getFormattedTax(Yard::instance('shopping')->getUserCountry())}}% MwSt.
@endif
| <a href="{{ url('/versandkosten') }}" style="color:#666;text-decoration: underline">zzgl. Versandkosten</a>
</em>
</span>
</div>
<hr>

38
resources/views/web/user/layouts/application.blade.php
View file

@ -70,12 +70,48 @@
div.side-nav ul.list-group-bordered > li.list-group-item.active > a:hover{
color: #fff !important;
}
#sidepanel {
width: 340px;
}
select.form-control {
color: #535252 !important;
border-color: #989a9c;
}
</style>
</head>
<body class="smoothscroll enable-animation">
@if(isset($mylangs))
<div id="sidepanel" class="sidepanel-light">
<a id="sidepanel_close" href="#"><!-- close -->
<i class="glyphicon glyphicon-remove"></i>
</a>
<div class="sidepanel-content">
@if (isset($mylangs[\App\Services\Shop::getUserShopLang()]))
@php($country = $mylangs[\App\Services\Shop::getUserShopLang()])
<h2 class="sidepanel-title">Du befindest dich im Shop: {{ $country->getLocated() }}</h2>
@endif
<p>Wichtiger Hinweis: Bestellungen im ausgewählten Land können nur innerhalb dieses Landes versandt werden.
Wenn du dein Land änderst, wirst du von deiner aktuellen Sitzung abgemeldet und dein Warenkorb wird geleert.
</p>
{!! Form::open(['url' => '/change_website_lang']) !!}
<label>Land*</label>
<select id="change_country_id" name="change_country_id" class="form-control pointer margin-bottom-20">
@foreach ($mylangs as $mycid => $mycountry)
<option value="{{ $mycid }}" @if($country->id === $mycountry->id) selected @endif>{{ $mycountry->getLocated() }}</option>
@endforeach
</select>
<button class="btn btn-primary btn-block" type="submit">Land wechseln</button>
{!! Form::close() !!}
</div>
</div>
@endif
@yield('layout-content')
<!-- SCROLL TO TOP -->

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

@ -49,7 +49,39 @@
}
</style>
<!-- TOP NAV -->
@if(isset($mylangs))
<div id="topBar">
<div class="container">
<ul class="top-links list-inline pull-right">
<li>
@if (isset($mylangs[\App\Services\Shop::getUserShopLang()]))
@php($country = $mylangs[\App\Services\Shop::getUserShopLang()])
<a id="sidepanel_btn" href="#" class="no-text-underline"><img class="flag-lang" src="/images/flags/{{ strtolower($country->code) }}.png" width="16" height="11" alt="lang" /> {{ $country->getLocated() }}</a>
@endif
</li>
{{-- <li class="text-welcome hidden-xs">Welcome to Smarty, <strong>John Doe</strong></li>
<li>
<a class="dropdown-toggle no-text-underline" data-toggle="dropdown" href="#"><i class="fa fa-user hidden-xs"></i> MY ACCOUNT</a>
<ul class="dropdown-menu pull-right">
<li><a tabindex="-1" href="#"><i class="fa fa-history"></i> ORDER HISTORY</a></li>
<li class="divider"></li>
<li><a tabindex="-1" href="#"><i class="fa fa-bookmark"></i> MY WISHLIST</a></li>
<li><a tabindex="-1" href="#"><i class="fa fa-edit"></i> MY REVIEWS</a></li>
<li><a tabindex="-1" href="#"><i class="fa fa-cog"></i> MY SETTINGS</a></li>
<li class="divider"></li>
<li><a tabindex="-1" href="#"><i class="glyphicon glyphicon-off"></i> LOGOUT</a></li>
</ul>
</li>--}}
</ul>
</div>
</div>
@endif
<header id="topNav">
<div class="container">
@ -129,7 +161,12 @@
<div class="text-left">
<strong>Zwischensumme:</strong> <strong class="pull-right">{{ Yard::instance('shopping')->total() }} €</strong>
<br>
<em style="font-size: 0.9em">inkl. MwSt. zzgl. Versandkosten</em>
@if(Yard::instance('shopping')->getUserTaxFree())
<em style="font-size: 0.9em">exkl. MwSt. zzgl. Versandkosten</em>
@else
<em style="font-size: 0.9em">inkl. MwSt. zzgl. Versandkosten</em>
@endif
</div>
<a href="{{ url(Util::getPostRoute().'card/show') }}" class="btn btn-primary btn-text-500 btn-block mt-3 faa-parent animated-hover">zum Warenkorb <i class="fa fa-shopping-cart faa-horizontal"></i></a>