deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor presentation fixes for ordering, and npm updates

Browse Source
This commit is contained in:
Deon George
2018-08-12 17:07:32 +10:00
parent b737375be5
commit e9b5f9ac0c
10 changed files with 13762 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Models/Product.php
View File

@@ -78,9 +78,12 @@ class Product extends Model
return $this->setup_cost + ( $this->default_cost * array_get($table,$this->price_recurr_default) * $this->contract_term);
}
public function getNameAttribute()
public function getNameAttribute(Language $lo=NULL)
{
return $this->name(Auth::user()->language);
if (is_null($lo))
$lo = $this->getDefaultLanguage();
return $this->descriptions->where('language_id',$lo->id)->first()->description_short;
}
public function getProductTypeAttribute()
@@ -123,7 +126,7 @@ class Product extends Model
if (is_null($lo))
$lo = $this->getDefaultLanguage();
return $this->descriptions->where('language_id',$lo->id)->first()->description_short;
return $this->descriptions->where('language_id',$lo->id)->first()->description_full;
}
public function orderValidation(Request $request)