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

Header Shop bug

Browse source
This commit is contained in:
Kevin Adametz 2021-09-15 19:09:49 +02:00
parent 39d1e93416
commit 80e6540f73
6 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/LeadController.php
View file

@ -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;
}

2
app/Models/Product.php
View file

@ -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>';