mirror of
https://github.com/itflow-org/itflow
synced 2026-03-02 20:04:53 +00:00
Merge pull request #1200 from itflow-org/recurring-invoices
Recurring invoices
This commit is contained in:
@@ -164,7 +164,7 @@ if (isset($_GET['recurring_invoice_id'])) {
|
|||||||
<i class="fa fa-fw fa-paper-plane text-secondary mr-2"></i>Force Send
|
<i class="fa fa-fw fa-paper-plane text-secondary mr-2"></i>Force Send
|
||||||
</a>
|
</a>
|
||||||
<div class="dropdown-divider"></div>
|
<div class="dropdown-divider"></div>
|
||||||
<a class="dropdown-item text-danger confirm-link" href="post.php?delete_recurring=<?php echo $recurring_invoice_id; ?>">
|
<a class="dropdown-item text-danger confirm-link" href="post.php?delete_recurring_invoice=<?php echo $recurring_invoice_id; ?>">
|
||||||
<i class="fa fa-fw fa-trash mr-2"></i>Delete
|
<i class="fa fa-fw fa-trash mr-2"></i>Delete
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -257,7 +257,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
|
|||||||
</a>
|
</a>
|
||||||
<?php if ($status !== 'Active') { ?>
|
<?php if ($status !== 'Active') { ?>
|
||||||
<div class="dropdown-divider"></div>
|
<div class="dropdown-divider"></div>
|
||||||
<a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_recurring=<?php echo $recurring_invoice_id; ?>">
|
<a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_recurring_invoice=<?php echo $recurring_invoice_id; ?>">
|
||||||
<i class="fas fa-fw fa-trash mr-2"></i>Delete
|
<i class="fas fa-fw fa-trash mr-2"></i>Delete
|
||||||
</a>
|
</a>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
|||||||
@@ -879,7 +879,7 @@ while ($row = mysqli_fetch_array($sql_recurring_invoices)) {
|
|||||||
} //End Recurring Invoices Loop
|
} //End Recurring Invoices Loop
|
||||||
|
|
||||||
// Flag any active recurring "next run" dates that are in the past
|
// Flag any active recurring "next run" dates that are in the past
|
||||||
$sql_invalid_recurring_invoices = mysqli_query($mysqli, "SELECT * FROM recurring_invoices WHERE recurring_invoice_next_date < CURDATE()");
|
$sql_invalid_recurring_invoices = mysqli_query($mysqli, "SELECT * FROM recurring_invoices WHERE recurring_invoice_next_date < CURDATE() AND recurring_invoice_status = 1");
|
||||||
while ($row = mysqli_fetch_array($sql_invalid_recurring_invoices)) {
|
while ($row = mysqli_fetch_array($sql_invalid_recurring_invoices)) {
|
||||||
$invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']);
|
$invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']);
|
||||||
$invoice_number = intval($row['recurring_invoice_number']);
|
$invoice_number = intval($row['recurring_invoice_number']);
|
||||||
|
|||||||
Reference in New Issue
Block a user