diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/mods/mod_ordercondition/produkt_edit_sidebar.phtml | 13 | ||||
| -rw-r--r-- | views/mods/mod_productvariants/admin_edit.phtml | 2 | ||||
| -rw-r--r-- | views/mods/mod_productvariants/frontend.js | 13 | ||||
| -rw-r--r-- | views/mods/mod_productvariants/produkt.phtml | 6 | ||||
| -rw-r--r-- | views/produkt/addedit_general.phtml | 6 | ||||
| -rw-r--r-- | views/warenkorb/basket.phtml | 7 | ||||
| -rw-r--r-- | views/warenkorb/overview.phtml | 6 |
7 files changed, 27 insertions, 26 deletions
diff --git a/views/mods/mod_ordercondition/produkt_edit_sidebar.phtml b/views/mods/mod_ordercondition/produkt_edit_sidebar.phtml index fc70b85..d1d0350 100644 --- a/views/mods/mod_ordercondition/produkt_edit_sidebar.phtml +++ b/views/mods/mod_ordercondition/produkt_edit_sidebar.phtml @@ -5,14 +5,11 @@ */
?>
-<div class="postbox" id="wpsg_ordercondition">
- <h3 class="wpsg_handlediv">
- <span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
- <span><?php echo __('Bestellbedingungen', 'wpsg'); ?></span>
- </h3>
- <div class="inside">
+<?php if ($this->hasMod('wpsg_mod_ordercondition')) { ?>
+
+<?php echo wpsg_drawForm_AdminboxStart(__('Bestellbedingungen', 'wpsg')); ?>
<?php foreach ($this->view['wpsg_mod_ordercondition']['data'] as $oc) { ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_ordercondition['.$oc['id'].']', __($oc['name'], 'wpsg'), $oc['selected']); ?>
<?php } ?>
- </div>
-</div>
\ No newline at end of file +<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+<?php } ?>
\ No newline at end of file diff --git a/views/mods/mod_productvariants/admin_edit.phtml b/views/mods/mod_productvariants/admin_edit.phtml index 0a0dda4..f55bc9f 100644 --- a/views/mods/mod_productvariants/admin_edit.phtml +++ b/views/mods/mod_productvariants/admin_edit.phtml @@ -181,7 +181,7 @@ <td class="ui-sortable" colspan="<?php echo $colspan; ?>" id="wpsg_mod_productvariants_productimage_<?php echo $k; ?>_<?php echo $kv; ?>" >
<?php $j = 0; foreach ($temp as $b) { $j ++; ?>
<?php // $this->view['variant']['id'] $vari $var $kv $_REQUEST['pic']
- $file2 = $b['basename'];
+ $file2 = $b['basenameori'];
$href = wp_get_attachment_image_src($b['post_id'], Array(25, 25));
?>
<a class="<?php echo ((in_array($file2, explode(",", $vari['pic'])))?'mark':''); ?> pic" id="<?php echo $file2; ?>"
diff --git a/views/mods/mod_productvariants/frontend.js b/views/mods/mod_productvariants/frontend.js index 836bbdc..9e50d0b 100644 --- a/views/mods/mod_productvariants/frontend.js +++ b/views/mods/mod_productvariants/frontend.js @@ -1,9 +1,9 @@ var wpsg_vp_vari = new Array();
- function wpsg_vp_switch(product_id, product_index)
+ function wpsg_vp_switch(product_id, product_index, elem)
{
-
+ /*
var var_key = 'pv_' + product_id + "|";
//alert('Länge: ' + wpsg_vp_vari[product_id].length);
@@ -37,11 +37,16 @@ if (i < (wpsg_vp_vari[product_id].length - 1)) var_key += "|";
}
}
-
+ */
//console.log(jQuery('#wpsg_produktform_' + product_index).serialize());
//console.log(var_key);
//return;
+ v1 = jQuery(elem).attr("data-wpsg-id");
+ //v2 = jQuery(elem).parent().find('input').val();
+ jQuery(elem).parent().find('input').val(v1);
+ //alert('v1=' + v1 + ' v2=' + v2);
+
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( {
@@ -54,7 +59,7 @@ '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_key': var_key,
'product_index': product_index
},
'success': function(data) {
diff --git a/views/mods/mod_productvariants/produkt.phtml b/views/mods/mod_productvariants/produkt.phtml index e449e9c..9984745 100644 --- a/views/mods/mod_productvariants/produkt.phtml +++ b/views/mods/mod_productvariants/produkt.phtml @@ -109,7 +109,7 @@ $pbw = $this->get_option('wpsg_vp_imageselect_width');
$pbh = $this->get_option('wpsg_vp_imageselect_height');
?>
- <a data-wpsg-id="<?php echo $kv; ?>" class="image <?php echo ((wpsg_getStr($this->view['wpsg_mod_productvariants']['set'][$k]) == $kv)?'akt':''); ?>" onclick="jQuery(this).parent().find('a').removeClass('akt'); jQuery(this).addClass('akt'); wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>); return false;" href="#">
+ <a data-wpsg-id="<?php echo $kv; ?>" class="image <?php echo ((wpsg_getStr($this->view['wpsg_mod_productvariants']['set'][$k]) == $kv)?'akt':''); ?>" onclick="jQuery(this).parent().find('a').removeClass('akt'); jQuery(this).addClass('akt'); wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>, this); return false;" href="#">
<img src="<?php echo $img; ?>" width="<?php echo $pbw; ?>" height="<?php echo $pbh; ?>"/>
</a>
<?php } ?>
@@ -127,11 +127,11 @@ <?php if (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0) { ?>
<input <?php echo ((wpsg_getStr($this->view['wpsg_mod_productvariants']['set'][$kk]) == $kv)?'checked="checked"':''); ?>
id="wpsg_vpfield_<?php echo $this->getProduktId($this->view['data']['id']); ?>_<?php echo $k; ?>_<?php echo $j; ?>"
- onclick="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);"
+ onclick="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>, this);"
type="radio" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo $kv; ?>" /> <?php echo $vari['name']; ?>
<?php /* Lagerbestand der Variante=0 - wird angezeigt, ist aber nicht auswählbar */ ?>
<?php } else { ?>
- <input disabled="disabled" <?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == $kv)?'checked="checked"':''); ?> id="wpsg_vpfield_<?php echo $this->getProduktId($this->view['data']['id']); ?>_<?php echo $k; ?>_<?php echo $j; ?>" onclick="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>);" type="radio" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo $kv; ?>" /> <?php echo $vari['name']; ?>
+ <input disabled="disabled" <?php echo (($this->view['wpsg_mod_productvariants']['set'][$k] == $kv)?'checked="checked"':''); ?> id="wpsg_vpfield_<?php echo $this->getProduktId($this->view['data']['id']); ?>_<?php echo $k; ?>_<?php echo $j; ?>" onclick="wpsg_vp_switch(<?php echo $this->getProduktId($this->view['data']['id']); ?>, <?php echo $this->view['product_index']; ?>, this);" type="radio" name="wpsg_vp[<?php echo $k; ?>]" value="<?php echo $kv; ?>" /> <?php echo $vari['name']; ?>
<?php } ?>
<?php /* Abfrage Preisanzeige nur für eingeloggte Benutzer START */?>
diff --git a/views/produkt/addedit_general.phtml b/views/produkt/addedit_general.phtml index ce0c5e6..81d8510 100644 --- a/views/produkt/addedit_general.phtml +++ b/views/produkt/addedit_general.phtml @@ -61,6 +61,12 @@ <?php echo wpsg_drawForm_AdminboxEnd(); ?>
+<?php if ($this->hasMod('wpsg_mod_ordercondition')) { ?>
+
+ <?php $this->callMod('wpsg_mod_ordercondition', 'produkt_edit_sidebar', array(&$this->view['data'])); ?>
+
+<?php } ?>
+
<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>
<?php echo wpsg_drawForm_AdminboxStart(__('URL Benachrichtigung', 'wpsg')); ?>
<?php echo wpsg_drawForm_Input('posturl', __('URL', 'wpsg'), wpsg_getStr($this->view['data']['posturl']), array('help' => 'URLBenachrichtigung')); ?>
diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml index 93dc7cc..f85cd1f 100644 --- a/views/warenkorb/basket.phtml +++ b/views/warenkorb/basket.phtml @@ -72,14 +72,11 @@ ?>
<div class="wpsg_basket_productimage">
<?php if (wpsg_isSizedString($arBilder[0]['guid'])) { ?>
- /*
- <?php $href = wp_get_attachment_image_src($arBilder[0]['post_id'], Array(30, 30)); ?>
- <?php $imgtag = wp_get_attachment_image($arBilder[0]['post_id'], Array(30, 30)); ?>
- <img src="<?php echo $href[0]; ?>" width="30" height="30" alt="<?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?>" />
- */
+ <?php
$url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['product_key'], 'medium'));
echo "<img src=".$url." alt='' />";
+ ?>
<?php } ?>
</div>
diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml index 48e6602..1433e94 100644 --- a/views/warenkorb/overview.phtml +++ b/views/warenkorb/overview.phtml @@ -36,7 +36,7 @@ <?php } ?>
<?php $this->callMods('overview_top', array(&$this->view['basket'])); ?>
-
+
<div class="shippayment">
<div class="subtitle"><?php echo __('Zahlung/Versand', 'wpsg'); ?>
<span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT2)); ?></span>
@@ -147,10 +147,6 @@ <div class="wpsg_overview_productimage">
<?php if (wpsg_isSizedString($arBilder[0]['guid'])) { ?>
- /*
- <?php $href = wp_get_attachment_image_src($arBilder[0]['post_id'], Array(30, 30)); ?>
- <?php $imgtag = wp_get_attachment_image($arBilder[0]['post_id'], Array(30, 30)); ?>
- */
<?php $img_url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['product_key'], 'thumbnail')); ?>
<?php if ($img_url !== false) { ?>
|
