Updating link for view/print invoice after one is created

This is from the create invoice screen under the member area.

diff --git a/models/admin/billing/invoices.php b/models/admin/billing/invoices.php
index 0b150ed..14ac926 100644 (file)
--- a/models/admin/billing/invoices.php
+++ b/models/admin/billing/invoices.php
@@ -693,7 +693,7 @@ class GlmMembersAdmin_billing_invoices extends GlmDataInvoices
             $where = implode( ' AND ', $where_params );
 
             // Get the list of invoices and determine number of invoices in list
-            $orderBy = 'due_date ASC, transaction_time DESC';
+            $orderBy = 'due_date DESC, transaction_time DESC';
             $this->line_items_post = true;
             $invoicesResult = $this->getList($where, $orderBy, true, 'id', $start, $limit);
             $totalInvoices = $this->getStats($where);

diff --git a/models/admin/member/billing.php b/models/admin/member/billing.php
index aadad5a..75eaf4b 100644 (file)
--- a/models/admin/member/billing.php
+++ b/models/admin/member/billing.php
@@ -302,7 +302,7 @@ class GlmMembersAdmin_member_billing // extends GlmDataBilling
                         )
                     );
                     $BillingSupport->recordInvoice( $invoiceId, $accountId, $amount );
-                    $invoiceSuccess = true;
+                    $invoiceSuccess = $invoiceId;
                 }
             } else {
                 $invoiceError = true;

diff --git a/views/admin/billing/createInvoice.html b/views/admin/billing/createInvoice.html
index 02fa8d1..b8bd5eb 100644 (file)
--- a/views/admin/billing/createInvoice.html
+++ b/views/admin/billing/createInvoice.html
@@ -15,7 +15,12 @@
 
     {if $invoiceSuccess}
         <p>
-        Invoice is Created. <a href="{$thisUrl}?page={$thisPage}&glm_action=billing&member={$memberID}">View Invoice</a>
+        Invoice is Created.
+        {if $settings.invoice_pdf_enabled}
+        <a target="_blank" href="{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=createPDFInvoice&id={$invoiceSuccess}">Print Invoice</a>
+        {else}
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=billing&option=view&member={$memberID}&id={$invoiceSuccess}">View Invoice</a>
+        {/if}
         </p>
 
     {else}