From 0de45ebb1be2c9d07f27c4d38e1ad9f400eef2c2 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 30 Nov 2017 10:32:20 -0500
Subject: [PATCH] Invoice types - parent ordering of invoice types

Now the invoice types can be order correctly based on parent they belong
to. Only the top level parent show in the drop down for parent
selection.
---
 classes/data/dataInvoiceTypes.php      | 13 +++++++++----
 models/admin/settings/invoiceTypes.php |  4 ++--
 views/admin/settings/invoiceTypes.html | 20 ++++++++++++--------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/classes/data/dataInvoiceTypes.php b/classes/data/dataInvoiceTypes.php
index cb74304..7e3ae96 100644
--- a/classes/data/dataInvoiceTypes.php
+++ b/classes/data/dataInvoiceTypes.php
@@ -129,13 +129,18 @@ class GlmDataInvoiceTypes extends GlmDataAbstract
                 'use'   => 'a',
             ),
 
-            // Parent
+            // Parent - for adding, deleting and editing, has selection tabels
             'parent' => array(
                 'field' => 'parent',
-                'type'  => 'integer',
-                'use'   => 'a'
+                'type' => 'pointer',
+                    'p_table' => GLM_MEMBERS_BILLING_PLUGIN_DB_PREFIX . 'invoice_types',
+                    'p_field' => 'name',
+                    'p_orderby' => 'name',
+                    'p_blank' => true,
+                'force_list' => true,
+                'required' => false,
+                'use' => 'a'
             ),
-
             // Amount
             'amount' => array(
                 'field' => 'amount',
diff --git a/models/admin/settings/invoiceTypes.php b/models/admin/settings/invoiceTypes.php
index 39ca9da..12049c8 100644
--- a/models/admin/settings/invoiceTypes.php
+++ b/models/admin/settings/invoiceTypes.php
@@ -139,7 +139,7 @@ class GlmMembersAdmin_settings_invoiceTypes extends GlmDataInvoiceTypes
         // Get a current list of members
         $invoiceTypes = $this->getList();
 
-        echo '<pre>$invoiceTypes: ' . print_r( $invoiceTypes, true ) . '</pre>';
+        // echo '<pre>$invoiceTypes: ' . print_r( $invoiceTypes, true ) . '</pre>';
 
         // If we have list entries - even if it's an empty list
         $success          = true;
@@ -156,7 +156,7 @@ class GlmMembersAdmin_settings_invoiceTypes extends GlmDataInvoiceTypes
 
         // Sort results by higherarchy (Parent/Child and Alpha)
         $invoiceTypes = $this->sortParentChild($invoiceTypes);
-        echo '<pre>$invoiceTypes: ' . print_r( $invoiceTypes, true ) . '</pre>';
+        // echo '<pre>$invoiceTypes: ' . print_r( $invoiceTypes, true ) . '</pre>';
 
 
         // If we had a fatal error, redirect to the error page
diff --git a/views/admin/settings/invoiceTypes.html b/views/admin/settings/invoiceTypes.html
index 0c9bd7b..92334dd 100644
--- a/views/admin/settings/invoiceTypes.html
+++ b/views/admin/settings/invoiceTypes.html
@@ -21,8 +21,10 @@
                         <select name="parent">
                             <option value="0">(none)</option>
                             {if $haveInvoiceTypes}
-                                {foreach $invoiceTypes as $type}
-                                    <option value="{$type.id}">{$type.name}</option>
+                                {foreach $invoiceTypes as $t}
+                                    {if !$t.parent.value} <!-- don't show child categories -->
+                                        <option value="{$t.id}">{$t.name}</option>
+                                    {/if}
                                 {/foreach}
                             {/if}
                         </select>
@@ -47,7 +49,9 @@
                         <select name="recurrence">
                             <option value="">(none)</option>
                                 {foreach $recurrenceTypes as $typeId => $typeLabel}
-                                    <option value="{$typeId}">{$typeLabel}</option>
+                                    {if !$t.parent.value} <!-- don't show child categories -->
+                                        <option value="{$typeId}">{$typeLabel}</option>
+                                    {/if}
                                 {/foreach}
                         </select>
                     </td>
@@ -87,9 +91,9 @@
                         <select id="edit-parent" name="parent">
                             <option value="0">(none)</option>
                                 {if $haveInvoiceTypes}
-                                    {foreach $invoiceTypes as $type}
-                                        {if !$type.parent.value} <!-- don't show child categories -->
-                                            <option value="{$type.id}">{$type.name}</option>
+                                    {foreach $invoiceTypes as $t}
+                                        {if !$t.parent.value} <!-- don't show child categories -->
+                                            <option value="{$t.id}">{$t.name}</option>
                                         {/if}
                                     {/foreach}
                                 {/if}
@@ -155,7 +159,7 @@
                                 <a class="editInvoiceType"
                                     data-invoice-id="{$t.id}"
                                     data-invoice-name="{$t.name}"
-                                    data-invoice-parent="{$t.parent}"
+                                    data-invoice-parent="{$t.parent.value}"
                                     data-invoice-amount="{$t.amount}"
                                     data-invoice-recurring="{$t.recurring.value}"
                                     data-invoice-recurrence="{$t.recurrence}">{$t.name}</a>
@@ -203,6 +207,7 @@
                 var invoiceID         = $(this).data('invoice-id');
                 var invoiceName       = $(this).data('invoice-name');
                 var invoiceParent     = $(this).data('invoice-parent');
+                console.log(invoiceParent);
                 var invoiceAmount     = $(this).data('invoice-amount');
                 var invoiceRecurring  = $(this).data('invoice-recurring');
                 var invoiceRecurrence = $(this).data('invoice-recurrence');
@@ -215,7 +220,6 @@
                 if ( invoiceRecurring === 1 ) {
                     $('#edit-recurring').prop( 'checked', true );
                 }
-                console.log(invoiceRecurring);
                 $('#edit-recurrence').val( invoiceRecurrence );
 
                 $("#editInvoiceTypeDialog").dialog("open");
-- 
2.17.1