diff options
Diffstat (limited to 'views/mods')
| -rw-r--r-- | views/mods/mod_deliverynote/deliverynote_pdf.phtml | 9 | ||||
| -rw-r--r-- | views/mods/mod_kundenverwaltung/order.phtml | 2 | ||||
| -rw-r--r-- | views/mods/mod_productfilter/settings_edit.phtml | 4 | ||||
| -rw-r--r-- | views/mods/mod_productvariants/admin_edit.phtml | 32 | ||||
| -rw-r--r-- | views/mods/mod_productvariants/basket_row.phtml | 23 | ||||
| -rw-r--r-- | views/mods/mod_productvariants/frontend.js | 67 | ||||
| -rw-r--r-- | views/mods/mod_productvariants/produkt.phtml | 7 | ||||
| -rw-r--r-- | views/mods/mod_productvariants/settings_edit.phtml | 1 | ||||
| -rw-r--r-- | views/mods/mod_productvariants/stock2.phtml | 59 | ||||
| -rw-r--r-- | views/mods/mod_productvariants/stockVarianten.phtml | 59 | ||||
| -rw-r--r-- | views/mods/mod_rechnungen/accounting_pdf.phtml | 4 | ||||
| -rw-r--r-- | views/mods/mod_rechnungen/invoice_pdf.phtml | 4 | ||||
| -rw-r--r-- | views/mods/mod_request/requestmail.phtml | 2 | ||||
| -rw-r--r-- | views/mods/mod_request/requestmail_html.phtml | 2 | ||||
| -rw-r--r-- | views/mods/mod_request/requestpage.phtml | 2 |
15 files changed, 142 insertions, 135 deletions
diff --git a/views/mods/mod_deliverynote/deliverynote_pdf.phtml b/views/mods/mod_deliverynote/deliverynote_pdf.phtml index a644dca..3a0d1b5 100644 --- a/views/mods/mod_deliverynote/deliverynote_pdf.phtml +++ b/views/mods/mod_deliverynote/deliverynote_pdf.phtml @@ -162,10 +162,10 @@ }
/*
- if ($this->hasMod('wpsg_mod_varianten') && isset($p['mod_vp_varkey']))
+ if ($this->hasMod('wpsg_mod_productvariants') && isset($p['mod_vp_varkey']))
{
- $variante = $this->callMod('wpsg_mod_varianten', 'getVariantenInfoArray', array($p['mod_vp_varkey']));
+ $variante = $this->callMod('wpsg_mod_productvariants', 'getVariantenInfoArray', array($p['mod_vp_varkey']));
$anr = $variante['akey'];
}
@@ -300,10 +300,11 @@ /**
* Variante ?
*/
- if ($this->get_option("wpsg_mod_deliverynote_pdf_varianten") == "1" && preg_match('/vp_(.*)/', $p['productkey']))
+ //$p['productkey'] = 'pv_6|4:1|7:3';
+ if ($this->get_option("wpsg_mod_deliverynote_pdf_varianten") == "1" && preg_match('/pv_(.*)/', $p['productkey']))
{
- $variInfo = $this->callMod('wpsg_mod_varianten', 'getVariantenInfoArray', array($p['productkey']));
+ $variInfo = $this->callMod('wpsg_mod_productvariants', 'getVariantenInfoArray', array($p['productkey']));
$height += $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 1.5, 5, wpsg_translate(__('Variante: #1#', 'wpsg'), $variInfo['key']), 0, 'L', 0, $produkt_text_cell_width);
diff --git a/views/mods/mod_kundenverwaltung/order.phtml b/views/mods/mod_kundenverwaltung/order.phtml index 59853e9..1b3f8bb 100644 --- a/views/mods/mod_kundenverwaltung/order.phtml +++ b/views/mods/mod_kundenverwaltung/order.phtml @@ -45,7 +45,7 @@ <td class="col_name">
<a href="<?php echo $p['url']; ?>"><?php echo $this->getProductName($this->getProduktID($p['id']), true); ?></a>
<br /><?php echo __('Artikelnummer', 'wpsg'); ?>: <?php echo $p['anr']; ?>
- <?php if ($this->hasMod('wpsg_mod_varianten') && wpsg_isSizedString($p['mod_vp_varkey'])) { $arVarInfo = $this->callMod('wpsg_mod_varianten', 'getVariantenInfoArray', array($p['mod_vp_varkey'])); ?>
+ <?php if ($this->hasMod('wpsg_mod_productvariants') && wpsg_isSizedString($p['mod_vp_varkey'])) { $arVarInfo = $this->callMod('wpsg_mod_productvariants', 'getVariantenInfoArray', array($p['mod_vp_varkey'])); ?>
<br /><?php echo __('Variante', 'wpsg'); ?>: <?php echo $arVarInfo['key']; ?>
<?php } ?>
<?php if ($this->hasMod('wpsg_mod_downloadplus')) { ?>
diff --git a/views/mods/mod_productfilter/settings_edit.phtml b/views/mods/mod_productfilter/settings_edit.phtml index 8fc7f53..05f2c42 100644 --- a/views/mods/mod_productfilter/settings_edit.phtml +++ b/views/mods/mod_productfilter/settings_edit.phtml @@ -45,7 +45,7 @@ <br />
-<?php if ($this->hasMod('wpsg_mod_varianten')) { ?>
+<?php if ($this->hasMod('wpsg_mod_productvariants')) { ?>
<div class="wpsg_admin_box" id="wpsg_mod_productfilter_varianten_box">
<div id="wpsg_mod_productfilter_varianten" class="head" style="border-bottom:0px none;">
<div class="title">
@@ -53,7 +53,7 @@ </div>
<div class="content wpsg_admin_box_content" style="display:block;">
<?php if (!wpsg_isSizedArray($this->view['wpsg_mod_productfilter']['arVarianten'])) { ?>
- <?php echo wpsg_translate(__('Noch keine Varianten hinterlegt. Definieren Sie in der <a href="#1#">Variantenverwaltung</a> Ihre Varianten.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_varianten'); ?>
+ <?php echo wpsg_translate(__('Noch keine Varianten hinterlegt. Definieren Sie in der <a href="#1#">Variantenverwaltung</a> Ihre Varianten.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants'); ?>
<?php } else { ?>
<?php $index = 0; foreach ($this->view['wpsg_mod_productfilter']['arVarianten'] as $var_name => $set) { $index ++; ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_productfilter[varianten][]', __($var_name, 'wpsg'), $set, array('value' => $var_name, 'id' => 'wpsg_mod_productfilter_varianten_'.$index)); ?>
diff --git a/views/mods/mod_productvariants/admin_edit.phtml b/views/mods/mod_productvariants/admin_edit.phtml index d0434d1..62636c6 100644 --- a/views/mods/mod_productvariants/admin_edit.phtml +++ b/views/mods/mod_productvariants/admin_edit.phtml @@ -27,6 +27,14 @@ <th class="col_artnr"><?php echo __('Artikelnummer', 'wpsg'); ?></th>
<th class="col_price"><?php echo __('Preis', 'wpsg'); ?></th>
<th class="col_stock"><?php echo __('Lagerbestand', 'wpsg'); ?></th>
+
+ <?php if ($this->hasMod('wpsg_mod_weight')) { ?>
+ <th class="col_stock"><?php echo __('Gewicht', 'wpsg'); ?></th>
+ <?php } ?>
+ <?php if ($this->hasMod('wpsg_mod_fuellmenge')) { ?>
+ <th class="col_stock"><?php echo __('Füllmenge', 'wpsg'); ?></th>
+ <?php } ?>
+
<?php } ?>
<?php if (!wpsg_isSizedInt($this->view['product_id']) || wpsg_isSizedInt($this->view['variant']['product_id'])) { $colspan ++; ?>
@@ -106,6 +114,22 @@ }
});
+ jQuery('#productvariation_weight_<?php echo $vari['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {
+ submitdata: {
+ field: 'vari_weight',
+ product_id: jQuery('#wpsg_mod_productvariants_product_id').val(),
+ field_id: '<?php echo $vari['id']; ?>'
+ }
+ });
+
+ jQuery('#productvariation_fmenge_<?php echo $vari['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {
+ submitdata: {
+ field: 'vari_fmenge',
+ product_id: jQuery('#wpsg_mod_productvariants_product_id').val(),
+ field_id: '<?php echo $vari['id']; ?>'
+ }
+ });
+
/* ]]> */</script>
</td>
@@ -119,6 +143,14 @@ <td class="col_artnr"><span class="wpsg_editable" id="productvariation_anr_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc($vari['anr']); ?></span></td>
<td class="col_price"><span class="wpsg_editable" id="productvariation_price_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc(wpsg_ff($vari['price'], $this->get_option('wpsg_currency'))); ?></span></td>
<td class="col_stock"><span class="wpsg_editable" id="productvariation_stock_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc($vari['stock']); ?></span></td>
+
+ <?php if ($this->hasMod('wpsg_mod_weight')) { ?>
+ <td class="col_stock"><span class="wpsg_editable" id="productvariation_weight_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc($vari['weight']); ?></span></td>
+ <?php } ?>
+ <?php if ($this->hasMod('wpsg_mod_fuellmenge')) { ?>
+ <td class="col_stock"><span class="wpsg_editable" id="productvariation_fmenge_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc($vari['fmenge']); ?></span></td>
+ <?php } ?>
+
<?php } ?>
<?php if (!wpsg_isSizedInt($this->view['product_id']) || wpsg_isSizedInt($this->view['variant']['product_id'])) { ?>
diff --git a/views/mods/mod_productvariants/basket_row.phtml b/views/mods/mod_productvariants/basket_row.phtml new file mode 100644 index 0000000..ba8063e --- /dev/null +++ b/views/mods/mod_productvariants/basket_row.phtml @@ -0,0 +1,23 @@ + <?php
+
+ /**
+ * Render ein Variantenprodukt im Warenkorb (basket.phtml)
+ */
+
+?>
+<?php //wpsg_debug($this->view['variante']) ?>
+<tr class="wpsg_<?php echo (($this->view['i'] % 2 == 0)?'odd':'even'); ?>">
+ <td><?php echo __('Variante', 'wpsg'); ?>:</td>
+ <td colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'3':'2'); ?>">
+ <?php if (get_option('wpsg_vp_detailview') == 1) { ?>
+ <?php foreach ($this->view['variante'] as $vari => $value) { ?>
+ <?php if (is_numeric($vari)) { ?>
+ <?php echo $value['name'] ?>: <?php echo $value['value'] ?>; <?php echo __('Art. Nr.', 'wpsg').': '.$value['artnr'] ?>; <?php echo $value['preis'] ?> <?php echo $this->get_option('wpsg_currency') ?>
+ <br />
+ <?php } ?>
+ <?php } ?>
+ <?php } else { ?>
+ <?php echo $this->view['variante']['key']; ?>
+ <?php } ?>
+ </td>
+</tr>
\ No newline at end of file diff --git a/views/mods/mod_productvariants/frontend.js b/views/mods/mod_productvariants/frontend.js index a6d62fa..836bbdc 100644 --- a/views/mods/mod_productvariants/frontend.js +++ b/views/mods/mod_productvariants/frontend.js @@ -1,4 +1,71 @@ + var wpsg_vp_vari = new Array();
+
+ function wpsg_vp_switch(product_id, product_index)
+ {
+
+ var var_key = 'pv_' + product_id + "|";
+ //alert('Länge: ' + wpsg_vp_vari[product_id].length);
+
+ for (var i = 0; i < wpsg_vp_vari[product_id].length; i ++)
+ {
+
+ vkey1 = i + ":";
+ vkey2 = '';
+
+ if (wpsg_vp_vari[product_id][i] == "select")
+ {
+ vkey2 = jQuery('#wpsg_produktform_' + product_index + ' .wpsg_produkt_' + product_id + " #wpsg_vpfield_" + product_id + "_" + i).val();
+ }
+ else if (wpsg_vp_vari[product_id][i] == "radio")
+ {
+ vkey2 = jQuery('#wpsg_produktform_' + product_index + ' .wpsg_produkt_' + product_id + ' input[name="wpsg_vp[' + i + ']"]:checked').val();
+ }
+ else if (wpsg_vp_vari[product_id][i] == "checkbox")
+ {
+ vkey2 = jQuery('#wpsg_produktform_' + product_index + ' .wpsg_produkt_' + product_id + ' input[name="wpsg_vp[' + i + ']"]:checked').length;
+ }
+ else if (wpsg_vp_vari[product_id][i] == "image")
+ {
+ vkey2 = jQuery('#wpsg_produktform_' + product_index + ' .wpsg_produkt_' + product_id + ' .wpsg_mod_productvariants_imageselect_' + i + ' .akt').attr("data-wpsg-id");
+ }
+
+ if (vkey2 != '') {
+ if (wpsg_vp_vari[product_id][i] == "image")
+ jQuery('#wpsg_vp_' + i).val(vkey2);
+ var_key += vkey1 + vkey2;
+ if (i < (wpsg_vp_vari[product_id].length - 1)) var_key += "|";
+ }
+ }
+
+ //console.log(jQuery('#wpsg_produktform_' + product_index).serialize());
+ //console.log(var_key);
+ //return;
+
+ jQuery('#wpsg_produktform_' + product_index).append('<div class="wpsg_product_layer"><img src="' + wpsg_ajax.img_ajaxloading + '" alt="' + wpsg_ajax.label_pleasewait + '" /></div>');
+
+ jQuery.ajax( {
+ 'url': wpsg_ajax.ajaxurl,
+ 'method': 'get',
+ 'data': {
+ 'action': 'wpsg_productvariants_switch',
+ 'wpsg_post_id': jQuery('#wpsg_produktform_' + product_index + ' input[name="wpsg_post_id"]').val(),
+ 'quantity': jQuery('#wpsg_menge_' + product_index).val(),
+ 'template': jQuery('#wpsg_produktform_' + product_index + ' input[name="wpsg[template]"]').val(),
+ 'referer': jQuery('#wpsg_produktform_' + product_index + ' input[name="myReferer"]').val(),
+ 'form_data': jQuery('#wpsg_produktform_' + product_index).serialize(),
+ 'product_key': var_key,
+ 'product_index': product_index
+ },
+ 'success': function(data) {
+
+ jQuery('#wpsg_produktform_' + product_index).replaceWith(data);
+
+ }
+ } );
+
+ } // function wpsg_vp_switch(produkt_id)
+
function wpsg_mod_productvariants_reload(event)
{
diff --git a/views/mods/mod_productvariants/produkt.phtml b/views/mods/mod_productvariants/produkt.phtml index 7225c8b..602731a 100644 --- a/views/mods/mod_productvariants/produkt.phtml +++ b/views/mods/mod_productvariants/produkt.phtml @@ -18,7 +18,8 @@ foreach ($this->view['data']['vp_data'] as $k => $var) {
$kk++;
- if ($var['active'] == "1") {
+ //if ($var['active'] == "1")
+ {
$vAktiv = true; ?>
@@ -110,8 +111,8 @@ <?php /* IMAGE START */ ?>
<?php if ($var['typ'] == 'image' && $this->hasMod('wpsg_mod_produktbilder')) { ?>
- <div class="wpsg_mod_varianten_imageselect wpsg_mod_varianten_imageselect_<?php echo $k; ?>">
- <input type="hidden" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo wpsg_getStr($this->view['wpsg_mod_productvariants']['set'][$k]); ?>" />
+ <div class="wpsg_mod_productvariants_imageselect wpsg_mod_productvariants_imageselect_<?php echo $k; ?>">
+ <input type="hidden" name="wpsg_vp[<?php echo $k; ?>]" id="wpsg_vp_<?php echo $k; ?>" value="<?php echo wpsg_getStr($this->view['wpsg_mod_productvariants']['set'][$k]); ?>" />
<?php $kkv = -1; foreach ($var['arVariation'] as $kv => $vari) { $kkv++;
if ($vari['active'] == '1' && (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0)) { ?>
<?php $img = $vari['guid']; ?>
diff --git a/views/mods/mod_productvariants/settings_edit.phtml b/views/mods/mod_productvariants/settings_edit.phtml index 3896830..d4ad6b5 100644 --- a/views/mods/mod_productvariants/settings_edit.phtml +++ b/views/mods/mod_productvariants/settings_edit.phtml @@ -20,6 +20,7 @@ <div id="tab2" role="tabpanel" class="tab-pane">
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_productvariants', __('Preis der Variation direkt anzeigen'), $this->get_option('wpsg_mod_productvariants')); ?>
+ <?php echo wpsg_drawForm_Checkbox('wpsg_vp_detailview', __('Erweiterte Variantenanzeige aktivieren', 'wpsg'), $this->get_option('wpsg_vp_detailview'), array('help' => 'wpsg_vp_detailview')); ?>
</div>
</div>
diff --git a/views/mods/mod_productvariants/stock2.phtml b/views/mods/mod_productvariants/stock2.phtml deleted file mode 100644 index 5130d87..0000000 --- a/views/mods/mod_productvariants/stock2.phtml +++ /dev/null @@ -1,59 +0,0 @@ -<?php
-
- /**
- * HTML Teil für die Produktvariablenverwaltung
- * (GLOBAL und Produktbezogen)
- */
-
-?>
-
-<div id="wpsg_mod_productvariants_dialog_modal" class="modal fade" tabindex="-1" role="dialog">
- <div class="modal-dialog" role="document">
- <div class="modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
- <h4 class="modal-title"><?php echo __('Produktvariation bearbeiten', 'wpsg'); ?></h4>
- </div>
- <div class="modal-body">
-
- </div>
- <div class="modal-footer">
-
- <button type="button" class="btn-sm wpsg_mod_productvariants_variation_add_button btn btn-default" id="wpsg_mod_productvariants_variation_add_button" style="display:none;" onclick="return wpsg_mod_productvariants_variation_add();"><span class="glyphicon glyphicon-plus"></span> <?php echo __('Neue Variation', 'wpsg'); ?></button>
- <button type="button" class="btn-sm wpsg_mod_productvariants_variants_close wpsg_mod_productvariants_variants_vari btn btn-default" style="display:none;" onclick="return wpsg_mod_productvariants_back();"><span class="glyphicon glyphicon-remove"></span> <?php echo __('Schließen', 'wpsg'); ?></button>
-
- </div>
- </div>
- </div>
-</div>
-
-<script type="text/javascript">/* <![CDATA[ */
-
- function wpsg_mod_productvariants_show(product_id)
- {
-
- jQuery('#wpsg_mod_productvariants_dialog button').prop('disabled', true);
- jQuery('#wpsg_mod_productvariants_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
-
- jQuery.ajax( {
- url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&noheader=1',
- data: {
- 'subaction': 'admin_show',
- 'product_id': product_id
- },
- success: function(data) {
-
- jQuery('.wpsg_mod_productvariants_variants').show();
- jQuery('.wpsg_mod_productvariants_variants_vari').hide();
-
- jQuery('#wpsg_mod_productvariants_dialog .modal-body').html(data);
- jQuery('#wpsg_mod_productvariants_dialog button').prop('disabled', false);
-
- }
- } );
-
- return false;
-
- } // function wpsg_mod_productvariants_show()
-
-/* ]]> */</script>
\ No newline at end of file diff --git a/views/mods/mod_productvariants/stockVarianten.phtml b/views/mods/mod_productvariants/stockVarianten.phtml deleted file mode 100644 index 737ea27..0000000 --- a/views/mods/mod_productvariants/stockVarianten.phtml +++ /dev/null @@ -1,59 +0,0 @@ -<?php
-
- /**
- * Template um eine Variante zu bearbeiten
- */
-
-?>
-
-<?php if (wpsg_isSizedArray($this->view['arVariant'])) { ?>
-
- <table class="table wpsg_mod_productvariants_table_variation">
- <tbody >
-
- <?php foreach ($this->view['arVariant'] as $var) { ?>
- <tr>
-
- <td class="col_shortname" colspan="3"><?php echo wpsg_hspc($var['name']); ?></td>
-
-
- </tr>
- <?php foreach ($var['arVariation'] as $vari) { ?>
- <tr>
- <td class="col_active">
- </td>
- <?php
- $txt = wpsg_hspc($vari['name']).' : '.wpsg_hspc($vari['stock']);
-
- ?>
- <td class="col_shortname"><?php echo $txt; ?></td>
- <td class="col_1">
- </td>
-
- </tr>
- <?php } ?>
- <?php } ?>
-
- </tbody>
- </table>
-
- <script type="text/javascript">/* <![CDATA[ */
-
-
- function wpsg_vp_ajaxloading_show()
- {
-
- jQuery('.wpsg_mod_productvariants_ajaxloading').show();
-
- }
-
- function wpsg_vp_ajaxloading_hide()
- {
-
- jQuery('.wpsg_mod_productvariants_ajaxloading').hide();
-
- }
-
- /* ]]> */</script>
-
-<?php } ?>
\ No newline at end of file diff --git a/views/mods/mod_rechnungen/accounting_pdf.phtml b/views/mods/mod_rechnungen/accounting_pdf.phtml index ccd280c..41c9b27 100644 --- a/views/mods/mod_rechnungen/accounting_pdf.phtml +++ b/views/mods/mod_rechnungen/accounting_pdf.phtml @@ -347,10 +347,10 @@ /**
* Variante ?
*/
- if (preg_match('/vp_(.*)/', $p['productkey']))
+ if (preg_match('/pv_(.*)/', $p['productkey']))
{
- $variInfo = $this->callMod('wpsg_mod_varianten', 'getVariantenInfoArray', array($p['productkey']));
+ $variInfo = $this->callMod('wpsg_mod_productvariants', 'getVariantenInfoArray', array($p['productkey']));
$height += $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, wpsg_translate(__('Variante: #1#', 'wpsg'), $variInfo['key']), 0, 'L', 0, $produkt_text_cell_width);
diff --git a/views/mods/mod_rechnungen/invoice_pdf.phtml b/views/mods/mod_rechnungen/invoice_pdf.phtml index 25cbfdb..b9a1b5d 100644 --- a/views/mods/mod_rechnungen/invoice_pdf.phtml +++ b/views/mods/mod_rechnungen/invoice_pdf.phtml @@ -347,10 +347,10 @@ /**
* Variante ?
*/
- if (preg_match('/vp_(.*)/', $p['productkey']))
+ if (preg_match('/pv_(.*)/', $p['productkey']))
{
- $variInfo = $this->callMod('wpsg_mod_varianten', 'getVariantenInfoArray', array($p['productkey']));
+ $variInfo = $this->callMod('wpsg_mod_productvariants', 'getVariantenInfoArray', array($p['productkey']));
$height += $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, wpsg_translate(__('Variante: #1#', 'wpsg'), $variInfo['key']), 0, 'L', 0, $produkt_text_cell_width);
diff --git a/views/mods/mod_request/requestmail.phtml b/views/mods/mod_request/requestmail.phtml index 3b9d411..0356a2a 100644 --- a/views/mods/mod_request/requestmail.phtml +++ b/views/mods/mod_request/requestmail.phtml @@ -26,7 +26,7 @@ <?php echo wpsg_pad_left($request_product['amount'], 6); ?>
<?php echo wpsg_pad_left(wpsg_ff($request_product['price'] * $request_product['amount'], $this->get_option('wpsg_currency')), 15); ?>
<?php /* Variantenanzeige im Produkt BEGIN */ ?>
-<?php if ($this->hasMod('wpsg_mod_varianten') && $this->callMod('wpsg_mod_varianten', 'isVariantsProductKey', array($request_product['product_key']))) { ?>
+<?php if ($this->hasMod('wpsg_mod_productvariant') && $this->callMod('wpsg_mod_productvariants', 'isVariantsProductKey', array($request_product['product_key']))) { ?>
<?php echo wpsg_pad_right(' ', 5); ?>
<?php echo __('Variante', 'wpsg'); ?>: <?php echo wpsg_hspc($request_product['variantenInfo']['key']); ?>
<?php } ?>
diff --git a/views/mods/mod_request/requestmail_html.phtml b/views/mods/mod_request/requestmail_html.phtml index 744afd3..daf3061 100644 --- a/views/mods/mod_request/requestmail_html.phtml +++ b/views/mods/mod_request/requestmail_html.phtml @@ -31,7 +31,7 @@ </tr>
<?php /* Variantenanzeige im Produkt BEGIN */ ?>
- <?php if ($this->hasMod('wpsg_mod_varianten') && $this->callMod('wpsg_mod_varianten', 'isVariantsProductKey', array($request_product['product_key']))) { ?>
+ <?php if ($this->hasMod('wpsg_mod_productvariants') && $this->callMod('wpsg_mod_productvariants', 'isVariantsProductKey', array($request_product['product_key']))) { ?>
<tr>
<td colspan="2"><?php echo __('Variante', 'wpsg'); ?>:</td>
<td colspan="<?php echo (3 + $this->view['addColspan']); ?>"><?php echo wpsg_hspc($request_product['variantenInfo']['key']); ?></td>
diff --git a/views/mods/mod_request/requestpage.phtml b/views/mods/mod_request/requestpage.phtml index 47a4a89..af6396d 100644 --- a/views/mods/mod_request/requestpage.phtml +++ b/views/mods/mod_request/requestpage.phtml @@ -139,7 +139,7 @@ </tr>
<?php /* Variantenanzeige im Produkt BEGIN */ ?>
- <?php if ($this->hasMod('wpsg_mod_varianten') && $this->callMod('wpsg_mod_varianten', 'isVariantsProductKey', array($request_product['product_key']))) { ?>
+ <?php if ($this->hasMod('wpsg_mod_productvariants') && $this->callMod('wpsg_mod_productvariants', 'isVariantsProductKey', array($request_product['product_key']))) { ?>
<tr class="wpsg_row_product_varianten">
<td class="wpsg_cell_label"><?php echo __('Variante', 'wpsg'); ?>:</td>
<td class="wpsg_cell_value" colspan="<?php echo (2 + $this->view['addColspan']); ?>"><?php echo wpsg_hspc($request_product['variantenInfo']['key']); ?></td>
|
