Index: /mods/wpsg_mod_productvariants.class.php =================================================================== --- /mods/wpsg_mod_productvariants.class.php (revision 6241) +++ /mods/wpsg_mod_productvariants.class.php (revision 6242) @@ -245,7 +245,35 @@ $product_data['product_key'] = $strDefaultKey; $product_data['id'] = $strDefaultKey; - + } - + + $arProductKey = $this->explodeProductKey($product_data['product_key']); + + $arProductImagesPossible = array(); + + // Gesetzte Variante wÀhlen und aufwerten + foreach ($product_data['arVariant'] as $var_id => $var_data) + { + + foreach ($var_data['arVariation'] as $vari_id => $vari_data) + { + + if ($arProductKey['arVari'][$var_id] == $vari_id) + { + + if (wpsg_isSizedArray($arProductImagesPossible)) $arProductImagesPossible = array_intersect($arProductImagesPossible, $vari_data['images']['pic']); + else if (wpsg_isSizedArray($vari_data['images']['pic'])) $arProductImagesPossible = $vari_data['images']['pic']; + + $product_data['arVariant'][$var_id]['arVariation'][$vari_id]['set'] = true; + + } + else $product_data['arVariant'][$var_id]['arVariation'][$vari_id]['set'] = false; + + } + + } + + if (wpsg_isSizedArray($arProductImagesPossible)) $product_data['image_show'] = array_shift($arProductImagesPossible); + // Preise fÌr die Varianten berechnen if (!(isset($product_data['varPriceAdded']) && ($product_data['varPriceAdded'] = 1))) @@ -273,4 +301,5 @@ } + // Preise fÌr das Frontend ermitteln if ($this->shop->getFrontendTaxView() === WPSG_BRUTTO) @@ -286,5 +315,5 @@ } - + } if ($product_data['preis_brutto'] == 161.00) { @@ -302,5 +331,4 @@ //foreach ($form_data['wpsg_mod_productvariants'] as $var_id => $vari_id) $form_data['wpsg_mod_productvariants'][$var_id] = $var_id.':'.$vari_id; //$product_key = 'pv_'.$product_id.'|'.implode('|', $form_data['wpsg_mod_productvariants']); -<<<<<<< .mine if (!wpsg_isSizedArray($form_data['wpsg_vp'])) return false; @@ -308,18 +336,5 @@ foreach ($form_data['wpsg_vp'] as $var_id => $vari_id) $form_data['wpsg_vp'][$var_id] = $var_id.':'.$vari_id; $product_key = 'pv_'.$product_id.'|'.implode('|', $form_data['wpsg_vp']); -||||||| .r6234 - - if (!wpsg_isSizedArray($form_data['wpsg_vp'])) return false; - - foreach ($form_data['wpsg_vp'] as $var_id => $vari_id) $form_data['wpsg_mod_productvariants'][$var_id] = $var_id.':'.$vari_id; - $product_key = 'pv_'.$product_id.'|'.implode('|', $form_data['wpsg_mod_productvariants']); -======= - - if (!wpsg_isSizedArray($form_data['wpsg_mod_productvariants'])) return false; - - foreach ($form_data['wpsg_mod_productvariants'] as $var_id => $vari_id) $form_data['wpsg_mod_productvariants'][$var_id] = $var_id.':'.$vari_id; - $product_key = 'pv_'.$product_id.'|'.implode('|', $form_data['wpsg_mod_productvariants']); ->>>>>>> .r6240 - + } // public function getProductKeyFromRequest($product_id, $form_data) @@ -1072,4 +1087,6 @@ { + die("Veraltet"); + if (!wpsg_isSizedArray($product_data['arVariant'])) return; @@ -1087,15 +1104,5 @@ public function renderTemplate($product_key) { - -<<<<<<< .mine - // Siehe productTemplate V4 - //die("Veralteter Aufruf"); - -||||||| .r6234 -======= - // Siehe productTemplate V4 - die("Veralteter Aufruf"); - ->>>>>>> .r6240 + $produkt_id = $this->shop->getProduktId($product_key); $produkt_data = $this->shop->cache->loadProduct($produkt_id); @@ -1134,4 +1141,6 @@ // Rabattpreise vorkalkulieren //$this->shop->callMod('wpsg_mod_discount', 'addDiscountToVari', array(&$produkt_id, &$this->shop->view['data']['vp_data'])); + + $arPossibleImages = array(); // Bilddaten ergÀnzen @@ -1167,6 +1176,8 @@ $v2['post_id'] = $arpb[$found]['post_id']; } + } } + unset($v1); unset($v2); @@ -1214,5 +1225,5 @@ } - + return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productvariants/produkt.phtml', false); @@ -1895,4 +1906,15 @@ VI.`pos` ASC ", "variation_id"); + + // Bilder deserialisieren + foreach ($arData[$k]['arVariation'] as $vari_id => $vari_data) + { + + $arData[$k]['arVariation'][$vari_id]['images'] = @unserialize($vari_data['images']); + + if (wpsg_isSizedString($arData[$k]['arVariation'][$vari_id]['images']['pic'])) $arData[$k]['arVariation'][$vari_id]['images']['pic'] = wpsg_trim(explode(',', $arData[$k]['arVariation'][$vari_id]['images']['pic'])); + else $arData[$k]['arVariation'][$vari_id]['images']['pic'] = array(); + + } } Index: /views/mods/mod_productvariants/productTemplate.phtml =================================================================== --- /views/mods/mod_productvariants/productTemplate.phtml (revision 6241) +++ /views/mods/mod_productvariants/productTemplate.phtml (revision 6242) @@ -4,5 +4,7 @@ * Integration der Variantenauswahl in die Produktverwaltung */ - + + die("VERALTETES TEMPLATE"); + ?> Index: /views/mods/mod_productvariants/produkt.phtml =================================================================== --- /views/mods/mod_productvariants/produkt.phtml (revision 6241) +++ /views/mods/mod_productvariants/produkt.phtml (revision 6242) @@ -4,95 +4,150 @@ * Template fÌr die Varianten wird vom Produkttemplate z.B. standard.phtml geladen */ - -<<<<<<< .mine - //die("Veraltet"); + +?> -||||||| .r6234 -======= - die("Veraltet"); - ->>>>>>> .r6240 -?> - - - -view['data']['vp_data']) && sizeof($this->view['data']['vp_data']) > 0) { ?> - - view['data']['vp_data'] as $k => $var) { - - $kk++; - //if ($var['active'] == "1") - { - - $vAktiv = true; ?> - -
- - - - - - - - - -
- - - - + + + + hasMod('wpsg_mod_produktbilder')) { ?> +
+ + $vari) { $kkv++; + if ($vari['active'] == '1' && (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0)) { ?> + + get_option('wpsg_vp_imageselect_width'); + $pbh = $this->get_option('wpsg_vp_imageselect_height'); + ?> + + + + + + +
+ + + + + $vari) { if ($vari['active'] == "1") { $j ++; ?> + hasMod('wpsg_mod_stock') || $vari['stock'] > 0 || $this->get_option('wpsg_mod_vp_showProduct') === '1') { ?> + - + + + + + + +
+ +
+
+ + + view['data']['vp_data'] as $k => $var) */ ?> + + + +