Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 5452) +++ /controller/wpsg_ShopController.class.php (revision 5454) @@ -2935,4 +2935,5 @@ } + $bDrin = false; foreach ($matches[1] as $k => $m) { @@ -3640,5 +3641,7 @@ $oProduct = wpsg_product::getInstance($product_id); - if (wpsg_isSizedString($oProduct->detailname) && $detailname === true) + $product_detailname = $oProduct->detailname; + + if (wpsg_isSizedString($detailname) && $detailname === true) { Index: /model/wpsg_product.class.php =================================================================== --- /model/wpsg_product.class.php (revision 5452) +++ /model/wpsg_product.class.php (revision 5454) @@ -334,17 +334,8 @@ $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'])).") "; - - } + 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'])).") "; + if (wpsg_isSizedString($arFilter['price_min'])) $strQueryWHERE .= " AND P.`preis` >= '".wpsg_q($arFilter['price_min'])."' "; + if (wpsg_isSizedString($arFilter['price_max'])) $strQueryWHERE .= " AND P.`preis` <= '".wpsg_q($arFilter['price_max'])."' "; if (wpsg_isSizedArray($arFilter['cat_ids'])) Index: /mods/wpsg_mod_productview.class.php =================================================================== --- /mods/wpsg_mod_productview.class.php (revision 5452) +++ /mods/wpsg_mod_productview.class.php (revision 5454) @@ -26,4 +26,5 @@ add_shortcode('wpsg_productview', array($this, 'wpsg_sc_productview')); + add_shortcode('wpsg_productview_filter', array($this, 'wpsg_sc_productview_filter')); } // public function init() @@ -62,5 +63,5 @@ { - wp_enqueue_script('wpsg_mod_productview_js', $this->shop->getRessourceURL('mods/mod_productview/productview.js')); + wp_enqueue_script('wpsg_mod_productview_js', $this->shop->getRessourceURL('mods/mod_productview/productview.js'), array('jquery', 'jquery-ui-slider')); } @@ -87,4 +88,19 @@ } // public function tinymce_plugin($plugin_array) + public function settings_edit() + { + + $this->shop->render(WPSG_PATH_VIEW.'mods/mod_productview/settings_edit.phtml'); + + } // public function settings_edit() + + 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() + /* Modulfunktionen */ @@ -92,12 +108,30 @@ { - $atts = @unserialize($_REQUEST['wpsg_atts']); - - if (wpsg_isSizedInt($_REQUEST['wpsg_page'])) $atts['page'] = $_REQUEST['wpsg_page']; + $atts = $_REQUEST['wpsg_atts']; + + if (wpsg_isSizedString($atts['filter'])) parse_str($atts['filter'], $atts['filter']); die($this->wpsg_sc_productview($atts)); } // public function refreshRedirect() - + + /** + * Filter fÃŒr die Produktansicht + */ + 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)); + + } + + return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productview/productview_filter.phtml', false); + + } // public function wpsg_sc_productview_filter($atts) + /** * Shortcode fÃŒr die Anzeige der Produkte @@ -112,4 +146,27 @@ $this->shop->view['wpsg_mod_productview']['atts'] = $atts; + if (wpsg_isSizedInt($atts['cols'], 3)) + { + + $this->shop->view['wpsg_mod_productview']['cols'] = 3; + $this->shop->view['wpsg_mod_productview']['col_class']['title'] = 'col-lg-0'; + $this->shop->view['wpsg_mod_productview']['col_class']['order'] = 'col-lg-4'; + $this->shop->view['wpsg_mod_productview']['col_class']['info'] = 'col-lg-8'; + $this->shop->view['wpsg_mod_productview']['col_class']['product'] = 'col-lg-4'; + + } + else + { + + $this->shop->view['wpsg_mod_productview']['cols'] = 4; + $this->shop->view['wpsg_mod_productview']['col_class']['title'] = 'col-lg-3'; + $this->shop->view['wpsg_mod_productview']['col_class']['order'] = 'col-lg-3'; + $this->shop->view['wpsg_mod_productview']['col_class']['info'] = 'col-lg-6'; + $this->shop->view['wpsg_mod_productview']['col_class']['product'] = 'col-lg-3'; + + } + + $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; @@ -146,9 +203,29 @@ { + $arCatIDs = wpsg_trim(explode(',', $atts['cat_ids'])); + foreach ($arCatIDs as $k => $cat_id) + { + + $arSubCat = get_terms('wpsg-tax', array( + 'child_of' => $cat_id + )); + + foreach ($arSubCat as $sub_cat) + { + + $arCatIDs[] = $sub_cat->term_id; + + } + + } + $arFilter = array( - 'cat_ids' => wpsg_trim(array_unique(explode(',', $atts['cat_ids']))) + 'cat_ids' => $arCatIDs ); } + + 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'])); $arReturn = wpsg_product::find($arFilter, false); Index: /mods/wpsg_mod_produktartikel.class.php =================================================================== --- /mods/wpsg_mod_produktartikel.class.php (revision 5452) +++ /mods/wpsg_mod_produktartikel.class.php (revision 5454) @@ -558,5 +558,6 @@ ), 'show_ui' => true, - 'show_in_menu' => true + 'show_in_menu' => true, + 'hierarchical' => true )); Index: /views/admin/kundendaten_tab2.phtml =================================================================== --- /views/admin/kundendaten_tab2.phtml (revision 5452) +++ /views/admin/kundendaten_tab2.phtml (revision 5454) @@ -27,5 +27,5 @@ - @@ -34,5 +34,5 @@ - @@ -40,10 +40,9 @@ - - - - + - + + + - - - - - - - - - - - - + + /* ]]> */ + + + + + + +   + + + + + + @@ -135,5 +139,5 @@ jQuery('.wpsg_mod_produktattribute_table').sortable( { helper: wpsg_Tablefix, - items: 'tr.wpsg_tablerow', + items: 'tbody', handler: '.wpsg_id', update: function(event, ui) { @@ -154,5 +158,5 @@ } - } ); + } ).disableSelection(); } ); Index: /views/mods/mod_produktattribute/settings_edit.phtml =================================================================== --- /views/mods/mod_produktattribute/settings_edit.phtml (revision 5452) +++ /views/mods/mod_produktattribute/settings_edit.phtml (revision 5454) @@ -8,5 +8,5 @@ ?> - +/* ]]> */ - + + -
-
- -
-
-
- - -
-
-
-
- mod->pa_listAction(); ?> -
- -
+
+ mod->pa_listAction(); ?>
+ +
+ +