summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Schmitzer <noreply@maennchen1.de>2020-05-28 07:22:18 +0000
committerDaniel Schmitzer <noreply@maennchen1.de>2020-05-28 07:22:18 +0000
commit88369337d7b676b5f27107775d2cf64b6228cfe3 (patch)
treebea5b465dd48d3a76065d57a15f1b9cc6b16ed81
parent37edaa294f2c48e04079cedd73c8351d666dd4fc (diff)
#4.2.4
- Bugfix: Durch den Fix in 4.2.3. ("Zuordnung Produkt zu Artikel") wurden die Kategorien nicht mehr gespeichert. Dies ist korrigiert - Warnungen im Code aufgelöst git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7728 0d5edaf7-2b12-4e95-93f4-047927463d4b
-rw-r--r--views/mods/mod_productvars/settings_edit.phtml6
-rw-r--r--views/produkttemplates/standard.phtml2
2 files changed, 6 insertions, 2 deletions
diff --git a/views/mods/mod_productvars/settings_edit.phtml b/views/mods/mod_productvars/settings_edit.phtml
index e4bedcc..e924fa0 100644
--- a/views/mods/mod_productvars/settings_edit.phtml
+++ b/views/mods/mod_productvars/settings_edit.phtml
@@ -50,7 +50,7 @@
<ul class="nav nav-tabs">
<li role="presentation" class="active"><a href="#tab1" role="tab" data-toggle="tab"><?php echo __('Produktvariablen', 'wpsg'); ?></a></li>
<li role="presentation"><a href="#tab2" role="tab" data-toggle="tab"><?php echo __('Einstellungen', 'wpsg'); ?></a></li>
- </ul>
+ </ul>wps
<div class="tab-content">
<div id="tab1" role="tabpanel" class="tab-pane active">
<div class="content" id="wpsg_pv_list">
@@ -65,10 +65,12 @@
<div id="tab2" role="tabpanel" class="tab-pane">
<div class="wpsg_productvars_form">
+
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_productvars_showProduct', __('Produktvariable(n) im Produkttemplate abfragen', 'wpsg'), $this->get_option('wpsg_mod_productvars_showProduct'), array('help' => 'wpsg_mod_productvars_showProduct')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_productvars_showBasket', __('Produktvariable(n) im Warenkorbtemplate darstellen', 'wpsg'), $this->get_option('wpsg_mod_productvars_showBasket'), array('help' => 'wpsg_mod_productvars_showBasket')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_productvars_showOverview', __('Produktvariable(n) im Bestellübersichtstemplate darstellen', 'wpsg'), $this->get_option('wpsg_mod_productvars_showOverview'), array('help' => 'wpsg_mod_productvars_showOverview')); ?>
- <?php echo wpsg_drawForm_Checkbox('wpsg_mod_productvars_showMail', __('Produktvariable(n) im Mailtemplate nicht darstellen', 'wpsg'), $this->get_option('wpsg_mod_productvars_showMail'), array('help' => 'wpsg_mod_productvars_showMail')); ?>
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_productvars_showMail', __('Produktvariable(n) im Mailtemplate nicht darstellen', 'wpsg'), $this->get_option('wpsg_mod_productvars_showMail'), array('help' => 'wpsg_mod_productvars_showMail')); ?>
+
</div>
</div>
</div> \ No newline at end of file
diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index 3456fc9..4492c90 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -183,7 +183,9 @@
<?php /* Lagerbestand ENDE*/?>
<?php /* Füllmengenanzeige START */ ?>
+ <?php if ($this->hasMod('wpsg_mod_fuellmenge')) { ?>
<?php echo $this->callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', [$oProduct->getPrice($this->view['data']['product_key']), $this->view['data']['fmenge'], $oProduct->getId()]); ?>
+ <?php } ?>
<?php /* Füllmengenanzeige ENDE */ ?>
<?php /* Gewichtsanzeige START */ ?>