From ec56d4ca7ecc5e38d705ac6a3386ea140ae3038e Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Fri, 27 May 2016 12:43:25 +0000 Subject: - Filter Frontend/Backend git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5521 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/mods/mod_productvariants/admin_edit.phtml | 11 +- .../produkt_addedit_content.phtml | 2 +- views/mods/mod_productview/productview.js | 78 +++++++++++- views/mods/mod_productview/productview.phtml | 21 +++- .../mods/mod_productview/productview_filter.phtml | 135 ++++++++++++++++++--- views/mods/mod_productview/settings_edit.phtml | 3 +- .../produkt_addedit_content.phtml | 67 +++++----- 7 files changed, 251 insertions(+), 66 deletions(-) (limited to 'views/mods') diff --git a/views/mods/mod_productvariants/admin_edit.phtml b/views/mods/mod_productvariants/admin_edit.phtml index ef11894..d491b74 100644 --- a/views/mods/mod_productvariants/admin_edit.phtml +++ b/views/mods/mod_productvariants/admin_edit.phtml @@ -15,12 +15,13 @@ - view['product_id'])) { $colspan ++; ?> + view['product_id'])) { $colspan ++; ?> + view['product_id'])) { $colspan += 3; ?> @@ -52,6 +53,13 @@ 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: '' + } }); @@ -100,6 +108,7 @@ /* ]]> */ + view['product_id'])) { ?> diff --git a/views/mods/mod_productvariants/produkt_addedit_content.phtml b/views/mods/mod_productvariants/produkt_addedit_content.phtml index 21b3e43..aa8012a 100644 --- a/views/mods/mod_productvariants/produkt_addedit_content.phtml +++ b/views/mods/mod_productvariants/produkt_addedit_content.phtml @@ -24,7 +24,7 @@ - +

diff --git a/views/mods/mod_productview/productview.js b/views/mods/mod_productview/productview.js index d80dc83..7a30c02 100644 --- a/views/mods/mod_productview/productview.js +++ b/views/mods/mod_productview/productview.js @@ -5,8 +5,9 @@ var atts = jQuery.parseJSON(jQuery('#wpsg_productview_' + index + ' input[name="wpsg_atts"]').val()); 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) { @@ -42,14 +43,61 @@ var max_height = 0; jQuery('#wpsg_productview_' + index + ' .wpsg_mod_productview_name').each(function() { if (jQuery(this).outerHeight() > max_height) max_height = jQuery(this).outerHeight(); } ).outerHeight(max_height); 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, max: filter_max, @@ -69,7 +117,21 @@ } } ); - + + // 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() { var x = jQuery(this).attr("id").substr(17); @@ -77,5 +139,11 @@ } ); + jQuery('body, html').bind('click', function() { + + jQuery('.wpsg_mod_productview-order-layer:visible').each(function() { jQuery(this).parent().click(); } ); + + } ); + } ); \ No newline at end of file diff --git a/views/mods/mod_productview/productview.phtml b/views/mods/mod_productview/productview.phtml index e643db7..c98b4b3 100644 --- a/views/mods/mod_productview/productview.phtml +++ b/views/mods/mod_productview/productview.phtml @@ -18,17 +18,30 @@ 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) { ?> + + +
+
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']); ?>
diff --git a/views/mods/mod_productview/productview_filter.phtml b/views/mods/mod_productview/productview_filter.phtml index 7456bee..125cea0 100644 --- a/views/mods/mod_productview/productview_filter.phtml +++ b/views/mods/mod_productview/productview_filter.phtml @@ -1,20 +1,123 @@
- hasMod('wpsg_mod_produktartikel') && wpsg_isSizedArray($this->view['arCat'])) { ?> -
-
    - view['arCat'] as $cat_id => $cat_name) { ?> -
    • + + view['showFilter'] as $filter_data) { ?> + + + +
    +

    + '; + + foreach ($ar as $k => $cat) + { + + echo '
  • '; + echo ''.wpsg_hspc($cat->cat_name).''; + + $arSubCat = $shop->callMod('wpsg_mod_produktartikel', 'getSubCategory', array($cat->term_id)); + wpsg_renderCat($shop, $arSubCat, $level + 1); + + echo '
    • '; + + } + + echo '
'; + + } + + } + + 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'); ?> - - -
+ \ No newline at end of file diff --git a/views/mods/mod_productview/settings_edit.phtml b/views/mods/mod_productview/settings_edit.phtml index bfb101d..69e9a00 100644 --- a/views/mods/mod_productview/settings_edit.phtml +++ b/views/mods/mod_productview/settings_edit.phtml @@ -5,5 +5,4 @@ */ ?> -get_option('wpsg_mod_productview_filter_min')); ?> -get_option('wpsg_mod_productview_filter_max')); ?> \ No newline at end of file + \ No newline at end of file diff --git a/views/mods/mod_produktattribute/produkt_addedit_content.phtml b/views/mods/mod_produktattribute/produkt_addedit_content.phtml index e79458a..8b88859 100644 --- a/views/mods/mod_produktattribute/produkt_addedit_content.phtml +++ b/views/mods/mod_produktattribute/produkt_addedit_content.phtml @@ -4,42 +4,35 @@ * Template für die Eingabe der Produktattribute innerhalb der Produktverwaltung */ -?> -view['data']['pa']) > 0) { ?> -
-

-
- -

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

+ + +
-
-
- \ No newline at end of file + + + \ No newline at end of file -- cgit v1.2.3