Header Shop bug

app/Http/Controllers/LeadController.php

@@ -97,7 +97,7 @@ class LeadController extends Controller
                 $user->account = new UserAccount();
             }
         }
-        $next_account_id = UserAccount::max('m_account') +1;
+        $next_account_id = UserAccount::withTrashed()->max('m_account') +1;
         if($user->account->m_account === null){
             $user->account->m_account = $next_account_id;
         }

app/Models/Product.php

@@ -507,7 +507,7 @@ class Product extends Model
 
     public function getFormattedPriceCurrencyWith(Bool $net = true, Bool $ufactor = true, Country $country = null){
         $ret = "";
-        if($country->currency){
+        if($country && isset($country->currency) && $country->currency){
                 $price = $this->getPriceWith($net, $ufactor, $country);
                 $ret = formatNumber($price * $country->currency_faktor)." ".$country->currency_unit;
             return '<br><span class="small">~'.$ret.'<span>';

resources/views/admin/product/form.blade.php

@@ -25,16 +25,18 @@
         </div>
 
         <div class="form-row">
-            <div class="form-group col-sm-5">
+            <div class="form-group col-sm-10">
                 <label class="form-label" for="title">{{ __('Kategorie (Mehrfachauswahl)') }}*</label>
                 <select class="selectpicker" name="categories[]" id="categories"  data-style="btn-light" data-live-search="false" multiple required>
                     {!!  HTMLHelper::getCategoriesOptions($product->categories()->pluck('category_id')->toArray(), false) !!}
                 </select>
             </div>
+           {{--   
             <div class="form-group col-sm-5">
                 <label class="form-label" for="show_at">{{ __('Produkt anzeigen') }} alt</label>
                 {{ Form::select('show_at', $product->showATs, $product->show_at, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'show_at') ) }}
             </div>
+            --}}
 
             <div class="form-group col-sm-2">
                 <label class="form-label" for="pos">{{ __('Listenposition') }}</label>

resources/views/web/layouts/application.blade.php

@@ -71,6 +71,7 @@
 			div.side-nav ul.list-group-bordered > li.list-group-item.active > a:hover{
 				color: #fff !important;
 			}
+			
 		</style>
 	</head>
 

resources/views/web/user/layouts/application.blade.php

@@ -77,7 +77,6 @@
 				color: #535252 !important;
 				border-color: #989a9c;
 			}
-		
 		</style>
 	</head>
 
@@ -100,7 +99,7 @@
 					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>
+					<label>Lieferland*</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>

resources/views/web/user/layouts/includes/header.blade.php

@@ -47,20 +47,33 @@
 			background-color: transparent;
 			border: #b0adb3 1px solid;
 		}
+		#topBar {
 
+		}
+		#topBar ul.top-links > li > a {
+			display: inline-block;
+		}
 	</style>
 	@if(isset($mylangs))
+	<style>
+		@media only screen and (max-width: 992px) {
+			/* Force 60px */
+			#header {
+				height:105px !important;
+			}
+		}
+	</style>
+
 	<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>
+						<span>Lieferland:</span> <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>
@@ -75,9 +88,6 @@
 					</ul>
 				</li>--}}
 			</ul>
-
-			
-
 		</div>
 	</div>
 	@endif