AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gave recurring invoice details a similair look as quote and invoice reverted the isset note in recurring

This commit is contained in:
johnny@pittpc.com 2019-09-18 23:28:23 -04:00
parent 0d3c82ecf0
commit d5f6d6dd18
3 changed files with 66 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
edit_item_modal.php
View File

@ -8,7 +8,7 @@
</button>
</div>
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
<input type="hidden" name="item_id" value="<?php echo $item_id; ?>">
<input type="hidden" name="balance" value="<?php echo $balance; ?>">
<div class="modal-body bg-white">
@ -65,7 +65,7 @@
</div>
<div class="modal-footer bg-white">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
<button type="submit" name="add_payment" class="btn btn-primary">Save</button>
<button type="submit" name="edit_item" class="btn btn-primary">Save</button>
</div>
</form>
</div>

2
post.php
View File

@ -2028,7 +2028,7 @@ if(isset($_POST['save_recurring'])){
}
if(!empty($_POST['recurring_note'])){
if(isset($_POST['recurring_note'])){
$recurring_note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['recurring_note']));

131
recurring_invoice.php
View File

@ -61,12 +61,11 @@ if(isset($_GET['recurring_id'])){
<span class="ml-3 p-2 badge badge-<?php echo $status_badge_color; ?>"><?php echo $status; ?></span>
</ol>
<form class="d-print-none" action="post.php" method="post">
<form action="post.php" method="post">
<input type="hidden" name="recurring_id" value="<?php echo $recurring_id; ?>">
<div class="row mb-4 d-print-none">
<div class="col-md-4">
<button class="btn btn-success btn-sm" type="submit" name="save_recurring">Save</button>
<button class="btn btn-success btn-sm" type="submit" name="save_recurring"><i class="fa fa-fw fa-check"></i> Save</button>
</div>
<div class="col-md-8">
<div class="dropdown dropleft text-center">
@ -84,67 +83,64 @@ if(isset($_GET['recurring_id'])){
</div>
</div>
</div>
</div>
</div>
<hr class="d-print-none">
<div class="row mb-4">
<div class="col-sm">
<div class="card">
<div class="card-header">
From
</div>
<div class="card-body">
<ul class="list-unstyled">
<li><strong><?php echo $config_company_name; ?></strong></li>
<li><?php echo $config_company_address; ?></li>
<li class="mb-3"><?php echo "$config_company_city $config_company_state $config_company_zip"; ?></li>
<li><?php echo $config_company_phone; ?></li>
<li><?php echo $config_company_email; ?></li>
</ul>
</div>
</div>
<div class="col-sm-2">
<img class="img-fluid" src="<?php echo $config_invoice_logo; ?>">
</div>
<div class="col-sm">
<div class="card">
<div class="card-header">
Bill To
</div>
<div class="card-body">
<ul class="list-unstyled">
<li><strong><?php echo $client_name; ?></strong></li>
<li><?php echo $client_address; ?></li>
<li class="mb-3"><?php echo "$client_city $client_state $client_zip"; ?></li>
<li><?php echo $client_phone; ?></li>
<li><?php echo $client_email; ?></li>
</ul>
</div>
</div>
</div>
<div class="col-sm">
<div class="card">
<div class="card-header">
Details
</div>
<div class="card-body">
<ul class="list-unstyled">
<li class="mb-1"><strong>Frequency:</strong> <div class="float-right"><?php echo ucwords($recurring_frequency); ?>ly</div></li>
<li class="mb-1"><strong>Start Date:</strong> <div class="float-right"><?php echo $recurring_start_date; ?></div></li>
<li class="mb-1"><strong>Next Date:</strong> <div class="float-right"><?php echo $recurring_next_date; ?></div></li>
<li class="mb-1"><strong>Last Sent:</strong> <div class="float-right"><?php echo $recurring_last_sent; ?></div></li>
<li class="mb-1"><strong>Net Terms:</strong> <div class="float-right"><?php echo $client_net_terms; ?> Day</div></li>
</ul>
</div>
</div>
<div class="col-sm-10">
<h3 class="text-right"><strong>Recurring Invoice</strong><br><small class="text-secondary"><?php echo ucwords($recurring_frequency); ?>ly</small></h3>
</div>
</div>
<div class="row mb-4">
<div class="col-sm">
<ul class="list-unstyled">
<li><h4><strong><?php echo $config_company_name; ?></strong></h4></li>
<li><?php echo $config_company_address; ?></li>
<li><?php echo "$config_company_city $config_company_state $config_company_zip"; ?></li>
<li>P: <?php echo $config_company_phone; ?></li>
<li><?php echo $config_company_email; ?></li>
</ul>
</div>
<div class="col-sm">
<ul class="list-unstyled text-right">
<li><h4><strong><?php echo $client_name; ?></strong></h4></li>
<li><?php echo $client_address; ?></li>
<li><?php echo "$client_city $client_state $client_zip"; ?></li>
<li>P: <?php echo $client_phone; ?></li>
<li>E: <?php echo $client_email; ?></li>
</ul>
</div>
</div>
<div class="row mb-4">
<div class="col-sm-8">
</div>
<div class="col-sm-4">
<table class="table">
<tr>
<td>Start Date</td>
<td class="text-right"><?php echo $recurring_start_date; ?></td>
</tr>
<tr>
<td>Next Date</td>
<td class="text-right"><?php echo $recurring_next_date; ?></td>
</tr>
<tr>
<td>Last Sent</td>
<td class="text-right"><?php echo $recurring_last_sent; ?></td>
</tr>
</table>
</div>
</div>
<?php $sql_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE recurring_id = $recurring_id ORDER BY item_id ASC"); ?>
<div class="row mb-4">
<div class="col-md-12">
<div class="card">
<div class="card-header">
Items
</div>
<table class="table">
<thead>
@ -176,7 +172,10 @@ if(isset($_GET['recurring_id'])){
?>
<tr>
<td class="text-center d-print-none"><a class="btn btn-danger btn-sm" href="post.php?delete_recurring_item=<?php echo $item_id; ?>"><i class="fa fa-trash"></i></a></td>
<td class="text-center d-print-none">
<a class="text-secondary" href="#" data-toggle="modal" data-target="#editItemModal<?php echo $item_id; ?>"><i class="fa fa-fw fa-edit"></i></a>
<a class="text-danger" href="post.php?delete_recurring_item=<?php echo $item_id; ?>"><i class="fa fa-fw fa-trash-alt"></i></a>
</td>
<td><?php echo $item_name; ?></td>
<td><?php echo $item_description; ?></td>
<td class="text-center"><?php echo $item_quantity; ?></td>
@ -192,16 +191,15 @@ if(isset($_GET['recurring_id'])){
?>
<tr class="d-print-none">
<td></td>
<input type="hidden" name="recurring_id" value="<?php echo $recurring_id; ?>">
<td><input type="text" class="form-control" name="name"></td>
<td><textarea class="form-control" rows="1" name="description"></textarea></td>
<td><input type="text" class="form-control" style="text-align: center;" name="qty"></td>
<td><input type="text" class="form-control" style="text-align: right;" name="price"></td>
<td></td>
<td><input type="text" class="form-control" name="name" placeholder="Product"></td>
<td><textarea class="form-control" rows="1" name="description" placeholder="Description"></textarea></td>
<td><input type="number" step="0.01" min="0" class="form-control" style="text-align: center;" name="qty" placeholder="Quantity"></td>
<td><input type="number" step="0.01" min="0" class="form-control" style="text-align: right;" name="price" placeholder="Price"></td>
<td>
<select dir="rtl" class="form-control" name="tax">
<option value="0.00">None</option>
<option value="0.07">State Tax 7%</option>
<option <?php if($item_tax == '0.00'){ echo "selected"; } ?> value="0.00">None</option>
<option <?php if($item_tax == '0.07'){ echo "selected"; } ?> value="0.07">State Tax 7%</option>
</select>
</td>
<td></td>
@ -214,15 +212,12 @@ if(isset($_GET['recurring_id'])){
<div class="row mb-4">
<div class="col-7">
<div class="card">
<div class="card-header">
Notes
</div>
<div class="card d-none d-print-block">
<div class="card-body">
<div class="d-none d-print-block"><?php echo $recurring_note; ?></div>
<textarea rows="6" class="form-control mb-2 d-print-none" name="recurring_note"><?php echo $recurring_note; ?></textarea>
<div><?php echo $recurring_note; ?></div>
</div>
</div>
<textarea rows="6" class="form-control mb-2 d-print-none" name="recurring_note" placeholder="Notes"><?php echo $recurring_note; ?></textarea>
</div>
<div class="col-3 offset-2">
<table class="table table-borderless">