Merge branch 'eshop-only-admin-price' into 'master'

fixed error if no articlenumber is found

See merge request fronk/thetool!801
This commit is contained in:
Luca Haid
2024-12-10 13:06:42 +00:00

View File

@@ -218,7 +218,11 @@ class WarehouseShippingNoteController extends TTCrud {
foreach (json_decode($shippingNote->positions, true) as $position) {
if (isset($position['article'])) {
$article = WarehouseArticleModel::get($position['article']);
$position['articleTitle'] = $article->articleNumber . " | " .$article->title;
if (isset($article->articleNumber)) {
$position['articleTitle'] = $article->articleNumber . " | " . $article->title;
} else {
$position['articleTitle'] = $article->title;
}
$position['articleDescription'] = $article->description === $article->title ? "" : $article->description;
$position['articleUnit'] = $article->unit;
$positions[] = $position;