AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-02-28 19:04:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tons of UI and code cleanups, renamed many sql tables and fields, started adding created_at and updated_at fields

Browse Source
This commit is contained in:
root
2019-05-17 01:09:16 -04:00
parent 4b3c2c8c2a
commit fa08853640
72 changed files with 1625 additions and 3305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
client_recurring.php
View File

@@ -1,15 +1,15 @@
<?php
$sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoices, invoices
WHERE invoices.invoice_id = recurring_invoices.invoice_id
$sql = mysqli_query($mysqli,"SELECT * FROM recurring, invoices
WHERE invoices.invoice_id = recurring.invoice_id
AND invoices.client_id = $client_id
ORDER BY recurring_invoices.recurring_invoice_id DESC");
ORDER BY recurring.recurring_id DESC");
?>
<div class="card">
<div class="card-header">
<h6 class="float-left mt-1"><i class="fa fa-copy"></i> Recurring Invoices</h6>
<button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addRecurringInvoiceModal"><i class="fa fa-plus"></i></button>
<button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addRecurringModal"><i class="fa fa-plus"></i></button>
</div>
<div class="card-body">
@@ -29,17 +29,17 @@
<?php
while($row = mysqli_fetch_array($sql)){
$recurring_invoice_id = $row['recurring_invoice_id'];
$recurring_invoice_frequency = $row['recurring_invoice_frequency'];
$recurring_invoice_status = $row['recurring_invoice_status'];
$recurring_invoice_start_date = $row['recurring_invoice_start_date'];
$recurring_invoice_last_sent = $row['recurring_invoice_last_sent'];
if($recurring_invoice_last_sent == 0){
$recurring_invoice_last_sent = "-";
$recurring_id = $row['recurring_id'];
$recurring_frequency = $row['recurring_frequency'];
$recurring_status = $row['recurring_status'];
$recurring_start_date = $row['recurring_start_date'];
$recurring_last_sent = $row['recurring_last_sent'];
if($recurring_last_sent == 0){
$recurring_last_sent = "-";
}
$recurring_invoice_next_date = $row['recurring_invoice_next_date'];
$recurring_next_date = $row['recurring_next_date'];
$invoice_id = $row['invoice_id'];
if($recurring_invoice_status == 1){
if($recurring_status == 1){
$status = "Active";
$status_badge_color = "success";
}else{
@@ -50,10 +50,10 @@
?>
<tr>
<td><?php echo ucwords($recurring_invoice_frequency); ?>ly</td>
<td><?php echo $recurring_invoice_start_date; ?></td>
<td><?php echo $recurring_invoice_last_sent; ?></td>
<td><?php echo $recurring_invoice_next_date; ?></td>
<td><?php echo ucwords($recurring_frequency); ?>ly</td>
<td><?php echo $recurring_start_date; ?></td>
<td><?php echo $recurring_last_sent; ?></td>
<td><?php echo $recurring_next_date; ?></td>
<td>
<span class="p-2 badge badge-<?php echo $status_badge_color; ?>">
<?php echo $status; ?>
@@ -65,11 +65,11 @@
<i class="fas fa-ellipsis-h"></i>
</button>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item" href="recurring_invoice.php?recurring_invoice_id=<?php echo $recurring_invoice_id; ?>">Edit</a>
<?php if($recurring_invoice_status == 1){ ?>
<a class="dropdown-item" href="post.php?recurring_deactivate=<?php echo $recurring_invoice_id; ?>">Deactivate</a>
<a class="dropdown-item" href="recurring_invoice.php?recurring_id=<?php echo $recurring_id; ?>">Edit</a>
<?php if($recurring_status == 1){ ?>
<a class="dropdown-item" href="post.php?recurring_deactivate=<?php echo $recurring_id; ?>">Deactivate</a>
<?php }else{ ?>
<a class="dropdown-item" href="post.php?recurring_activate=<?php echo $recurring_invoice_id; ?>">Activate</a>
<a class="dropdown-item" href="post.php?recurring_activate=<?php echo $recurring_id; ?>">Activate</a>
<?php } ?>
<a class="dropdown-item" href="post.php?delete_invoice=<?php echo $invoice_id; ?>">Delete</a>
</div>
@@ -79,8 +79,6 @@
<?php
//include("edit_invoice_modal.php");
include("add_invoice_copy_modal.php");
}
?>
@@ -91,4 +89,4 @@
</div>
</div>
<?php include("add_recurring_invoice_modal.php"); ?>
<?php include("add_recurring_modal.php"); ?>