Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 5519) +++ /controller/wpsg_ShopController.class.php (revision 5521) @@ -1508,5 +1508,5 @@ } - + // Artikelnummer $produkt['anr'] = $this->getProductAnr($produkt['id']); Index: /lib/functions.inc.php =================================================================== --- /lib/functions.inc.php (revision 5519) +++ /lib/functions.inc.php (revision 5521) @@ -90,4 +90,16 @@ } // function wpsg_isValidEMail($val) + + /** + * Definiert eine Konstante, wenn Sie noch nicht definiert wurde + * @param unknown $name + * @param unknown $value + */ + function wpsg_define($name, $value) + { + + if (!defined($name)) define($name, $value); + + } // function wpsg_define($name, $value) /** Index: /model/wpsg_product.class.php =================================================================== --- /model/wpsg_product.class.php (revision 5519) +++ /model/wpsg_product.class.php (revision 5521) @@ -288,4 +288,50 @@ /* Statische Funktionen */ + public static function findMaxPrice($arFilter = array()) + { + + list($strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter); + + $strQuery = " + SELECT + MAX(P.`preis`) + FROM + `".WPSG_TBL_PRODUCTS."` AS P + ".$strQueryJOIN." + WHERE + 1 + ".$strQueryWHERE." + HAVING + 1 + ".$strQueryHAVING." + "; + + return $GLOBALS['wpsg_db']->fetchOne($strQuery); + + } + + public static function findMinPrice($arFilter = array()) + { + + list($strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter); + + $strQuery = " + SELECT + MIN(P.`preis`) + FROM + `".WPSG_TBL_PRODUCTS."` AS P + ".$strQueryJOIN." + WHERE + 1 + ".$strQueryWHERE." + HAVING + 1 + ".$strQueryHAVING." + "; + + return $GLOBALS['wpsg_db']->fetchOne($strQuery); + + } // public static function getMinPrice($arFilter = array()) + public static function find($arFilter = array(), $load = true) { @@ -310,5 +356,5 @@ ".$strQueryORDER." "; - + $arID = $GLOBALS['wpsg_db']->fetchAssocField($strQuery); $arReturn = array(); @@ -328,10 +374,14 @@ public static function getQueryParts($arFilter = array()) { - + $strQueryWHERE = ""; $strQueryJOIN = ""; $strQueryHAVING = ""; - $strQueryORDER = " P.`cdate` ASC "; - + $strQueryORDER = ""; + + if (wpsg_isSizedString($arFilter['order_col'])) $strQueryORDER .= " ".$arFilter['order_col']." "; + if (wpsg_isSizedString($arFilter['order_direction'])) $strQueryORDER .= $arFilter['order_direction']; + if (!wpsg_isSizedString($strQueryORDER)) $strQueryORDER = " P.`cdate` ASC "; + if (wpsg_isSizedArray($arFilter['product_ids'])) $strQueryWHERE .= " AND P.`id` IN (".wpsg_q(implode(',', $arFilter['product_ids'])).") "; if (wpsg_isSizedArray($arFilter['productgroup_ids'])) $strQueryWHERE .= " AND P.`pgruppe` IN (".wpsg_q(implode(',', $arFilter['productgroup_ids'])).") "; @@ -339,12 +389,44 @@ if (wpsg_isSizedString($arFilter['price_max'])) $strQueryWHERE .= " AND P.`preis` <= '".wpsg_q($arFilter['price_max'])."' "; - if (wpsg_isSizedArray($arFilter['cat_ids'])) + if (wpsg_isSizedArray($arFilter['cat_ids']) && $GLOBALS['wpsg_sc']->hasMod('wpsg_mod_produktartikel')) { $strQueryJOIN .= " LEFT JOIN `".wpsg_q($GLOBALS['wpsg_sc']->prefix.'posts')."` AS POST ON (POST.`wpsg_produkt_id` = P.`id`) "; $strQueryJOIN .= " LEFT JOIN `".wpsg_q($GLOBALS['wpsg_sc']->prefix.'term_relationships')."` AS PCAT ON (POST.`ID` = PCAT.`object_id`) "; - + $strQueryWHERE .= " AND PCAT.`term_taxonomy_id` IN (".wpsg_q(implode(',', $arFilter['cat_ids'])).") "; + } + + if (wpsg_isSizedArray($arFilter['variants'])) + { + + foreach (wpsg_trim($arFilter['variants']) as $variant_id => $variation_id) + { + + $in = wpsg_q($variant_id); + $strQueryJOIN .= " RIGHT JOIN `".WPSG_TBL_PRODUCTS_VARIATION."` AS PVI".$in." ON (PVI".$in.".`product_id` = P.`id` AND PVI".$in.".`variation_id` IN (".wpsg_q($variation_id).") AND PVI".$in.".`active` = '1') "; + + } + + } + + if (wpsg_isSizedArray($arFilter['attributs'])) + { + + foreach ($arFilter['attributs'] as $attribut_id => $attribut_value) + { + + $in = wpsg_q($attribut_id); + $arValues = wpsg_trim(explode(',', $attribut_value)); + + $strQueryJOIN_ATTRIBUTE_ON = " ( 0 "; + foreach ($arValues as $k => $value) $strQueryJOIN_ATTRIBUTE_ON .= " OR PA".$in.".`value` = '".wpsg_q($value)."' "; + $strQueryJOIN_ATTRIBUTE_ON .= " ) "; + + $strQueryJOIN .= " RIGHT JOIN `".WPSG_TBL_PRODUCTS_AT."` AS PA".$in." ON (PA".$in.".`p_id` = P.`id` AND PA".$in.".`a_id` = '".wpsg_q($attribut_id)."' AND ".$strQueryJOIN_ATTRIBUTE_ON.") "; + + } + } Index: /mods/wpsg_mod_discount.class.php =================================================================== --- /mods/wpsg_mod_discount.class.php (revision 5519) +++ /mods/wpsg_mod_discount.class.php (revision 5521) @@ -150,5 +150,5 @@ if (isset($_REQUEST['wpsg_lang'])) return; - $this->shop->view['wpsg_mod_discount']['data'] = explode("_", $produkt_data['rabatt']); + $this->shop->view['wpsg_mod_discount']['data'] = explode("_", $product_data['rabatt']); } Index: /mods/wpsg_mod_downloadplus.class.php =================================================================== --- /mods/wpsg_mod_downloadplus.class.php (revision 5519) +++ /mods/wpsg_mod_downloadplus.class.php (revision 5521) @@ -264,6 +264,5 @@ } // public function produkt_save(&$produkt_id) - - + /* * zeigt ein Upload-Formular im linken Bereich des Produktbackend an @@ -272,10 +271,10 @@ { if (isset($_REQUEST['wpsg_lang'])) return; - - if ($produkt_data['id'] > 0) - { - - $this->shop->view['data'] = $produkt_data; - $this->shop->view['filesList'] = $this->renderFilesList($produkt_data['id']); + + if ($product_data['id'] > 0) + { + + $this->shop->view['data'] = $product_data; + $this->shop->view['filesList'] = $this->renderFilesList($product_data['id']); } @@ -284,11 +283,10 @@ $product_content['wpsg_mod_downloadplus'] = array( - 'title' => __('DownloadPlus Produkt', 'wpsg'), - 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_downloadplus/produkt_addedit_sidebar.phtml', false) + 'title' => __('DownloadPlus Produkt', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_downloadplus/produkt_addedit_sidebar.phtml', false) ); } //public function product_addedit_content(&$product_content, &$product_data) - - + public function setOrderStatus($order_id, $status_id, $inform) { Index: /mods/wpsg_mod_downloadprodukte.class.php =================================================================== --- /mods/wpsg_mod_downloadprodukte.class.php (revision 5519) +++ /mods/wpsg_mod_downloadprodukte.class.php (revision 5521) @@ -81,7 +81,7 @@ { - $this->shop->view['data'] = $produkt_data; - $this->shop->view['prodFiles'] = $this->getProdFileListe($produkt_data['id']); - $this->shop->view['wpsg_mod_downloadprodukte']['path'] = str_replace('\\', '\\\\', $this->getFilePath($produkt_data['id'])); + $this->shop->view['data'] = $product_data; + $this->shop->view['prodFiles'] = $this->getProdFileListe($product_data['id']); + $this->shop->view['wpsg_mod_downloadprodukte']['path'] = str_replace('\\', '\\\\', $this->getFilePath($product_data['id'])); $this->shop->view['wpsg_mod_downloadprodukte']['data'] = $product_data; Index: /mods/wpsg_mod_productgroups.class.php =================================================================== --- /mods/wpsg_mod_productgroups.class.php (revision 5519) +++ /mods/wpsg_mod_productgroups.class.php (revision 5521) @@ -299,5 +299,5 @@ if (isset($_REQUEST['wpsg_lang'])) return; - $this->shop->view['wpsg_mod_productgroups']['produkt_data'] = $produkt_data; + $this->shop->view['wpsg_mod_productgroups']['produkt_data'] = $product_data; $this->shop->view['wpsg_mod_productgroups']['data'] = array(); $this->shop->view['wpsg_mod_productgroups']['data'][0] = __('Nicht zugewiesen.', 'wpsg'); @@ -316,14 +316,14 @@ $this->shop->view['wpsg_mod_productgroups']['data'] = array_diff_key($this->shop->view['wpsg_mod_productgroups']['data'], $groups_db) + $groups_db; - $sticky_data = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS_STICKY."` WHERE `produkt_id` = '".wpsg_q($produkt_data['id'])."'"); + $sticky_data = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS_STICKY."` WHERE `produkt_id` = '".wpsg_q($product_data['id'])."'"); if ($sticky_data['von'] > 0) $this->shop->view['wpsg_mod_productgroups']['sticky_von'] = date('d.m.Y', $sticky_data['von']); if ($sticky_data['bis'] > 0) $this->shop->view['wpsg_mod_productgroups']['sticky_bis'] = date('d.m.Y', $sticky_data['bis']);; - } - + } + $product_content['wpsg_mod_productgroups'] = array( - 'title' => __('Produktgruppen', 'wpsg'), - 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productgroups/produkt_addedit_sidebar.phtml', false) + 'title' => __('Produktgruppen', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productgroups/produkt_addedit_sidebar.phtml', false) ); Index: /mods/wpsg_mod_productvariants.class.php =================================================================== --- /mods/wpsg_mod_productvariants.class.php (revision 5519) +++ /mods/wpsg_mod_productvariants.class.php (revision 5521) @@ -26,5 +26,5 @@ self::$arTypeLabel = array( - self::TYPE_SELECT => __('anteilig', 'wpsg'), + self::TYPE_SELECT => __('Select Box', 'wpsg'), self::TYPE_RADIO => __('Radio Boxen', 'wpsg'), self::TYPE_IMAGE => __('Bilderauswahl', 'wpsg') @@ -35,8 +35,8 @@ $this->desc = __('Ermöglicht es zentral Varianten anzulegen und diese im Produkt zu aktivieren.', 'wpsg'); - define('WPSG_TBL_VARIANTS', $this->shop->prefix.'wpsg_variants'); - define('WPSG_TBL_VARIANTS_VARI', $this->shop->prefix.'wpsg_variants_vari'); - define('WPSG_TBL_PRODUCTS_VARIANT', $this->shop->prefix.'wpsg_products_variant'); - define('WPSG_TBL_PRODUCTS_VARIATION', $this->shop->prefix.'wpsg_products_variation'); + wpsg_define('WPSG_TBL_VARIANTS', $this->shop->prefix.'wpsg_variants'); + wpsg_define('WPSG_TBL_VARIANTS_VARI', $this->shop->prefix.'wpsg_variants_vari'); + wpsg_define('WPSG_TBL_PRODUCTS_VARIANT', $this->shop->prefix.'wpsg_products_variant'); + wpsg_define('WPSG_TBL_PRODUCTS_VARIATION', $this->shop->prefix.'wpsg_products_variation'); } // public function __construct() @@ -64,5 +64,6 @@ variant_id int(11) NOT NULL, name varchar(255) NOT NULL, - + shortname varchar(255) NOT NULL, + anr varchar(255) NOT NULL, price double(10,2) NOT NULL, @@ -131,5 +132,5 @@ public function product_addedit_content(&$product_content, &$product_data) { - + // Wenn eine Übersetzung bearbeitet wird, dann nichts machen if (isset($_REQUEST['wpsg_lang'])) return; @@ -141,5 +142,5 @@ } - + $product_content['wpsg_mod_productvariants'] = array( 'title' => __('Produktvarianten', 'wpsg'), @@ -323,4 +324,10 @@ } + else if (wpsg_isSizedString($_REQUEST['field'], 'vari_shortname')) + { + + $this->db->UpdateQuery(WPSG_TBL_VARIANTS_VARI, array('shortname' => wpsg_q($_REQUEST['value'])), " `id` = '".wpsg_q($_REQUEST['field_id'])."' "); + + } else if (wpsg_isSizedString($_REQUEST['field'], 'vari_pos')) { @@ -357,21 +364,34 @@ * @param Integer $variant_id ID der Variante */ - public function getVariationOfVariant($variant_id, $product_id = false) - { - + public function getVariationOfVariant($variant_id, $product_id = false, $arProductFilter = array()) + { + $strQuerySELECT = ""; $strQueryJOIN = ""; - - if (wpsg_isSizedInt($product_id)) - { - + $strQueryWHERE = ""; + + if (wpsg_isSizedArray($arProductFilter)) + { + + list($strQueryP_WHERE, $strQueryP_JOIN, $strQueryP_HAVING, $strQueryP_ORDER) = wpsg_product::getQueryParts($arProductFilter); + + $strQueryJOIN .= " LEFT JOIN `".WPSG_TBL_PRODUCTS_VARIATION."` AS PV ON (PV.`variation_id` = VI.`id`) "; + $strQueryJOIN .= " LEFT JOIN `".WPSG_TBL_PRODUCTS."` AS P ON (P.`id` = PV.`product_id`) "; + + $strQueryJOIN .= $strQueryP_JOIN; + $strQueryWHERE .= $strQueryP_WHERE; + + } + else if (wpsg_isSizedInt($product_id)) + { + $strQueryJOIN .= " LEFT JOIN `".WPSG_TBL_PRODUCTS_VARIATION."` AS PV ON (PV.`variation_id` = VI.`id` AND PV.`product_id` = '".wpsg_q($product_id)."') "; $strQuerySELECT .= " , PV.`active`, PV.`anr`, PV.`price`, PV.`stock`, PV.`images` "; - - } - - $arVari = $this->db->fetchAssoc(" + + } + + $strQuery = " SELECT - VI.`id`, VI.`name`, VI.`deleted`, VI.`pos` + VI.`id`, VI.`name`, VI.`shortname`, VI.`deleted`, VI.`pos` ".$strQuerySELECT." FROM @@ -381,7 +401,12 @@ VI.`variant_id` = '".wpsg_q($variant_id)."' AND VI.`deleted` != '1' + ".$strQueryWHERE." + GROUP BY + VI.`id` ORDER BY VI.`pos` - "); + "; + + $arVari = $this->db->fetchAssoc($strQuery); // TODO: Übersetzung @@ -395,8 +420,12 @@ * @param unknown $variant_id */ - public function getVariant($variant_id) - { - - $arVariant = $this->db->fetchRow(" + public function getVariant($variant_id, $bHideDeleted = true) + { + + $strQueryWHERE = ""; + + if ($bHideDeleted === true) $strQueryWHERE .= " AND V.`deleted` != '1' "; + + $strQuery = " SELECT V.* @@ -405,5 +434,10 @@ WHERE V.`id` = '".wpsg_q($variant_id)."' - "); + ".$strQueryWHERE." + "; + + $arVariant = $this->db->fetchRow($strQuery); + + if (!wpsg_isSizedInt($arVariant['id'])) return false; // TODO: Übersetzung @@ -514,5 +548,5 @@ ".$strQueryORDER." V.`product_id` ASC, V.`pos` - "); + ", "id"); foreach ($arData as $k => $v) Index: /mods/wpsg_mod_productview.class.php =================================================================== --- /mods/wpsg_mod_productview.class.php (revision 5519) +++ /mods/wpsg_mod_productview.class.php (revision 5521) @@ -11,4 +11,7 @@ var $hilfeURL = false; + const DISPLAYMODE_FILTER_SMALL = '0'; + const DISPLAYMODE_FILTER_CHECKBOX = '1'; + public function __construct() { @@ -97,8 +100,5 @@ public function settings_save() { - - $this->shop->update_option('wpsg_mod_productview_filter_min', $_REQUEST['wpsg_mod_productview_filter_min']); - $this->shop->update_option('wpsg_mod_productview_filter_max', $_REQUEST['wpsg_mod_productview_filter_max']); - + } // public function settings_save() @@ -109,6 +109,9 @@ $atts = $_REQUEST['wpsg_atts']; - + if (wpsg_isSizedString($atts['filter'])) parse_str($atts['filter'], $atts['filter']); + + if (isset($atts['filter']['attributs'])) $atts['filter']['attributs'] = wpsg_trim($atts['filter']['attributs']); + if (isset($atts['filter']['variants'])) $atts['filter']['variants'] = wpsg_trim($atts['filter']['variants']); die($this->wpsg_sc_productview($atts)); @@ -118,14 +121,115 @@ /** * Filter fÃŒr die Produktansicht + * filter = Kommagetrennte Filter + * pricefilter (Preisfilter) + * catfilter (Liste mit Unterkategorien) + * pv_1_checkbox = pv_1 (Produktvariable ID1 mit Mehrfachauswahl ÃŒber Checkboxen) + * pv_2_small (Produktvariable ID2 mit Mehrfachauswahl ÃŒber grafische Boxen) + * pa_1 (Produktattribut ID1 ÃŒber Checkboxen) */ public function wpsg_sc_productview_filter($atts) { - if ($this->shop->hasMod('wpsg_mod_produktartikel')) - { - - if (is_tax('wpsg-tax')) $this->shop->view['arCat'] = $this->shop->callMod('wpsg_mod_produktartikel', 'getCategorySelectArray', array(get_queried_object()->term_id)); - else $this->shop->view['arCat'] = $this->shop->callMod('wpsg_mod_produktartikel', 'getCategorySelectArray', array(get_queried_object()->term_id)); + $arVariantsGlobal = false; + $arAttributsGlobal = false; + + $this->shop->view['displayMode'] = array(); + $this->shop->view['arVariants'] = array(); + $this->shop->view['arAttributs'] = array(); + $this->shop->view['showFilter'] = array(); + + $atts['filter'] = wpsg_trim(explode(',', $atts['filter'])); + + if (!wpsg_isSizedArray($atts['filter'])) $atts['filter'] = array('catfilter', 'pricefilter'); + + $arSubCatIDs = false; + if ($this->shop->hasMod('wpsg_mod_produktartikel')) $arSubCatIDs = $this->shop->callMod('wpsg_mod_produktartikel', 'getSubCategoryID', array(get_queried_object()->term_id)); + + foreach ($atts['filter'] as $k => $v) + { + + $arCode = explode('_', $v); + + if ($v === 'catfilter' && $this->shop->hasMod('wpsg_mod_produktartikel')) + { + + $this->shop->view['showFilter'][] = array( + 'type' => 'catfilter', + 'cat' => $this->shop->callMod('wpsg_mod_produktartikel', 'getSubCategory', array(get_queried_object()->term_id)) + ); + + } + else if (preg_match('/pricefilter/', $v)) + { + + $this->shop->view['showFilter'][] = array( + 'type' => 'pricefilter', + 'min' => wpsg_product::findMinPrice(array('cat_ids' => $arSubCatIDs)), + 'max' => wpsg_product::findMaxPrice(array('cat_ids' => $arSubCatIDs)) + ); + + } + else if (preg_match('/^pv_\d/', $v) && $this->shop->hasMod('wpsg_mod_productvariants')) + { + + if ($arVariantsGlobal === false) $arVariantsGlobal = $this->shop->callMod('wpsg_mod_productvariants', 'getVariants', array(false, true)); + + if (array_key_exists($arCode[1], $arVariantsGlobal)) + { + + if (wpsg_getStr($arCode[2]) === 'small' || wpsg_getStr($arCode[2]) === self::DISPLAYMODE_FILTER_SMALL) $displayMode = self::DISPLAYMODE_FILTER_SMALL; + else $displayMode = self::DISPLAYMODE_FILTER_CHECKBOX; + + // VerfÃŒgbare Variationen ermitteln + $variation = $this->shop->callMod('wpsg_mod_productvariants', 'getVariationOfVariant', array($arVariantsGlobal[$arCode[1]]['id'], false, array( + 'cat_ids' => $arSubCatIDs + ))); + + if (wpsg_isSizedArray($variation)) + { + + $this->shop->view['showFilter'][] = array( + 'type' => 'productvariants', + 'displayMode' => $displayMode, + 'variant' => $arVariantsGlobal[$arCode[1]], + 'variation' => $variation + ); + + } + + } + + } + else if (preg_match('/^pa_\d/', $v) && $this->shop->hasMod('wpsg_mod_produktattribute')) + { + + if ($arAttributsGlobal === false) $arAttributsGlobal = $this->shop->callMod('wpsg_mod_produktattribute', 'getProductattributs'); + + if (array_key_exists($arCode[1], $arAttributsGlobal)) + { + + $arAttributValue = $this->shop->callMod('wpsg_mod_produktattribute', 'getAttributValues', array($arCode[1], array( + 'cat_ids' => $arSubCatIDs + ))); + + $attribute = $arAttributsGlobal[$arCode[1]]; + + // EintrÀge entfernen zu denen es keine Produkte gibt + foreach ($attribute['auswahl'] as $k => $value) if (!in_array($k, $arAttributValue)) unset($attribute['auswahl'][$k]); + if (wpsg_isSizedArray($attribute['auswahl'])) + { + + $this->shop->view['showFilter'][] = array( + 'type' => 'productattributs', + 'attribute' => $attribute + ); + + } + + } + + } + } @@ -140,9 +244,26 @@ { + $this->shop->view['wpsg_mod_productview']['arOrder'] = array( + 'price_asc' => __('Preis aufsteigend', 'wpsg'), + 'price_desc' => __('Preis absteigend', 'wpsg') + ); + + if (wpsg_isSizedString($atts['order']) && array_key_exists($atts['order'], $this->shop->view['wpsg_mod_productview']['arOrder'])) $this->shop->view['wpsg_mod_productview']['order'] = $atts['order']; + else + { + + $this->shop->view['wpsg_mod_productview']['order'] = 'price_asc'; + $atts['order'] = $this->shop->view['wpsg_mod_productview']['order']; + + } + $arProductviewArray = $this->getSelectedProductArray($atts); - $this->shop->view['wpsg_mod_productview'] = $arProductviewArray; + $this->shop->view['wpsg_mod_productview'] = wpsg_array_merge($this->shop->view['wpsg_mod_productview'], $arProductviewArray); $this->shop->view['wpsg_mod_productview']['index'] = wpsg_getInt($GLOBALS['wpsg_mod_productview_index'], 1); $this->shop->view['wpsg_mod_productview']['atts'] = $atts; + + $this->shop->view['wpsg_mod_productview']['pageMax'] = $arProductviewArray['page'] * $arProductviewArray['per_page']; + if ($this->shop->view['wpsg_mod_productview']['pageMax'] > $arProductviewArray['count']) $this->shop->view['wpsg_mod_productview']['pageMax'] = $arProductviewArray['count']; if (wpsg_isSizedInt($atts['cols'], 3)) @@ -166,9 +287,9 @@ } - + $this->shop->view['wpsg_mod_productview']['cols'] = wpsg_getStr($atts['cols'], '4'); $GLOBALS['wpsg_mod_productview_index'] = $this->shop->view['wpsg_mod_productview']['index'] + 1; - + return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productview/productview.phtml', false); @@ -225,7 +346,21 @@ } - + if (wpsg_isSizedString($atts['filter']['price_min'])) $arFilter = wpsg_array_merge($arFilter, array('price_min' => $atts['filter']['price_min'])); if (wpsg_isSizedString($atts['filter']['price_max'])) $arFilter = wpsg_array_merge($arFilter, array('price_max' => $atts['filter']['price_max'])); + if ($this->shop->hasMod('wpsg_mod_productvariants') && wpsg_isSizedArray($atts['filter']['variants'])) $arFilter['variants'] = $atts['filter']['variants']; + if ($this->shop->hasMod('wpsg_mod_produktattribute') && wpsg_isSizedArray($atFilter)) $arFilter['attributs'] = $atts['filter']['attributs']; + + if (wpsg_isSizedString($atts['order'])) + { + + $arOrderCode = explode('_', $atts['order']); + + if ($arOrderCode[0] === 'price') $arFilter['order_col'] = " P.`preis` "; + + if ($arOrderCode[1] === 'asc' && wpsg_isSizedString($arFilter['order_col'])) $arFilter['order_direction'] = ' ASC '; + else $arFilter['order_direction'] = ' DESC '; + + } $arReturn = wpsg_product::find($arFilter, false); Index: /mods/wpsg_mod_produktartikel.class.php =================================================================== --- /mods/wpsg_mod_produktartikel.class.php (revision 5519) +++ /mods/wpsg_mod_produktartikel.class.php (revision 5521) @@ -879,5 +879,5 @@ WHERE TT.`parent` = '".wpsg_q($ref)."' AND - TT.`taxonomy` = 'wpsg-tax ' AND + TT.`taxonomy` = 'wpsg-tax' AND T.`term_id` > 0 ORDER BY @@ -902,4 +902,40 @@ } // public function getCategorySelectArray($ref = 0) + /** + * Gibt einen Array mit KategorieIDs die unter einer Kategorie liegen zurÃŒck + */ + public function getSubCategoryID($child_of = 0) + { + + $arCat = get_categories(array( + 'taxonomy' => 'wpsg-tax', + 'child_of' => $child_of, + 'hide_empty' => true, + 'hierarchical' => true, + 'fields' => 'ids' + )); + + $arCat[] = $child_of; + + return $arCat; + + } // public function getSubCategoryID($parent = 0) + + /** + * Gibt einen Array mit Kategorien unterhalb zurÃŒck + */ + public function getSubCategory($parent = 0) + { + + $arCat = get_categories(array( + 'taxonomy' => 'wpsg-tax', + 'parent' => $parent, + 'hide_empty' => true + )); + + return $arCat; + + } // public function getSubCategory($parent = 0) + } // class wpsg_mod_produktartikel extends wpsg_mod_basic Index: /mods/wpsg_mod_produktattribute.class.php =================================================================== --- /mods/wpsg_mod_produktattribute.class.php (revision 5519) +++ /mods/wpsg_mod_produktattribute.class.php (revision 5521) @@ -56,5 +56,5 @@ KEY p_id (p_id), KEY a_id (a_id) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8;"; + ) ENGINE=MyISAM DEFAULT CHARSET=utf8;"; dbDelta($sql); @@ -259,10 +259,10 @@ // Nur fÃŒr angelegte Produkte if ($product_data['id'] <= 0) return false; - + $this->shop->view['data'] = $product_data; $this->shop->view['data']['pa'] = $this->shop->callMod('wpsg_mod_produktattribute', 'getProductAttributeByProductId', array($this->shop->getProduktID($product_data['id']))); $this->shop->view['wpsg_mod_produktattribute']['data'] = $product_data; - + $product_content['wpsg_mod_produktattribute'] = array( 'title' => __('Produktattribute', 'wpsg'), @@ -426,4 +426,66 @@ /* Modulfunktionen */ + /** + * Gibt alle Möglichen Werte fÃŒr ein Attribut zurÃŒck + */ + public function getAttributValues($attribute_id, $arProductFilter = array()) + { + + $strQueryWHERE = " AND AT.`a_id` = '".wpsg_q($attribute_id)."' "; + $strQueryHAVING = ""; + $strQueryJOIN = " LEFT JOIN `".WPSG_TBL_PRODUCTS."` AS P ON (P.`id` = AT.`p_id`) "; + + list($strQueryP_WHERE, $strQueryP_JOIN, $strQueryP_HAVING, $strQueryP_ORDER) = wpsg_product::getQueryParts($arProductFilter); + + $strQueryJOIN .= $strQueryP_JOIN; + $strQueryWHERE .= $strQueryP_WHERE; + $strQueryHAVING .= $strQueryP_HAVING; + + $strQuery = " + SELECT + DISTINCT AT.`value` + FROM + `".WPSG_TBL_PRODUCTS_AT."` AS AT + ".$strQueryJOIN." + WHERE + 1 + ".$strQueryWHERE." + HAVING + 1 + ".$strQueryHAVING." + "; + + return $this->db->fetchAssocField($strQuery); + + } // public function getAttributValues($attribute_id, $arProductFilter = array()) + + /** + * Gibt alle Produktattribute zurÃŒck + */ + public function getProductattributs() + { + + $arReturn = $this->db->fetchAssoc(" + SELECT + A.* + FROM + `".WPSG_TBL_AT."` AS A + WHERE + 1 + ", "id"); + + foreach ($arReturn as $k => $v) + { + + if ($v['typ'] === '2') $arReturn[$k]['auswahl'] = wpsg_trim(explode('|', $v['auswahl'])); + + } + + // TODO: Übersetzung + + return $arReturn; + + } // public function getProductattributs() + public function getProductAttributeByProductId($product_id) { Index: /mods/wpsg_mod_stock.class.php =================================================================== --- /mods/wpsg_mod_stock.class.php (revision 5519) +++ /mods/wpsg_mod_stock.class.php (revision 5521) @@ -517,5 +517,5 @@ $product_id = $this->shop->getProduktID($produkt_key); - $product_data = $this->shop->cache->loadProduct($produkt_id); + $product_data = $this->shop->cache->loadProduct($product_id); if ($this->shop->hasMod('wpsg_mod_productgroups')) Index: /mods/wpsg_mod_varianten.class.php =================================================================== --- /mods/wpsg_mod_varianten.class.php (revision 5519) +++ /mods/wpsg_mod_varianten.class.php (revision 5521) @@ -724,9 +724,9 @@ { + /* // FÃŒr die Varianten brauche ich immer das original Array ... - $produkt_data['id'] = $this->db->fetchOne("SELECT `lang_parent` FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($produkt_data['id'])."'"); - - - $this->shop->view['wpsg_mod_varianten']['data'] = $produkt_data; + $product_data['id'] = $this->db->fetchOne("SELECT `lang_parent` FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($product_data['id'])."'"); + + $this->shop->view['wpsg_mod_varianten']['data'] = $product_data; $product_content['wpsg_mod_varianten'] = array( @@ -734,4 +734,5 @@ 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_varianten/produkt_addedit_content.phtml', false) ); + */ } Index: /views/css/frontend.css =================================================================== --- /views/css/frontend.css (revision 5519) +++ /views/css/frontend.css (revision 5521) @@ -350,4 +350,11 @@ .wpsg_mod_productview_filter #wpsg_mod_productview_filter_price-range .ui-slider-handle { cursor:pointer; width:16px; height:16px; background-color:#787878; position:absolute; } .wpsg_mod_productview_filter #wpsg_mod_productview_filter_price-range .ui-slider-bg { margin-left:16px; background-color:#E1E1E1; width:100%; height:2px; position:absolute; top:8px; } +.wpsg_mod_productview-order { position:relative; cursor:pointer; } +.wpsg_mod_productview-order-layer { position:absolute; width:100%; display:none; margin-top:5px; left:0px; z-index:1; } +.wpsg_mod_productview-order-layer > .inner { margin-left:15px; margin-right:15px; border:1px solid #29556E; background-color:#FFFFFF; } +.wpsg_mod_productview-order-layer a:focus, +.wpsg_mod_productview-order-layer a { display:block; line-height:25px; color:#29556E; padding:5px 5px 5px 10px; text-decoration:none; } +.wpsg_mod_productview-order-layer a.selected, +.wpsg_mod_productview-order-layer a:hover { text-decoration:none; color:#FFFFFF; background-color:#29556E; } @media screen and (max-width: 600px) { Index: /views/js/editable.js =================================================================== --- /views/js/editable.js (revision 5519) +++ /views/js/editable.js (revision 5521) @@ -19,5 +19,5 @@ 'validate': function(value) { - if(jQuery.trim(value) == '') { return wpsg_ajax.ie_validate_empty; } + //if(jQuery.trim(value) == '') { return wpsg_ajax.ie_validate_empty; } } Index: /views/mods/mod_productvariants/admin_edit.phtml =================================================================== --- /views/mods/mod_productvariants/admin_edit.phtml (revision 5519) +++ /views/mods/mod_productvariants/admin_edit.phtml (revision 5521) @@ -16,5 +16,5 @@ - view['product_id'])) { $colspan ++; ?> + view['product_id'])) { $colspan ++; ?> @@ -22,4 +22,5 @@ + view['product_id'])) { $colspan += 3; ?> @@ -51,4 +52,11 @@ submitdata: { field: 'vari_name', + field_id: '' + } + }); + + jQuery('#productvariation_shortname_').wspg_editable('wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', { + submitdata: { + field: 'vari_shortname', field_id: '' } @@ -101,4 +109,5 @@ + view['product_id'])) { ?> Index: /views/mods/mod_productvariants/produkt_addedit_content.phtml =================================================================== --- /views/mods/mod_productvariants/produkt_addedit_content.phtml (revision 5519) +++ /views/mods/mod_productvariants/produkt_addedit_content.phtml (revision 5521) @@ -25,5 +25,5 @@ - +

Index: /views/mods/mod_productview/productview.js =================================================================== --- /views/mods/mod_productview/productview.js (revision 5519) +++ /views/mods/mod_productview/productview.js (revision 5521) @@ -6,6 +6,7 @@ atts.page = page; - atts.order = order; - atts.mode = mode; + + if (typeof order !== "undefined") atts.order = order; + if (typeof mode !== "undefined") atts.mode = mode; if (jQuery('#wpsg_mod_productview_filter').length > 0) @@ -43,12 +44,59 @@ var max_height = 0; jQuery('#wpsg_productview_' + index + ' .wpsg_mod_productview_description').each(function() { if (jQuery(this).outerHeight() > max_height) max_height = jQuery(this).outerHeight(); } ).outerHeight(max_height); + // Sortierungslayer + jQuery('.wpsg_mod_productview-order').bind('click', function(event) { + + if (jQuery(this).find('.wpsg_mod_productview-order-layer').is(':visible')) + { + + jQuery(this).find('.wpsg_mod_productview-order-layer').slideUp(); + + } + else + { + + jQuery(this).find('.wpsg_mod_productview-order-layer').slideDown(); + + } + + event.stopPropagation(); + + } ).disableSelection(); + + // Sortierung + jQuery('.wpsg_mod_productview-order-layer a').bind('click', function() { + + var productview_index = jQuery(this).attr("data-productview-index"); + var order = jQuery(this).attr("data-order"); + + wpsg_switchProductview(productview_index, 1, order); + + return false; + + } ).disableSelection(); + + } + + function wpsg_filter_insert(values, set) + { + + var arValues = []; + + if (jQuery.trim(values) != '') arValues = jQuery.trim(values).split(','); + + if (jQuery.inArray(set, arValues) >= 0) arValues = jQuery.grep(arValues, function(value) { return value != set; } ); + else arValues.push(set); + + return jQuery.unique(arValues).join(','); + } jQuery(document).ready(function() { + // Preisfilter var filter_min = parseFloat(jQuery('#wpsg_mod_productview_filter_price_info input[name="price_min"]').val()); var filter_max = parseFloat(jQuery('#wpsg_mod_productview_filter_price_info input[name="price_max"]').val()); - - jQuery("#wpsg_mod_productview_filter_price-range").slider( { + + jQuery("#wpsg_mod_productview_filter_price-range").slider( { range: true, min: filter_min, @@ -70,5 +118,19 @@ } } ); - + + // Variantenfilter Small + jQuery('.wpsg_mod_productview_filter_item a.switch').bind('click', function() { + + var input = jQuery(this).parents('.wpsg_mod_productview_filter_item').find('input.val'); + input.val(wpsg_filter_insert(input.val(), jQuery(this).attr('data-value'))); + + jQuery(this).toggleClass('active'); + + wpsg_switchProductview(1, 1); + + return false; + + } ); + jQuery('.wpsg_productview').each(function() { @@ -78,4 +140,10 @@ } ); + jQuery('body, html').bind('click', function() { + + jQuery('.wpsg_mod_productview-order-layer:visible').each(function() { jQuery(this).parent().click(); } ); + + } ); + } ); Index: /views/mods/mod_productview/productview.phtml =================================================================== --- /views/mods/mod_productview/productview.phtml (revision 5519) +++ /views/mods/mod_productview/productview.phtml (revision 5521) @@ -19,6 +19,19 @@ view['wpsg_mod_productview']['products'])) { ?>
- - Neueste zuerst + view['wpsg_mod_productview']['order']; ?> + + + + + + + view['wpsg_mod_productview']['arOrder'][$order]; ?> +
+
+ view['wpsg_mod_productview']['arOrder'] as $value => $label) { ?> + + +
+
@@ -27,7 +40,7 @@ echo wpsg_translate(__('Anzeige #1# - #2#', 'wpsg'), ($this->view['wpsg_mod_productview']['page'] - 1) * $this->view['wpsg_mod_productview']['per_page'] + 1, - ((sizeof($this->view['wpsg_mod_productview']['products']) > $this->view['wpsg_mod_productview']['per_page'])?$this->view['wpsg_mod_productview']['page'] * $this->view['wpsg_mod_productview']['per_page']:sizeof($this->view['wpsg_mod_productview']['products'])) + $this->view['wpsg_mod_productview']['pageMax'] ); ?> - view['wpsg_mod_productview']['products'])); ?> + view['wpsg_mod_productview']['count']); ?> Index: /views/mods/mod_productview/productview_filter.phtml =================================================================== --- /views/mods/mod_productview/productview_filter.phtml (revision 5519) +++ /views/mods/mod_productview/productview_filter.phtml (revision 5521) @@ -1,20 +1,123 @@
- hasMod('wpsg_mod_produktartikel') && wpsg_isSizedArray($this->view['arCat'])) { ?> -
- '; + + } + + } + + wpsg_renderCat($this, $filter_data['cat']); + + ?> +
+ + + +
+

+
+
+ get_option('wpsg_currency'); ?> - get_option('wpsg_currency'); ?> + + +
+
+ + + + +
+

+ + +
+ + + + + + + + + + + + + + +
+
+ +
+

+ +
+ + + + + + + + + + + + + + +
+
+
- -
+ + +
+

+ +
+ $auswahl) { ?> + + + + + + + + +
+
+ + -
-

-
-
-
- get_option('wpsg_mod_productview_filter_min')); ?> get_option('wpsg_currency'); ?> - get_option('wpsg_mod_productview_filter_max')); ?> get_option('wpsg_currency'); ?> - - -
+ Index: /views/mods/mod_productview/settings_edit.phtml =================================================================== --- /views/mods/mod_productview/settings_edit.phtml (revision 5519) +++ /views/mods/mod_productview/settings_edit.phtml (revision 5521) @@ -6,4 +6,3 @@ ?> -get_option('wpsg_mod_productview_filter_min')); ?> -get_option('wpsg_mod_productview_filter_max')); ?> + Index: /views/mods/mod_produktattribute/produkt_addedit_content.phtml =================================================================== --- /views/mods/mod_produktattribute/produkt_addedit_content.phtml (revision 5519) +++ /views/mods/mod_produktattribute/produkt_addedit_content.phtml (revision 5521) @@ -5,41 +5,34 @@ */ -?> -view['data']['pa']) > 0) { ?> -
-

-
- -

-
+?> + + + + view['data']['pa'])) { ?> + + view['data']['pa'] as $pa) { ?> + + +
+
+
+
+ + + + + + + + + + + +

+ - view['data']['pa'] as $pa) { ?> -
-
- -
-
- - - - - - - - - /> - - - -
-
-
- +
-
-
- + + +