Merge remote-tracking branch 'origin/develop' into techbar

invoice.php

@@ -193,11 +193,11 @@ if (isset($_GET['invoice_id'])) {
 
             <div class="card-header d-print-none">
 
-            
                 <div class="row">
 
                     <div class="col-8">
                         <?php if (lookupUserPermission("module_sales") >= 2) { ?>
+
                             <?php if ($invoice_status == 'Draft') { ?>
                                 <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
                                     <i class="fas fa-fw fa-paper-plane mr-2"></i>Send
@@ -213,6 +213,7 @@ if (isset($_GET['invoice_id'])) {
                                         <i class="fas fa-fw fa-check mr-2"></i>Mark Sent
                                     </a>
                                 </div>
+                            <?php } ?>
 
                             <?php if ($invoice_status !== 'Paid' && $invoice_status !== 'Cancelled' && $invoice_status !== 'Draft' && $invoice_amount != 0) { ?>
                                 <a class="btn btn-success" href="#" data-toggle="modal" data-target="#addPaymentModal">
@@ -230,7 +231,8 @@ if (isset($_GET['invoice_id'])) {
                                     Mark Non-Billable
                                 </a>
                             <?php } ?>
-                <?php } // End lookup Perm ?>
+
+                        <?php } ?>
                     </div>
 
                     <div class="col-4">
@@ -284,7 +286,6 @@ if (isset($_GET['invoice_id'])) {
                     </div>
 
                 </div>
-            <?php } ?>
 
             </div>