Merge branch 'develop' of https://gitlab.netisse.fr/msfari/NAP-wordpress into develop

wp-content/themes/nap/assets/js/nap.js

 jQuery(document).ready(function() {
 
+    jQuery(document).on('click', ".format-list", function() {
+
+        var format = jQuery(this).find('.format-desc').text();
+        jQuery('.info-format').text(format);
+        jQuery('.info-format-txt').text(format);
+
+    });
+
     jQuery(document).on('click', ".download_file", function() {
         var id;
         var download_link = jQuery('.download_file_link').attr('href');
@@ -49,78 +57,92 @@ jQuery(document).ready(function() {
         jQuery('article').removeClass('hidden');
 
 
-        //filtre couleur
-       var tabcolor = [];
+        var tabcolor = [];
         i = 0;
         jQuery("#pa_couleur .selected").each(function() {
             tabcolor[i++] = jQuery(this).attr('data-color');
         });
-        
+
         var tabformat = [];
         i = 0;
         jQuery("#pa_format .selected").each(function() {
             tabformat[i++] = jQuery(this).text();
         });
-        
+
         var tabmatiere = [];
         i = 0;
         jQuery("#pa_matiere .selected").each(function() {
             tabmatiere[i++] = jQuery(this).text();
         });
+        
+         var tabunivers = [];
+        i = 0;
+        jQuery("#pa_univers .selected").each(function() {
+            tabunivers[i++] = jQuery(this).text();
+        });
+        
         var selected_colors = tabcolor.join(',');
         var selected_formats = tabformat.join(',');
         var selected_matiere = tabmatiere.join(',');
-        var params = { pa_couleur:selected_colors, pa_format:selected_formats, pa_matiere: selected_matiere};
-        window.location.href = "?" +jQuery.param(params);
-         
+        var selected_univers = tabunivers.join(',');
+        var params = {pa_couleur: selected_colors, pa_format: selected_formats, pa_matiere: selected_matiere, pa_univers:selected_univers};
+        window.location.href = "?" + jQuery.param(params);
+
         /*history.pushState({}, null, "?" + jQuery.param(params));
-        jQuery.ajax({
-            
-        type: 'GET',
-        url: '', 
-        data: {"pa_couleur": selected_colors,"pa_format":selected_formats},
-        success: function(data) {
-           
-        },
-        error: function() {
-            
-        }
+         jQuery.ajax({
+         
+         type: 'GET',
+         url: '', 
+         data: {"pa_couleur": selected_colors,"pa_format":selected_formats},
+         success: function(data) {
+         
+         },
+         error: function() {
+         
+         }
+         });
+         jQuery(".product-list article li").each(function() {
+         var product_color = jQuery(this).attr('data-color');
+         var product_format = jQuery(this).attr('data-format');
+         if (jQuery.inArray(product_color, tabcolor) >= 0 || jQuery.inArray(product_format, tabformat) >= 0) {
+         
+         jQuery(this).closest('article').addClass('in_search');
+         
+         }
+         
+         });
+         
+         */
+
     });
-        jQuery(".product-list article li").each(function() {
-            var product_color = jQuery(this).attr('data-color');
-            var product_format = jQuery(this).attr('data-format');
-            if (jQuery.inArray(product_color, tabcolor) >= 0 || jQuery.inArray(product_format, tabformat) >= 0) {
 
-                jQuery(this).closest('article').addClass('in_search');
 
-            }
+    jQuery('.filter-bloc ').each(function() {
 
-        });
+        if (jQuery(this).find('.bloc-content').length == 0) {
 
-*/
-   
+            jQuery(this).hide();
+        }
     });
-    if(jQuery.urlParam('pa_format')!='' || jQuery.urlParam('pa_couleur')!='' || jQuery.urlParam('pa_matiere')!=''){
-     jQuery('.list-animation section').each(function() {
-                
-            if (jQuery(this).find('article.selected').length == 0) {
-              
-                jQuery(this).hide();
-            }
-             });
-         }
-         
-        jQuery('.filter-bloc ').each(function() {
-               
-            if (jQuery(this).find('.bloc-content').length == 0) {
-              
-                jQuery(this).hide();
-            }
-             });
+
+    jQuery('.list-animation section').each(function() {
+
+        if (jQuery(this).find("article").length) {
+
+            console.log('article found');
+        }
+
+        else {
+            jQuery(this).hide();
+        }
+    })
+
+
+
 
 });
 
-jQuery.urlParam = function(name){
-	var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
-	return results[1] || 0;
+jQuery.urlParam = function(name) {
+    var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
+    return results[1] || 0;
 }
\ No newline at end of file

wp-content/themes/nap/download.php

@@ -35,6 +35,7 @@ $post_ID = 260;
                                     while (has_sub_field('tl_images', $post_ID)) :
                                         $options = array();
                                         $options['image'] = get_sub_field('tl_image');
+                                        $options['title'] = get_sub_field('tl_titre_image');
                                         $options['dwnldLink'] = get_sub_field('tl_link');
                                         echo nap_get_item($post_ID, null, '', $options);
                                         ?>

wp-content/themes/nap/functions.php

@@ -415,31 +415,32 @@ function nap_distinct_format_variations($variations) {
     return $var_format;
 }
 
-function nap_filter_attribute($postID, $search, $attribute, $color = false) {
-    if (isset($search) && $search != '') {
-        $tab_attr = get_the_terms($postID, $attribute);
-
-        $filter = "hidden";
-        if (is_array($tab_attr)) {
-            foreach ($tab_attr as $key => $value) {
-                if ($color) {
-                    $code = nap_color_attribute($value->slug);
-
-                    if ($code != '' && stristr($search, $code)) {
-                        $filter = "selected";
-                    }
-                } else {
-                    if (stristr($search, $value->name)) {
-                        $filter = "selected";
-                    }
-                }
-            }
-        }
+function nap_filter_attribute($id, $args, $options, $list_attr, $search) {
+    if(isset($search['pa_format']) && $search['pa_format']!=''){
+        $list_format=explode(",", $search['pa_format']);
+    }
+    if(isset($search['pa_couleur']) && $search['pa_couleur']!=''){
+        $list_couleur=explode(",", $search['pa_couleur']);
+    }
+    if(isset($search['pa_matiere']) && $search['pa_matiere']!=''){
+        $list_matiere=explode(",", $search['pa_matiere']);
+    }
+    if(isset($search['pa_univers']) && $search['pa_univers']!=''){
+        $list_univers=explode(",", $search['pa_univers']);
     }
-    return $filter;
+   if(
+        ( ($list_couleur && in_array($list_attr['pa_couleur'],$list_couleur)) || empty($list_couleur) ) &&
+        ( ($list_format && in_array($list_attr['pa_format'],$list_format)) || empty($list_format) ) &&
+		( ($list_univers && in_array($list_attr['pa_univers'],$list_univers)) || empty($list_univers) ) &&
+        ( ($list_matiere && in_array($list_attr['pa_matiere'],$list_matiere)) || empty($list_matiere) ) 
+    )
+   {
+      echo nap_get_item($id, $args, 'catalogue', $options);
+   }
 }
 
 function nap_get_item($post_ID, $args = null, $current_page = '', $options = null, $search = null) {
+
     $link = $image = $size = '';
     if (isset($options)) {
         if ($options['dwnldLink']) {
@@ -453,55 +454,61 @@ function nap_get_item($post_ID, $args = null, $current_page = '', $options = nul
         if ($options['size']) {
             $size = $options['size'];
         }
-    }
-
-    if (isset($search['pa_couleur']) && $search['pa_couleur'] != '') {
-        $colors_value = get_the_terms($post_ID, 'pa_couleur');
-        $filter = "hidden";
-        if (is_array($colors_value)) {
-            foreach ($colors_value as $key => $value) {
-                $code = nap_color_attribute($value->slug);
 
-                if ($code != '' && stristr($search['pa_couleur'], $code)) {
-                    $filter = "selected";
-                }
-            }
-        }
-    }
-    /*$attributes = array('Univers' => 'pa_univers', 'Matiére' => 'pa_matiere', 'Format' => 'pa_format', 'Couleurs' => 'pa_couleur');
-    foreach ($attributes as $key => $value) :
-        if($value = 'pa_couleur' )
-            $filter= nap_filter_attribute($post_ID,$search[$value],$value,true);
-        else
-            $filter= nap_filter_attribute($post_ID,$search[$value],$value);
-    endforeach;*/
-    if (isset($search['pa_format']) && $search['pa_format'] != '') {
-        $format_value = get_the_terms($post_ID, 'pa_format');
-
-        $filter = "hidden";
-        if (is_array($format_value)) {
-            foreach ($format_value as $key => $value) {
-
-                if (stristr($search['pa_format'], $value->name)) {
-                    $filter = "selected";
-                }
-            }
+        if ($options['title']) {
+            $title_item = $options['title'];
+        } else {
+            $title_item = get_the_title($post_ID);
         }
     }
-    
-    if (isset($search['pa_matiere']) && $search['pa_matiere'] != '') {
-        $format_value = get_the_terms($post_ID, 'pa_matiere');
-
-        $filter = "hidden";
-        if (is_array($format_value)) {
-            foreach ($format_value as $key => $value) {
 
-                if (stristr($search['pa_matiere'], $value->name)) {
-                    $filter = "selected";
-                }
-            }
-        }
-    }
+    /* if (isset($search['pa_couleur']) && $search['pa_couleur'] != '') {
+      $colors_value = get_the_terms($post_ID, 'pa_couleur');
+      $filter = "hidden";
+      if (is_array($colors_value)) {
+      foreach ($colors_value as $key => $value) {
+      $code = nap_color_attribute($value->slug);
+
+      if ($code != '' && stristr($search['pa_couleur'], $code)) {
+      $filter = "selected";
+      }
+      }
+      }
+      }
+      /*$attributes = array('Univers' => 'pa_univers', 'Matiére' => 'pa_matiere', 'Format' => 'pa_format', 'Couleurs' => 'pa_couleur');
+      foreach ($attributes as $key => $value) :
+      if($value = 'pa_couleur' )
+      $filter= nap_filter_attribute($post_ID,$search[$value],$value,true);
+      else
+      $filter= nap_filter_attribute($post_ID,$search[$value],$value);
+      endforeach; */
+    /* if (isset($search['pa_format']) && $search['pa_format'] != '') {
+      $format_value = get_the_terms($post_ID, 'pa_format');
+
+      $filter = "hidden";
+      if (is_array($format_value)) {
+      foreach ($format_value as $key => $value) {
+
+      if (stristr($search['pa_format'], $value->name)) {
+      $filter = "selected";
+      }
+      }
+      }
+      }
+
+      if (isset($search['pa_matiere']) && $search['pa_matiere'] != '') {
+      $format_value = get_the_terms($post_ID, 'pa_matiere');
+
+      $filter = "hidden";
+      if (is_array($format_value)) {
+      foreach ($format_value as $key => $value) {
+
+      if (stristr($search['pa_matiere'], $value->name)) {
+      $filter = "selected";
+      }
+      }
+      }
+      } */
 
     if (isset($filter))
         $class = $filter;
@@ -531,7 +538,8 @@ function nap_get_item($post_ID, $args = null, $current_page = '', $options = nul
         $nap_article.='</ul>';
     endif;
     $nap_article.='</figure>
-    <h3 class = "font-small" >' . get_the_title($post_ID) . '</h3>
+        
+    <h3 class = "font-small" >' . $title_item . '</h3>
     </article>';
 
     return $nap_article;
@@ -718,3 +726,20 @@ function nap_trash_fiche_technique($post_id) {
     $wpdb->delete($table, array('meta_key' => 'fiche_simple_auto', 'meta_value' => $post->post_title));
     $wpdb->delete($table, array('meta_key' => 'fiche_var_auto', 'meta_value' => $post->post_title));
 }
+
+
+add_action( 'pre_get_posts', 'nap_change_filter_post' );
+function nap_change_filter_post() {
+	global $wp_query;
+	if(is_admin()) {
+		if(!empty($wp_query->query_vars['product_cat'])) {
+			setcookie("product_cat", $wp_query->query_vars['product_cat']);
+		}
+		if(!isset($_GET['product_cat']) && ($_GET['post_type'] == 'product')) {
+			$wp_query->query_vars['product_cat'] = $_COOKIE['product_cat'];
+		}
+		elseif(isset($_GET['product_cat']) && empty($_GET['product_cat'])) {
+			setcookie("product_cat", $wp_query->query_vars['product_cat']);
+		}
+	}
+}