summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--views/produkt/addedit_general.phtml3
-rw-r--r--views/produktseite/produkt.phtml9
2 files changed, 8 insertions, 4 deletions
diff --git a/views/produkt/addedit_general.phtml b/views/produkt/addedit_general.phtml
index 317870d..097eb00 100644
--- a/views/produkt/addedit_general.phtml
+++ b/views/produkt/addedit_general.phtml
@@ -48,6 +48,7 @@
<?php } ?>
<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>
<?php echo wpsg_drawForm_Input('anr', __('Artikelnummer', 'wpsg'), wpsg_getStr($this->view['data']['anr'])); ?>
+ <?php if (wpsg_product::hasManufacturerColumn()) echo wpsg_drawForm_Input('manufacturer', __('Hersteller', 'wpsg'), (string)($this->view['data']['manufacturer']??''), []); ?>
<?php if (!is_array($this->view['templates']) || sizeof($this->view['templates']) <= 0) { ?>
<?php echo wpsg_drawForm_Text(__('Produkttemplate', 'wpsg'), __('Keine Templatesdateien gefunden!', 'wpsg'), array('class_content_wrap' => 'wpsg_error')); ?>
<?php } else { ?>
@@ -92,7 +93,7 @@
<?php echo wpsg_drawForm_Checkbox('garan', __('GARAN-Gewährleistungslabel', 'wpsg'), intval($this->view['data']['garan']??0) === 1, ['id' => 'wpsg_garan_checkbox']); ?>
<div id="wpsg_garan_layer" style="display:none;">
<?php echo wpsg_drawForm_Input('garan_years', __('GARAN-Gewährleistungsjahre', 'wpsg'), ((intval($this->view['data']['garan_years']??0) > 0)?intval($this->view['data']['garan_years']):''), ['type' => 'number', 'min' => 2]); ?>
- <?php echo wpsg_drawForm_Input('garan_brand', __('GARAN-Marke/Markenzeichen', 'wpsg'), $this->view['data']['garan_brand']??'', []); ?>
+ <?php echo wpsg_drawForm_Input('garan_brand', __('Herstellername auf dem GARAN-Label', 'wpsg'), $this->view['data']['garan_brand']??'', ['hint' => __('Leer: Hersteller des Produkts', 'wpsg')]); ?>
<?php echo wpsg_drawForm_Input('garan_model', __('GARAN-Modellnummer', 'wpsg'), $this->view['data']['garan_model']??'', []); ?>
</div>
<script>
diff --git a/views/produktseite/produkt.phtml b/views/produktseite/produkt.phtml
index 8280972..e8c83ae 100644
--- a/views/produktseite/produkt.phtml
+++ b/views/produktseite/produkt.phtml
@@ -349,13 +349,16 @@
<input class="wpsg_button wpsg_add_requestlist<?php echo wpsg_button_class(); ?>" id="wpsg_add_requestlist_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('Auf die Anfrageliste', 'wpsg'); ?>" name="wpsg[submit_request]" />
<?php } ?>
- <?php /* Artikelnummer und Produktcodes als Liste (Punkt 8.7) START */ ?>
- <?php $bNr = ($this->get_option('wpsg_showArticelnumber') == '1'); $arProductCodes = $oProduct->getAllProductCodes(); ?>
- <?php if ($bNr || sizeof($arProductCodes) > 0) { ?>
+ <?php /* Artikelnummer, Hersteller und Produktcodes als Liste (Punkt 8.7) START */ ?>
+ <?php $bNr = ($this->get_option('wpsg_showArticelnumber') == '1'); $arProductCodes = $oProduct->getAllProductCodes(); $manufacturer = $oProduct->getManufacturer(); ?>
+ <?php if ($bNr || sizeof($arProductCodes) > 0 || $manufacturer !== '') { ?>
<ul class="wpsg-product__facts">
<?php if ($bNr) { ?>
<li class="wpsg_artikelnummer"><?php echo esc_html__('Artikelnummer', 'wpsg'); ?>: <span class="wpsg_anr"><?php echo esc_html((string)$oProduct->getNr()); ?></span></li>
<?php } ?>
+ <?php if ($manufacturer !== '') { ?>
+ <li class="wpsg-product__manufacturer"><?php echo esc_html__('Hersteller', 'wpsg'); ?>: <span itemprop="manufacturer"><?php echo esc_html($manufacturer); ?></span></li>
+ <?php } ?>
<?php foreach ($arProductCodes as $product_code) { ?>
<li class="product_code <?php echo esc_attr($product_code['code_key']); ?>"><span class="label"><?php echo esc_html($product_code['label']); ?></span>: <span class="code"><?php echo esc_html($product_code['code']); ?></span></li>
<?php } ?>