From f7d4e58c17d78766fc299314b21b4e828eb8a44d Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 19 Jul 2017 15:15:59 -0400
Subject: [PATCH] Redo order for the output

Use first query to get main levels in order. Then going through each
main level get the sub packages.
---
 lib/troutcreek-packages.php | 41 ++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/lib/troutcreek-packages.php b/lib/troutcreek-packages.php
index 23537e7..95d1130 100644
--- a/lib/troutcreek-packages.php
+++ b/lib/troutcreek-packages.php
@@ -143,36 +143,35 @@ function troutcreekPackagesShortcode( $atts )
     extract( shortcode_atts( array( 'limit' => '10' ), $atts ) );
     ob_start();
     global $wp;
-    //$custom_terms = get_terms( CATEGORY_SLUG );
+    // Get all top level posts
+    $topArgs = array(
+        'orderby'     => 'menu_order',
+        'order'       => 'ASC',
+        'post_type'   => POST_TYPE,
+        'post_parent' => 0
+    );
+    $parentPosts = get_posts( $topArgs );
     echo '<div class="package-container">';
-    //foreach($custom_terms as $custom_term) {
+    foreach( $parentPosts as $parentPost ) {
+        //echo '<pre>$parentPost: ' . print_r( $parentPost, true ) . '</pre>';
         wp_reset_query();
         $args = array(
             'posts_per_page' => -1,
-            'post_type'     => POST_TYPE,
-            'orderby'       => 'menu_order',
-            'order'         => 'ASC',
-            //'tax_query'     => array(
-                //array(
-                    //'taxonomy' => CATEGORY_SLUG,
-                    //'field' => 'slug',
-                    //'terms' => $custom_term->slug,
-                //),
-            //),
+            'post_type'      => POST_TYPE,
+            'orderby'        => 'menu_order',
+            'order'          => 'ASC',
+            'post_parent'    => $parentPost->ID
          );
 
-        $loop = new WP_Query($args);
-        if($loop->have_posts()) {
+        $loop = new WP_Query( $args );
+        //echo '<pre>$loop: ' . print_r( $loop, true ) . '</pre>';
+        if ( $loop->have_posts() ) {
         echo "<div class='package-container-$custom_term->term_id'>";
-        echo "<h2 class='$custom_term->term_id'>".$custom_term->name.'</h2>';
+        echo '<h2 id="tcp-' . $parentPost->post_title .  '">'.$parentPost->post_title.'</h2>';
         echo '<ul>';
-        while($loop->have_posts()) : $loop->the_post();
+        while ( $loop->have_posts() ) : $loop->the_post();
             // Get the image
             $thumbnail = get_the_post_thumbnail( null, 'packageList' );
-            if ( !$thumbnail ) {
-                echo '<h2 id="tcp-' . get_the_title() . '">' . get_the_title() . '</h2>';
-                continue;
-            }
             // Get the meta data
             $custom    = get_post_custom();
             //echo '<pre>$custom: ' . print_r( $custom, true ) . '</pre>';
@@ -206,7 +205,7 @@ function troutcreekPackagesShortcode( $atts )
         echo '</div>';
        }
 
-    //}
+    }
     echo '</div>';
     $output = ob_get_contents();
     ob_end_clean();
-- 
2.17.1