Index: /mods/wpsg_mod_billsafe.class.php =================================================================== --- /mods/wpsg_mod_billsafe.class.php (revision 6267) +++ /mods/wpsg_mod_billsafe.class.php (revision 6268) @@ -734,5 +734,5 @@ if (preg_match('/^pv_(.*)/', $op['id'])) { - $produkt_id = preg_replace('/(^vp_)|(\|(.*)$)/', '', $op['id']); + $produkt_id = preg_replace('/(^pv_)|(\|(.*)$)/', '', $op['id']); } else Index: /mods/wpsg_mod_downloadplus.class.php =================================================================== --- /mods/wpsg_mod_downloadplus.class.php (revision 6267) +++ /mods/wpsg_mod_downloadplus.class.php (revision 6268) @@ -750,5 +750,5 @@ $arProduct = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".$p_id."'"); - if (preg_match('/^vp_(.*)/', $p_key)) + if (preg_match('/^pv_(.*)/', $p_key)) { @@ -1183,7 +1183,7 @@ $product_key = $p['id']; - if (preg_match('/^vp_(.*)/', $p['id'])) + if (preg_match('/^pv_(.*)/', $p['id'])) { - $p['id'] = preg_replace('/(^vp_)|(\/(.*))/', '', $p['id']); + $p['id'] = preg_replace('/(^pv_)|(\|(.*))/', '', $p['id']); } @@ -1588,7 +1588,7 @@ { - if (preg_match('/^vp_(.*)/', $produkt_id)) - { - $produkt_id = preg_replace('/(^vp_)|(\/(.*))/', '', $produkt_id); + if (preg_match('/^pv_(.*)/', $produkt_id)) + { + $produkt_id = preg_replace('/(^pv_)|(\|(.*))/', '', $produkt_id); } @@ -1622,7 +1622,7 @@ { - if (preg_match('/^vp_(.*)/', $produkt_id)) - { - $produkt_id = preg_replace('/(^vp_)|(\/(.*))/', '', $produkt_id); + if (preg_match('/^pv_(.*)/', $produkt_id)) + { + $produkt_id = preg_replace('/(^pv_)|(\|(.*))/', '', $produkt_id); } Index: /mods/wpsg_mod_ordercondition.class.php =================================================================== --- /mods/wpsg_mod_ordercondition.class.php (revision 6267) +++ /mods/wpsg_mod_ordercondition.class.php (revision 6268) @@ -328,5 +328,5 @@ { - if (preg_match('//', $p['id'])) $produkt_id = preg_replace('/(^vp\_)|\/\d+\_\d+$/', '', $p['id']); + if (preg_match('//', $p['id'])) $produkt_id = preg_replace('/(^pv\_)|\|\d+\:\d+$/', '', $p['id']); else if (is_int($p['id'])) $produkt_id = $p['id']; Index: /mods/wpsg_mod_productvariants.class.php =================================================================== --- /mods/wpsg_mod_productvariants.class.php (revision 6267) +++ /mods/wpsg_mod_productvariants.class.php (revision 6268) @@ -264,11 +264,14 @@ $pics = unserialize($vari_data['images']); - $pic = explode(',', $pics['pic']); - unset($pic[0]); - //$vari_data['images'] = array('pic' => array()); - //$vari_data['images']['pic'] = $pic; - $vari_data['pics'] = $pic; - //$test = array(); - //$test = array_intersect($test, $vari_data['images']['pic']); + unset($vari_data['pics']); + if (wpsg_isSizedArray($pics)) { + $pic = explode(',', $pics['pic']); + unset($pic[0]); + //$vari_data['images'] = array('pic' => array()); + //$vari_data['images']['pic'] = $pic; + $vari_data['pics'] = $pic; + //$test = array(); + //$test = array_intersect($test, $vari_data['images']['pic']); + } if (isset($vari_data['pics'])) { @@ -607,11 +610,17 @@ $arPic = explode(",", $vp_data[$_REQUEST['var_id']]['arVariation'][$_REQUEST['iid']]['pic']); - if (in_array($_REQUEST['pic'], $arPic)) + $pic = $_REQUEST['pic']; + $pos1 = strrpos($pic, '-'); + if ($pos1 !== false) { + $pos2 = strrpos($pic, '.'); + $pic = substr_replace($pic, '', $pos1, $pos2 - $pos1); + } + if (in_array($pic, $arPic)) { - unset($arPic[array_search($_REQUEST['pic'], $arPic)]); + unset($arPic[array_search($pic, $arPic)]); } else { - $arPic[] = $_REQUEST['pic']; + $arPic[] = $pic; } @@ -1182,5 +1191,5 @@ $v2['post_id'] = 0; foreach ($arpb as $k3 => $v3) { - if ($v2['showpic'] === $v3['basename']) $found = $k3; + if ($v2['showpic'] === $v3['basenameori']) $found = $k3; } if ($found != -1) { Index: /mods/wpsg_mod_produktbilder.class.php =================================================================== --- /mods/wpsg_mod_produktbilder.class.php (revision 6267) +++ /mods/wpsg_mod_produktbilder.class.php (revision 6268) @@ -548,6 +548,9 @@ $file = $arrf['basename']; $pos1 = strrpos($file, '-'); - $pos2 = strrpos($file, '.'); - $this->shop->view['ProduktBilder_MT'][$i]['basenameori']= substr_replace($file, '', $pos1, $pos2 - $pos1); + if ($pos1 !== false) { + $pos2 = strrpos($file, '.'); + $file = substr_replace($file, '', $pos1, $pos2 - $pos1); + } + $this->shop->view['ProduktBilder_MT'][$i]['basenameori']= $file; } @@ -658,6 +661,13 @@ $vid = $ap[count($ap) - 1]; $images = $this->db->fetchOne("SELECT `images` FROM `".WPSG_TBL_PRODUCTS_VARIATION."` WHERE `variation_id`=".wpsg_q($vid)); - $ai = explode(',', $images); - $af = pathinfo($ai[count($ai) - 1], PATHINFO_FILENAME); + $ar = unserialize($images); + $ar2 = explode(',', $ar['pic']); + $file = pathinfo($ar2[count($ar2) - 1], PATHINFO_FILENAME); + $af = $file; + $pos1 = strrpos($file, '-'); + if ($pos1 !== false) { + $pos2 = strlen($file); + $af = substr_replace($file, '', $pos1, $pos2 - $pos1); + } $sql = "SELECT @@ -672,5 +682,5 @@ $arr = $this->db->fetchAssoc($sql); - $p = wp_get_attachment_image_src($arr[0]['ID'], 'medium'); + $p = wp_get_attachment_image_src($arr[0]['ID'], 'thumbnail'); } @@ -749,6 +759,9 @@ $file = $arrf['basename']; $pos1 = strrpos($file, '-'); - $pos2 = strrpos($file, '.'); - $arFiles[$i]['basenameori']= substr_replace($file, '', $pos1, $pos2 - $pos1); + if ($pos1 !== false) { + $pos2 = strrpos($file, '.'); + $file = substr_replace($file, '', $pos1, $pos2 - $pos1); + } + $arFiles[$i]['basenameori']= $file; $arFiles[$i]['url'] = $guid; Index: /views/mods/mod_ordercondition/produkt_edit_sidebar.phtml =================================================================== --- /views/mods/mod_ordercondition/produkt_edit_sidebar.phtml (revision 6267) +++ /views/mods/mod_ordercondition/produkt_edit_sidebar.phtml (revision 6268) @@ -6,13 +6,10 @@ ?> -
-

-
- -

-
+hasMod('wpsg_mod_ordercondition')) { ?> + + view['wpsg_mod_ordercondition']['data'] as $oc) { ?> -
-
+ + Index: /views/mods/mod_productvariants/admin_edit.phtml =================================================================== --- /views/mods/mod_productvariants/admin_edit.phtml (revision 6267) +++ /views/mods/mod_productvariants/admin_edit.phtml (revision 6268) @@ -182,5 +182,5 @@ 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)); ?> Index: /views/mods/mod_productvariants/frontend.js =================================================================== --- /views/mods/mod_productvariants/frontend.js (revision 6267) +++ /views/mods/mod_productvariants/frontend.js (revision 6268) @@ -2,7 +2,7 @@ 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); @@ -38,8 +38,13 @@ } } - + */ //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('
' + wpsg_ajax.label_pleasewait + '
'); @@ -55,5 +60,5 @@ '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 }, Index: /views/mods/mod_productvariants/produkt.phtml =================================================================== --- /views/mods/mod_productvariants/produkt.phtml (revision 6267) +++ /views/mods/mod_productvariants/produkt.phtml (revision 6268) @@ -110,5 +110,5 @@ $pbh = $this->get_option('wpsg_vp_imageselect_height'); ?> - + @@ -128,9 +128,9 @@ view['wpsg_mod_productvariants']['set'][$kk]) == $kv)?'checked="checked"':''); ?> id="wpsg_vpfield_getProduktId($this->view['data']['id']); ?>__" - onclick="wpsg_vp_switch(getProduktId($this->view['data']['id']); ?>, view['product_index']; ?>);" + onclick="wpsg_vp_switch(getProduktId($this->view['data']['id']); ?>, view['product_index']; ?>, this);" type="radio" name="wpsg_vp[]" value="" />  - view['wpsg_mod_productvariants']['set'][$k] == $kv)?'checked="checked"':''); ?> id="wpsg_vpfield_getProduktId($this->view['data']['id']); ?>__" onclick="wpsg_vp_switch(getProduktId($this->view['data']['id']); ?>, view['product_index']; ?>);" type="radio" name="wpsg_vp[]" value="" />  + view['wpsg_mod_productvariants']['set'][$k] == $kv)?'checked="checked"':''); ?> id="wpsg_vpfield_getProduktId($this->view['data']['id']); ?>__" onclick="wpsg_vp_switch(getProduktId($this->view['data']['id']); ?>, view['product_index']; ?>, this);" type="radio" name="wpsg_vp[]" value="" />  Index: /views/produkt/addedit_general.phtml =================================================================== --- /views/produkt/addedit_general.phtml (revision 6267) +++ /views/produkt/addedit_general.phtml (revision 6268) @@ -62,4 +62,10 @@ +hasMod('wpsg_mod_ordercondition')) { ?> + + callMod('wpsg_mod_ordercondition', 'produkt_edit_sidebar', array(&$this->view['data'])); ?> + + + Index: /views/warenkorb/basket.phtml =================================================================== --- /views/warenkorb/basket.phtml (revision 6267) +++ /views/warenkorb/basket.phtml (revision 6268) @@ -73,12 +73,9 @@
- /* - - - <?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?> - */ - + + callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['product_key'], 'medium')); echo ""; + ?> Index: /views/warenkorb/overview.phtml =================================================================== --- /views/warenkorb/overview.phtml (revision 6267) +++ /views/warenkorb/overview.phtml (revision 6268) @@ -37,5 +37,5 @@ callMods('overview_top', array(&$this->view['basket'])); ?> - +
  @@ -148,8 +148,4 @@ - /* - - - */ callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['product_key'], 'thumbnail')); ?>