Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 5766) +++ /controller/wpsg_ShopController.class.php (revision 5767) @@ -1075,5 +1075,5 @@ public function renderProdukt($produkt_id, $force_template = false, $force_locale = false) { - + global $locale, $l10n; @@ -1111,6 +1111,11 @@ } - else $this->view['data'] = $this->loadProduktArray($produkt_id); - + else + { + + $this->view['data'] = $this->loadProduktArray($produkt_id); + + } + // Produkt, bei dem die EU Leistungsortregel gilt ? if (wpsg_isSizedInt($this->view['data']['euleistungsortregel'])) $this->showEULayer = true; @@ -1138,5 +1143,5 @@ if (!is_file($template_file)) { wpsg_debug(wpsg_translate(__('Das Template (#1#) fÃŒr ein Produkt (ID:#2#) scheint nicht zu existieren!', 'wpsg'), $template_file, $produkt_id)); return; } - // Den Index fÃŒr getTemplateIndex hochzählen + // Den Index fÃŒr getTemplateIndex hochzÀhlen wpsg_addSet($GLOBALS['wpsg_produkt_index'], 1); $this->view['product_index'] = $GLOBALS['wpsg_produkt_index']; @@ -1145,9 +1150,13 @@ else $myReferer = $this->view['data']['referer']; - $this->view['data']['product_key'] = $this->view['data']['id']; + if (!wpsg_isSizedString($this->view['data']['product_key'])) $this->view['data']['product_key'] = $this->view['data']['id']; + $this->view['data']['id'] = $this->getProduktId($this->view['data']['id']); - $this->view['oProduct'] = wpsg_product::getInstance($this->view['data']['id'], $this->view['data']); - + $this->view['oProduct'] = wpsg_product::getInstance($this->view['data']['id']); + $this->view['oProduct']->appendData($this->view['data']); + + if (wpsg_isSizedString($this->view['data']['product_key'])) $this->view['oProduct']->setProductKey($this->view['data']['product_key']); + $html = ''; $html .= '
'; @@ -1496,8 +1505,8 @@ } - + if ($this->getFrontendTaxview() == WPSG_BRUTTO) $produkt['preis'] = $produkt['preis_brutto']; else $produkt['preis'] = $produkt['preis_netto']; - + $produkt['min_preis'] = wpsg_tf($produkt['preis']); $produkt['max_preis'] = wpsg_tf($produkt['preis']); @@ -1546,5 +1555,5 @@ if ($produkt['preis_brutto'] < 0) $produkt['preis_brutto'] = 0; if ($produkt['preis_netto'] < 0) $produkt['preis_netto'] = 0; - + return $produkt; @@ -1679,4 +1688,5 @@ if (wpsg_isSizedInt($basket_data)) $produkt_id = $basket_data; else if (isset($basket_data['product_id'])) $produkt_id = $basket_data['product_id']; + else if (wpsg_isSizedString($basket_data)) $produkt_id = $this->getProduktID($basket_data); else $produkt_id = $this->getProduktID($basket_data['id']); @@ -1736,8 +1746,12 @@ if (is_numeric($produkt_key)) return $produkt_key; + else if (preg_match('/pv_(.*)/', $produkt_key)) + { + return preg_replace('/(pv_)|(\|(.*))/', '', $produkt_key); + } else if (preg_match('/vp_(.*)/', $produkt_key)) { return preg_replace('/(vp_)|(\/(.*))/', '', $produkt_key); - } + } else if (preg_match('/abo_\d+_\d+/', $produkt_key)) { @@ -3495,5 +3509,9 @@ if (wpsg_isSizedArray($arDebugOut)) wpsg_debug($arDebugOut); - die(wpsg_translate(__('Systemfehler! Fehlercode:#1#', 'wpsg'), $code)); + echo wpsg_translate(__('Systemfehler! Fehlercode:#1#', 'wpsg'), $code); + + debug_print_backtrace(); + + die(); } // public function throwErrorCode($code) Index: /lib/functions.inc.php =================================================================== --- /lib/functions.inc.php (revision 5766) +++ /lib/functions.inc.php (revision 5767) @@ -1041,8 +1041,8 @@ $oldValue = $strValue; - $strValue = strval($strValue); - $isset = true; - if (!isset($strValue) || !is_string($strValue)) $isset = false; + if (!isset($strValue)) return false; + if (gettype($strValue) != 'string') return false; + if (strlen($strValue) <= 0) $isset = false; Index: /lib/wpsg_basket.class.php =================================================================== --- /lib/wpsg_basket.class.php (revision 5766) +++ /lib/wpsg_basket.class.php (revision 5767) @@ -76,5 +76,5 @@ $product_data = $this->shop->cache->loadProduct($this->shop->getProduktId($produkt_key)); - + if ($product_data['basket_multiple'] == 1) { @@ -721,6 +721,6 @@ 'mwst_payment' => wpsg_tf(wpsg_getFloat($arBasket['payment']['preis_payment_brutto']) - wpsg_getFloat($arBasket['payment']['preis_payment_netto'])), 'mwst_shipping' => wpsg_tf(wpsg_getFloat($arBasket['shipping']['preis_shipping_brutto']) - wpsg_getFloat($arBasket['shipping']['preis_shipping_netto'])), - 'type_shipping' => wpsg_q($this->arCheckout['shipping']), - 'type_payment' => wpsg_q($this->arCheckout['payment']), + 'type_shipping' => wpsg_q(@$this->arCheckout['shipping']), + 'type_payment' => wpsg_q(@$this->arCheckout['payment']), 'custom_data' => array( 'basket' => $arBasket, Index: /model/wpsg_product.class.php =================================================================== --- /model/wpsg_product.class.php (revision 5766) +++ /model/wpsg_product.class.php (revision 5767) @@ -14,4 +14,6 @@ private $loadedData = array(); /* EnthÀlt die Daten, die ÃŒber den ShopController und die Module geladen / erweitert wurden */ + public $product_key = ""; + /** * LÀdt die Daten des Produkts @@ -48,12 +50,18 @@ } + $this->loadedData = $this->shop->loadProduktArray($product_id); + if ($this->data['id'] != $product_id) $this->shop->throwErrorCode('100_5', array('Gesuchte ID:'.$product_id, 'Gefundene ID:'.$this->data['id'])); - if (wpsg_isSizedArray($loadedData)) $this->loadedData = $loadedData; - else $this->loadedData = $this->shop->loadProduktArray($this->data['id']); - return true; } // public function load($product_id) + + public function appendData($arData) + { + + $this->loadedData = $arData; + + } // public function appendData($arData) public function delete() @@ -72,4 +80,14 @@ } // public function delete() + + /** + * Setzt den Produkt Key + */ + public function setProductKey($product_key) + { + + $this->product_key = $product_key; + + } // public function setProductKey($product_key) /** @@ -278,9 +296,9 @@ } - + if ($taxView === WPSG_BRUTTO) { - return $this->loadedData['preis_brutto']; + $price = $this->loadedData['preis_brutto']; } @@ -288,8 +306,10 @@ { - return $this->loadedData['preis_netto']; - - } - + $price = $this->loadedData['preis_netto']; + + } + + return $price; + } Index: /mods/wpsg_mod_basic.class.php =================================================================== --- /mods/wpsg_mod_basic.class.php (revision 5766) +++ /mods/wpsg_mod_basic.class.php (revision 5767) @@ -100,4 +100,7 @@ var $inline = false; + /** @var wpsg_ShopController */ + var $shop = false; + /** * Erstellt ein neues Modul @@ -129,4 +132,7 @@ /** Aufruf um eventuell das Erstellen der Bestellnummer zu beeinflussen */ public function buildONR(&$customer_id, &$order_id, &$onr_modul) { } + + /** Ermittlung des ProductKeys aus einem Request Array */ + public function getProductKeyFromRequest(&$product_key, $product_id, $form_data) {} /** */ @@ -598,5 +604,5 @@ /** Wird aufgerufen um Ausgaben zwischen und in ein Template einzubauen */ public function wp_head() { } - + /** * Wird von dem Produktgruppenmodul in der Sidebar der Produktgruppeneinstellungen aufgerufen Index: /mods/wpsg_mod_ordervars.class.php =================================================================== --- /mods/wpsg_mod_ordervars.class.php (revision 5766) +++ /mods/wpsg_mod_ordervars.class.php (revision 5767) @@ -250,5 +250,5 @@ { - $data['bvars'] = serialize($_SESSION['wpsg']['wpsg_mod_ordervars']); + $data['bvars'] = serialize(@$_SESSION['wpsg']['wpsg_mod_ordervars']); } Index: /mods/wpsg_mod_productvariants.class.php =================================================================== --- /mods/wpsg_mod_productvariants.class.php (revision 5766) +++ /mods/wpsg_mod_productvariants.class.php (revision 5767) @@ -41,5 +41,5 @@ } // public function __construct() - + public function install() { @@ -163,4 +163,47 @@ } // public function product_addedit_content(&$product_content, &$produkt_data) + public function template_redirect() + { + + if (wpsg_isSizedString($_REQUEST['action'], 'wpsg_productvariants_switch')) + { + + if (wpsg_isSizedInt($_REQUEST['wpsg_post_id'])) + { + + global $post; + $post = get_post($_REQUEST['wpsg_post_id']); + + } + + // Produkt Key nach der Auswahl bilden + parse_str($_REQUEST['form_data'], $form_data); + + $product_id = $this->shop->getProduktId($form_data['wpsg']['produkt_id']); + $product_key = ''; + + $this->getProductKeyFromRequest($product_key, $product_id, $form_data); + + $product_data = $this->shop->loadProduktArray($product_id, array( + 'id' => $product_key, + 'product_key' => $product_key, + 'menge' => $form_data['wpsg']['menge'], + 'referer' => $form_data['myReferer'] + )); + + // Damit das Div die gleiche Index Id bekommt + $GLOBALS['wpsg_produkt_index'] = $_REQUEST['product_index'] - 1; + + $this->shop->noReleatedProducts = true; + + if (wpsg_isSizedString($form_data['wpsg']['template'])) $template = $form_data['wpsg']['template']; + else $template = false; + + die($this->shop->renderProdukt($product_data, $template)); + + } + + } // public function template_redirect() + public function loadProduktArray(&$product_data) { @@ -172,5 +215,11 @@ // Default Kombination setzen - if (!isset($product_data['product_key']) || is_numeric($product_data['product_key'])) + if (preg_match('/^pv_/', $product_data['id'])) + { + + $product_data['product_key'] = $product_data['id']; + + } + else if (!isset($product_data['product_key']) || is_numeric($product_data['product_key'])) { @@ -184,28 +233,31 @@ } - $strDefaultKey = 'pv|'.implode('|', $arDefaultKey); + $strDefaultKey = 'pv_'.$product_data['id'].'|'.implode('|', $arDefaultKey); $product_data['product_key'] = $strDefaultKey; + $product_data['id'] = $strDefaultKey; } - // Preise fÃŒr die Varianten berechnen + // Preise fÃŒr die Varianten berechnen + + $product_data['preis_netto_preVariants'] = $product_data['preis_netto']; + $product_data['preis_brutto_preVariants'] = $product_data['preis_brutto']; + if ($this->shop->getBackendTaxView() === WPSG_BRUTTO) { - - $product_data['preis_brutto_preVariants'] = $product_data['preis_brutto']; + $product_data['preis_brutto'] = $this->calculateVariantsPrice($product_data['preis_brutto'], $product_data['arVariant'], $product_data['product_key']); - $product_data['preis_netto'] = wpsg_calculatePreis($product_data['preis_brutto'], WPSG_BRUTTO, 'mwst_value'); - + $product_data['preis_netto'] = wpsg_calculatePreis($product_data['preis_brutto'], WPSG_NETTO, $product_data['mwst_value']); + } else { - - $product_data['preis_netto_preVariants'] = $product_data['preis_netto']; + $product_data['preis_netto'] = $this->calculateVariantsPrice($product_data['preis_netto'], $product_data['arVariant'], $product_data['product_key']); - $product_data['preis_brutto'] = wpsg_calculatePreis($product_data['preis_netto'], WPSG_NETTO, 'mwst_value'); - + $product_data['preis_brutto'] = wpsg_calculatePreis($product_data['preis_netto'], WPSG_BRUTTO, $product_data['mwst_value']); + } - + $product_data['preis_preVariants'] = $product_data['preis']; @@ -227,7 +279,30 @@ } // public function loadProduktArray(&$produkt_data) - + + public function getProductKeyFromRequest(&$product_key, $product_id, $form_data) + { + + 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']); + + } // public function getProductKeyFromRequest($product_id, $form_data) + /* Modulfunktionen */ - + + /** + * PrÃŒft ob das Produkt ein Variantenprodukt ist oder nicht + */ + public function isVariantsProduct($product_id) + { + + $product_data['arVariant'] = $this->getVariants($product_id, true, true, true); + + if (wpsg_isSizedArray($product_data['arVariant'])) return true; + else return false; + + } // public function isVariantsProduct($product_id) + /** * Integration in das Produkttemplate @@ -236,26 +311,46 @@ { - $arVariants = $this->getVariants($product_data['product_id'], true, true, true); - - $this->shop->view['wpsg_mod_productvariants']['arVariants'] = $arVariants; - + if (!wpsg_isSizedArray($product_data['arVariant'])) return; + + $this->shop->view['wpsg_mod_productvariants']['product_id'] = $product_data['product_id']; + $this->shop->view['wpsg_mod_productvariants']['arVariants'] = $product_data['arVariant']; + $this->shop->view['wpsg_mod_productvariants']['product_variants'] = $this->explodeProductKey($product_data['product_key']); + $this->shop->render(WPSG_PATH_VIEW.'mods/mod_productvariants/productTemplate.phtml'); } // public function productTemplate($product_key) - + + /** + * Gibt einene SchlÃŒssel => Wert Array der Produktvarianten zurÃŒck + * Anhand des ProduktschlÃŒssels z.B. pv|4:6|1:8|6:11|5:10 + */ + public function explodeProductKey($product_key) + { + + $arKey = explode('|', $product_key); + $arReturn = array(); + + for ($i = 1; $i < sizeof($arKey); $i ++) + { + + $arKeyValue = explode(':', $arKey[$i]); + $arReturn[$arKeyValue[0]] = $arKeyValue[1]; + + } + + return $arReturn; + + } // public function explodeProductKey($product_key) + private function calculateVariantsPrice($price, $arVariant, $product_key) { - - $product_key = substr($product_key, 3); - - $arKeyVariant = explode('|', $product_key); - - foreach ($arKeyVariant as $variant_key) - { - - list($variant_id, $variation_id) = explode(':', $variant_key); - + + $arProductVariant = $this->explodeProductKey($product_key); + + foreach ($arProductVariant as $variant_id => $variation_id) + { + $price += $arVariant[$variant_id]['arVariation'][$variation_id]['price']; - + } @@ -707,6 +802,6 @@ return $arData; - } // public function getVariants() - + } + } // class wpsg_mod_productvariants extends wpsg_mod_basic Index: /mods/wpsg_mod_trustedshops.class.php =================================================================== --- /mods/wpsg_mod_trustedshops.class.php (revision 5766) +++ /mods/wpsg_mod_trustedshops.class.php (revision 5767) @@ -276,5 +276,5 @@ { - if ($arBasket['checkout']['wpsg_mod_trustedshops_set'] == '1') + if (wpsg_isSizedInt($arBasket['checkout']['wpsg_mod_trustedshops_set'])) { Index: /views/js/editable.js =================================================================== --- /views/js/editable.js (revision 5766) +++ /views/js/editable.js (revision 5767) @@ -29,8 +29,21 @@ { + var ar = []; + var arData = jQuery.parseJSON(options.data); + var strValue = jQuery(this).html(); + var value = 0; + + for (var i in arData) + { + + ar.push( { 'value': i, 'text': arData[i] } ); + if (arData[i] == strValue) value = i; + + } + // Normale Übergabe eines JSON Strings - opt.source = jQuery.parseJSON(options.data); + opt.source = ar; opt.type = 'select'; - opt.value = options.value; + opt.value = value; } Index: /views/mods/mod_productvariants/frontend.js =================================================================== --- /views/mods/mod_productvariants/frontend.js (revision 5766) +++ /views/mods/mod_productvariants/frontend.js (revision 5767) @@ -0,0 +1,25 @@ + + function wpsg_mod_productvariants_reload(event) + { + + var product_index = jQuery(event.target).parents('.wpsg_mod_productvariants_product_wrap').attr('wpsg-productindex'); + + //jQuery('#wpsg_produktform_' + product_index).append('
' + wpsg_ajax.label_pleasewait + '
'); + + 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(), + 'form_data': jQuery('#wpsg_produktform_' + product_index).serialize(), + 'product_index': product_index + }, + 'success': function(data) { + + jQuery('#wpsg_produktform_' + product_index).replaceWith(data); + + } + } ); + + } // function wpsg_mod_productvariants_reload(event) Index: /views/mods/mod_productvariants/productTemplate.phtml =================================================================== --- /views/mods/mod_productvariants/productTemplate.phtml (revision 5766) +++ /views/mods/mod_productvariants/productTemplate.phtml (revision 5767) @@ -4,16 +4,48 @@ * Integration der Variantenauswahl in die Produktverwaltung */ - + ?> -
+
view['wpsg_mod_productvariants']['arVariants'] as $var) { ?> -
+
"> + + + + + + + + + + + + + +
+ + +
Index: /views/produkt/addedit_price.phtml =================================================================== --- /views/produkt/addedit_price.phtml (revision 5766) +++ /views/produkt/addedit_price.phtml (revision 5767) @@ -3,5 +3,5 @@ getBackendTaxview() === WPSG_NETTO)?'NETTO':'BRUTTO')), wpsg_ff($this->view['data']['preis'])); ?> getBackendTaxview() === WPSG_NETTO)?'NETTO':'BRUTTO')), wpsg_ff($this->view['data']['oldprice'])); ?> - view['data']['tax_sum_value'], $this->get_option('wpsg_currency')).' / '.$this->getDefaultCountry()->kuerzel, array('text' => true)); ?> + view['data']['tax_sum_value'], $this->get_option('wpsg_currency')).' / '.$this->getDefaultCountry()->kuerzel, array('text' => true)); ?> view['data']['euleistungsortregel'], array('fullrow' => true, 'help' => 'EU-Leistungsortregel')); ?>