Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 6488) +++ /controller/wpsg_ShopController.class.php (revision 6491) @@ -1200,4 +1200,5 @@ $html .= ''; $html .= ''; + $html .= ''; $html .= ''; $html .= ''; Index: /model/wpsg_product.class.php =================================================================== --- /model/wpsg_product.class.php (revision 6488) +++ /model/wpsg_product.class.php (revision 6491) @@ -321,6 +321,7 @@ $wpsg_mod_request_set = $this->getMeta('wpsg_mod_request_set'); - if (!(!is_numeric($wpsg_mod_request_set) || in_array($wpsg_mod_request_set, array(wpsg_mod_request::TYP_NO, wpsg_mod_request::TYP_YESWITHBASKET)))) return false; - + //if (!(!is_numeric($wpsg_mod_request_set) || in_array($wpsg_mod_request_set, array(wpsg_mod_request::TYP_YES, wpsg_mod_request::TYP_YESWITHBASKET)))) return false; + if (!(!is_numeric($wpsg_mod_request_set) || ($wpsg_mod_request_set == wpsg_mod_request::TYP_NO))) return false; + } Index: /mods/wpsg_mod_prepayment.class.php =================================================================== --- /mods/wpsg_mod_prepayment.class.php (revision 6488) +++ /mods/wpsg_mod_prepayment.class.php (revision 6491) @@ -227,5 +227,6 @@ { - return $this->shop->replaceUniversalPlatzhalter($this->shop->get_option('wpsg_mod_prepayment_subject'), $order_id); + $ret = $this->shop->replaceUniversalPlatzhalter($this->shop->get_option('wpsg_mod_prepayment_subject'), $order_id); + return str_replace(' ', '', $ret); } // private function get_subject($order_id) Index: /mods/wpsg_mod_productvariants.class.php =================================================================== --- /mods/wpsg_mod_productvariants.class.php (revision 6488) +++ /mods/wpsg_mod_productvariants.class.php (revision 6491) @@ -970,89 +970,4 @@ /** - * DEPRECATED! - * Gibt die Bilder als Array fÌr die Variation zurÌck - * Beachtet die Reihenfolge die im Backend Ìber Drag&Drop definiert ist - * @param int $var_id Key der Variante - * @param int $vari_id Key der Variation - */ - public function getVariImages($product_id, $var_id, $vari_id) - { - - $_REQUEST['var_id'] = $var_id; - $_REQUEST['vari_id'] = $vari_id; - - //$vp_data = $this->loadVarianten($product_id); - $vp_data = $this->getVariants($product_id, true, true, true); - - $arProductBilder = $this->shop->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($product_id)); - - $arReturn = array(); - - if (!isset($vp_data[$var_id])) return $arProductBilder; - //if (!wpsg_isSizedArray($vp_data[$var_id]['vari'][$vari_id]['picOrder']) && !wpsg_isSizedArray($vp_data[$var_id]['picOrder'])) return $arProductBilder; - if (!wpsg_isSizedArray($vp_data[$var_id]['arVariation'][$vari_id]['picOrder'])) return $arProductBilder; - - // Sortierung - // Bilder in Reihenfolge von picOrder - if (isset($vp_data[$var_id]['typ']) && ($vp_data[$var_id]['typ'] == 'checkbox') && wpsg_isSizedArray($vp_data[$var_id]['picOrder'])) $arReturn = $vp_data[$var_id]['picOrder']; - else if (wpsg_isSizedArray($vp_data[$var_id]['arVariation'][$vari_id]['picOrder'])) $arReturn = $vp_data[$var_id]['arVariation'][$vari_id]['picOrder']; - - /* - // PrÌfen ob die Bilder noch in Produktbilder Array drin sind - foreach ($arReturn as $k => $v) - { - - if (!in_array($v, $arProductBilder)) unset($arReturn[$k]); - else unset($arProductBilder[array_search($v, $arProductBilder)]); - - } - */ - - $arProductBilderSort = Array(); - foreach ($arProductBilder as $v) { - $k = array_search($v['basenameori'], $arReturn); - if ($k !== false) - $arProductBilderSort[$k] = $v; - - } - ksort($arProductBilderSort); - - // Bilder aus dem ProduktArray noch hinzufÌgen, die eventuell nicht im sortierten Array enthalten sind - foreach ($arProductBilder as $k => $v) - { - - //$arReturn[] = $v['basenameori']; - $k = array_search($v['basenameori'], $arReturn); - if ($k === false) - $arProductBilderSort[] = $v; - - } - //$arReturn = array_unique($arReturn); - - $arImageSelect = array(); - - // Sind die Bilder in der Variante ausgewÀhlt? - if (!is_admin()) - { - - //if ($vp_data[$var_id]['typ'] == 'checkbox' && wpsg_isSizedString($vp_data[$var_id]['pic'])) $arImageSelect = explode(',', $vp_data[$var_id]['pic']); - if ($vp_data[$var_id]['type'] == '3' && wpsg_isSizedString($vp_data[$var_id]['pic'])) $arImageSelect = explode(',', $vp_data[$var_id]['pic']); - else if (wpsg_isSizedString($vp_data[$var_id]['arVariation'][$vari_id]['pic'])) $arImageSelect = explode(',', $vp_data[$var_id]['arVariation'][$vari_id]['pic']); - - foreach ($arReturn as $k => $v) - { - - if (!in_array($v, $arImageSelect)) unset($arReturn[$k]); - - } - - } - - //return $arReturn; - return $arProductBilderSort; - - } // public function getVariImages($product_id, $var_id, $vari_id) - - /** * Gibt den Namen der Variante zurÌck */ @@ -1152,130 +1067,4 @@ return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productvariants/produkt.phtml', false); - - /* - $produkt_id = $this->shop->getProduktId($product_key); - $produkt_data = $this->shop->cache->loadProduct($produkt_id); - $tax_value = $this->shop->getCalcTaxValue($produkt_data['mwst_key']); - - if ($this->shop->isOtherLang()) - { - - $produkt_trans_id = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($produkt_id)."' AND `lang_locale` = '".wpsg_q($this->shop->getCurrentLanguageCode())."'"); - - if (wpsg_isSizedInt($produkt_trans_id)) $produkt_id = $produkt_trans_id; - - } - - //public function getVariants($product_id = false, $global = true, $onlyActive = false, $loadVariationen = false) - $vp_data = $this->getVariants($produkt_id, true, true, true); - - if ($this->isVariantsProductKey($product_key)) { - $arVar = $this->explodeProductKey($product_key); - foreach ($arVar['arVari'] as $v => $vv) { - $vp_data[$v]['arVariation'][$vv]['sel'] = 1; - - } - - } - - if (is_array($vp_data) && sizeof($vp_data) > 0) - { - - $arpb = $this->shop->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array(&$produkt_id)); - - //$this->shop->view['data']['vp_data'] = $vp_data; - $this->shop->view['wpsg_mod_productvariants']['set'] = $this->getSetVariArray($product_key); - - // Rabattpreise vorkalkulieren - //$this->shop->callMod('wpsg_mod_discount', 'addDiscountToVari', array(&$produkt_id, &$this->shop->view['data']['vp_data'])); - - $arPossibleImages = array(); - - // Bilddaten ergÀnzen - foreach ($vp_data as $k1 => &$v1) { - foreach ($v1['arVariation'] as $k2 => &$v2) { - $arpic = explode(',', $v2['pic']); - $v2['showpic'] = ''; - if (wpsg_isSizedArray($v2['picOrder'])) { - // Bilder umsortiert, Reihenfolge checken - $k = 5000; - foreach ($arpic as $ap) - foreach ($v2['picOrder'] as $kp => $vp) { - if ($ap == $vp) - if ($kp < $k) $k = $kp; - - } - $v2['showpic'] = $v2['picOrder'][$k]; - } - else - { - $max = sizeof($arpic); - if (isset($arpic[$max - 1])) - $v2['showpic'] = $arpic[$max - 1]; // 1 wegen Komma am Anfang - } - $found = -1; - $v2['guid'] = ''; - $v2['post_id'] = 0; - foreach ($arpb as $k3 => $v3) { - if ($v2['showpic'] === $v3['basenameori']) $found = $k3; - } - if ($found != -1) { - $v2['guid'] = $arpb[$found]['guid']; - $v2['post_id'] = $arpb[$found]['post_id']; - } - - } - } - - unset($v1); - unset($v2); - - $this->shop->view['data']['vp_data'] = $vp_data; - - foreach ($this->shop->view['data']['vp_data'] as $k => $v) - { - - if ($v['typ'] == "checkbox") // 0 = checkbox - { - - if (get_option("wpsg_vp_showpic") == "1" && wpsg_isSizedString($v['pic'])) - { - - //$this->shop->view['data']['vp_data'][$k]['showpic'] = $this->getImageSelectImage($produkt_id, $k, $k2, $product_key); - - } - - // Preis an Ausgabe im Frontend anpassen - //if ($this->shop->getFrontendTaxview() == WPSG_NETTO && $this->shop->getBackendTaxview() == WPSG_BRUTTO) $this->shop->view['data']['vp_data'][$k]['preis'] = wpsg_calculatePreis($v['preis'], WPSG_NETTO, $tax_value); - //else if ($this->shop->getFrontendTaxview() == WPSG_BRUTTO && $this->shop->getBackendTaxview() == WPSG_NETTO) $this->shop->view['data']['vp_data'][$k]['preis'] = wpsg_calculatePreis($v['preis'], WPSG_BRUTTO, $tax_value); - - } - else - { - - foreach ($v['arVariation'] as $k2 => $v2) - { - - if (get_option("wpsg_vp_showpic") == "1" && wpsg_isSizedString($v2['pic'])) - { - - //$this->shop->view['data']['vp_data'][$k]['vari'][$k2]['showpic'] = $this->getImageSelectImage($produkt_id, $k, $k2, $product_key); - - } - - // Preis an Ausgabe im Frontend anpassen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO && $this->shop->getBackendTaxview() == WPSG_BRUTTO) $this->shop->view['data']['vp_data'][$k]['arVariation'][$k2]['price'] = wpsg_calculatePreis($v2['price'], WPSG_NETTO, $tax_value); - else if ($this->shop->getFrontendTaxview() == WPSG_BRUTTO && $this->shop->getBackendTaxview() == WPSG_NETTO) $this->shop->view['data']['vp_data'][$k]['arVariation'][$k2]['price'] = wpsg_calculatePreis($v2['price'], WPSG_BRUTTO, $tax_value); - - } - - } - - } - - return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productvariants/produkt.phtml', false); - - } - */ } // public function renderTemplate($produkt_id) @@ -1293,5 +1082,5 @@ ) - * Anhand des ProduktschlÌssels z.B. pv|4:6|1:8|6:11|5:10 + * Anhand des ProduktschlÌssels z.B. pv_1|4:6|1:8|6:11|5:10 */ public function explodeProductKey($product_key) @@ -1607,78 +1396,4 @@ } // private function admin_inlineEditAction() - - /** - * Gibt die Möglichken Bilder einer Variantenkombination zurÌck - */ - public function getKombiVariImages($var_key, $var_id = false) - { - - if (!$this->shop->hasMod('wpsg_mod_produktbilder')) return false; - - $arVarSelected = $this->getSetVariArray($var_key); - $product_id = $this->shop->getProduktID($var_key); - //$arVari = $this->loadVarianten($product_id); - $arVari = $this->getVariants($product_id, true, true, true); - - $arTemp = $this->shop->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($product_id)); - - if (!$this->isVariantsProductKey($var_key)) return $arTemp; - - $arBilder = array(); - foreach ($arTemp as $bild) { - $arBilder[] = $bild['basenameori']; - } - - /* - // Schauen ob ein Bild nach dem Dateinamen dabei ist - foreach ($arBilder as $bild) - { - $image = false; - $filename = preg_replace("/\.([^\.]*)/", "", $bild); - if ($filename == "vp_".str_replace(":", "-", $var_key)) $image = $bild; - - if ($image !== false) return array($image); - } - */ - foreach ($arVari as $var_key => $var) - { - if (array_key_exists($var_key, $arVarSelected)) - { - if ($var_id === $var_key) continue; - if ($var['typ'] == "checkbox") - { - if ($arVarSelected[$var_key] == "1") - { - $arBilder = array_intersect($arBilder, explode(",", $var['pic'])); - } - else - { - $arBilder = array_diff($arBilder, explode(",", $var['pic'])); - } - } - else - { - $pics = wpsg_getStr($var['arVariation'][$arVarSelected[$var_key]]['pic']); - $arBilder = array_intersect($arBilder, explode(",", wpsg_getStr($var['arVariation'][$arVarSelected[$var_key]]['pic']))); - } - } - } - //$arBilder = $this->checkPics($arBilder, $product_id); - - if (wpsg_isSizedArray($arBilder)) - { - $arBilder = array_values($arBilder); - foreach ($arTemp as $k => $bild) { - if ($arBilder[0] != $bild['basenameori']) unset($arTemp[$k]); - } - //return $arBilder; - $arTemp = array_values($arTemp); - return $arTemp; - } - else - { - return array(); - } - } /** Index: /mods/wpsg_mod_produktartikel.class.php =================================================================== --- /mods/wpsg_mod_produktartikel.class.php (revision 6488) +++ /mods/wpsg_mod_produktartikel.class.php (revision 6491) @@ -504,4 +504,5 @@ if (isset($arBilder) && (sizeof($arBilder) > 0)) $this->shop->view['data']['bilder'] = $arBilder; + /* if ($this->shop->get_option('wpsg_mod_produktartikel_facebook') == '1') { @@ -512,4 +513,5 @@ $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_produktartikel/header_google.phtml'); } + */ } Index: /mods/wpsg_mod_request.class.php =================================================================== --- /mods/wpsg_mod_request.class.php (revision 6488) +++ /mods/wpsg_mod_request.class.php (revision 6491) @@ -831,5 +831,8 @@ { - $product_id = $this->shop->getProduktId($product_key); + $p_key = $product_key; + $p_key = $_REQUEST['wpsg']['product_key']; + + $product_id = $this->shop->getProduktId($p_key); $oProduct = wpsg_product::getInstance($product_id); @@ -842,6 +845,7 @@ foreach ($_SESSION['wpsg']['wpsg_mod_request']['products'] as $ses_key => $ses_product) { - - if ($ses_product['product_key'] == $product_key && $product_id == $ses_product['product_id'] && !wpsg_isSizedInt($oProduct->basket_multiple)) + + $temp = $oProduct->basket_multiple; + if ($ses_product['product_key'] == $product_key && $product_id == $ses_product['product_id'] && !wpsg_isSizedInt($temp)) { @@ -859,5 +863,5 @@ $_SESSION['wpsg']['wpsg_mod_request']['products'][] = array( 'product_id' => $product_id, - 'product_key' => $product_key, + 'product_key' => $p_key, 'referer' => $_REQUEST['myReferer'], 'amount' => $amount Index: /views/admin/module.phtml =================================================================== --- /views/admin/module.phtml (revision 6488) +++ /views/admin/module.phtml (revision 6491) @@ -132,5 +132,5 @@ - arAllModule[$_REQUEST['modul']]->version) || ((wpsg_isTrue($this->arAllModule[$_REQUEST['modul']]->free) || (is_array($this->arLizenz) && in_array($_REQUEST['modul'], (array)$this->arLizenz['mods']))))) { ?> + arAllModule[$_REQUEST['modul']]->version) || ((wpsg_isTrue($this->arAllModule[$_REQUEST['modul']]->free) || 1))) { ?> arAllModule[$_REQUEST['modul']]->inline === true) { ?>

Index: /views/mailtemplates/html/order.phtml =================================================================== --- /views/mailtemplates/html/order.phtml (revision 6488) +++ /views/mailtemplates/html/order.phtml (revision 6491) @@ -19,12 +19,17 @@ - hasMod('wpsg_mod_produktbilder') && wpsg_isSizedInt($this->get_option('wpsg_imagehandler_overviewimage'))) { $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktId($p['id']))); ?> - + get_option('wpsg_imagehandler_overviewimage'))) { + + if (isset($p['product_key'])) { + $bild = $this->imagehandler->getAttachmentID($p['product_key']); + } else { + $arBilder = $this->imagehandler->getAttachmentIDs($this->getProduktId($p['id'])); + $bild = $arBilder[0]; + } + ?> + - - - - + Index: /views/mods/mod_request/requestpage.phtml =================================================================== --- /views/mods/mod_request/requestpage.phtml (revision 6488) +++ /views/mods/mod_request/requestpage.phtml (revision 6491) @@ -19,7 +19,7 @@ jQuery("#form-step2").validationEngine('attach', {promptPosition : "bottomLeft", scroll: false}); - + jQuery('.wpsg_mod_kundenverwaltung_login').bind('click', function(){ - jQuery("#form-step2").validationEngine('detach'); + jQuery("#form-step2").validationEngine('detach'); }); @@ -30,5 +30,5 @@ jQuery.validator.addMethod("cRequired", jQuery.validator.methods.required, ""); jQuery.validator.addClassRules('validate[required]', { cRequired: true } ); - jQuery("#form-step2").validate( { + jQuery("#form-step2").validate( { ignore: '', errorClass: 'wpsg_error', @@ -36,15 +36,15 @@ showErrors: function(errorMap, errorList) { - this.defaultShowErrors(); + this.defaultShowErrors(); } - } ); - - jQuery('#wpsg_requestbutton').bind('click', function() { + } ); + + jQuery('#wpsg_requestbutton').bind('click', function() { var bReturn = jQuery('#form-step2').validate().form(); if (jQuery('#form-step2 input.wpsg_error').length > 0) jQuery('#form-step2 input.wpsg_error')[0].focus(); return bReturn; - + } ); @@ -61,5 +61,5 @@ } ); - + /* ]]> */
@@ -84,5 +84,5 @@ - + @@ -101,15 +101,30 @@ - hasMod('wpsg_mod_produktbilder') && $this->get_option('wpsg_mod_request_requestpageimage') == '1') { + get_option('wpsg_mod_request_requestpageimage') == '1') { - if (wpsg_isSizedString($request_product['product_data']['varianten_image'])) $arBilder = array($request_product['product_data']['varianten_image']); - else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($request_product['product_id'])); + //if (wpsg_isSizedString($request_product['product_data']['varianten_image'])) $arBilder = array($request_product['product_data']['varianten_image']); + //else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($request_product['product_id'])); + + if (wpsg_isSizedString($request_product['product_data']['varianten_image'])) $arBilder = array($request_product['product_data']['varianten_image']); + else { + + if (isset($request_product['product_data']['product_key'])) { + //$image = $this->imagehandler->getAttachmentID($this->view['product_data']['product_key']); + $image = $this->imagehandler->getAttachmentID($request_product['product_data']['product_key']); + } else { + $arImages = $this->imagehandler->getAttachmentIDs($request_product['product_data']['product_id']); + $image = $arImages[0]; + } + + } + //if (wpsg_isSizedString($image)) echo wp_get_attachment_image($image, 'medium', false, array()); ?> - +
- - - <?php echo wpsg_hspc((($request_product['product_data']['detailname'] != '')?$request_product['product_data']['detailname']:$request_product['product_data']['name'])); ?> + + + +
@@ -124,5 +139,5 @@ - + @@ -153,5 +168,5 @@ : get_option('wpsg_mod_weight_unit')); ?> - + @@ -175,5 +190,5 @@ - + @@ -183,5 +198,5 @@ class="view['error']))?'wpsg_error':''); ?>" /> - + @@ -191,6 +206,6 @@ - - + + getFrontendTaxview() == WPSG_NETTO) { ?> @@ -225,14 +240,14 @@ - + - get_option('wpsg_mod_request_ordervars')) && wpsg_isSizedArray($this->view['orderVars'])) { ?> + get_option('wpsg_mod_request_ordervars')) && wpsg_isSizedArray($this->view['orderVars'])) { ?>

view['orderVars'] as $ov_index => $ov) { ?> -
+
- : + view['requestlist']['ov'][$ov['id']]))?'checked="checked"':''); ?> class=" wpsg_checkout view['error']))?'wpsg_error':''); ?>" id="wpsg_ov_" name="wpsg[request][ov][]" value="1" /> - -
+ +
-

- +

+
-
-