diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/ProductsHandler.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/ProductsHandler.php index 8aae4f6..ca6bbc0 100755 --- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/ProductsHandler.php +++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/ProductsHandler.php @@ -134,6 +134,7 @@ class ProductsHandler 'products.price' => 'price', 'products.image' => 'product_image', 'products.tax_class_id' => 'tax_class_id', + 'manufacturer.name' => 'product_manufacturer', ]) ->from(db_table('product'), 'products') ->join( @@ -143,6 +144,12 @@ class ProductsHandler ->where('product_description.language_id', '=', $languageId); } ) + ->join( + db_table('manufacturer') . ' AS manufacturer', + function (JoinClause $join) use ($languageId) { + $join->on('products.manufacturer_id', '=', 'manufacturer.manufacturer_id'); + } + ) ->where('products.product_id', '=', $productId) ->limit(1) ->firstOrNull(); @@ -185,6 +192,7 @@ class ProductsHandler 'id' => $product['product_id'], 'name' => $product['product_name'], 'description' => html_entity_decode($product['product_description']), + 'manufacturer' => $product['product_manufacturer'], 'price' => $price, 'images' => $images, ]; diff --git a/spa/src/views/Home.vue b/spa/src/views/Home.vue index cfee851..4c605b5 100644 --- a/spa/src/views/Home.vue +++ b/spa/src/views/Home.vue @@ -96,5 +96,5 @@ onMounted(() => { if (backButton.isVisible.value) { backButton.hide(); } -}) +}); diff --git a/spa/src/views/Product.vue b/spa/src/views/Product.vue index ca0b67b..1fff15a 100644 --- a/spa/src/views/Product.vue +++ b/spa/src/views/Product.vue @@ -15,6 +15,9 @@