ThaMunsta/itflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Invoice Overhaul, added edit item, reorganized drop down menus etc

Browse Source
This commit is contained in:
johnny@pittpc.com
2020-02-06 23:08:41 -05:00
parent 18444189c8
commit 377bf55210
8 changed files with 396 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
add_payment_modal.php
+19 -2
View File
@@ -2,7 +2,7 @@
<div class="modal-dialog">
<div class="modal-content bg-dark">
<div class="modal-header text-white">
<h5 class="modal-title"><i class="fa fa-fw fa-money-bill-alt mr-2"></i>Add Payment</h5>
<h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i><?php echo $invoice_number; ?>: Add Payment</h5>
<button type="button" class="close text-white" data-dismiss="modal">
<span aria-hidden="true">&times;</span>
</button>
@@ -12,6 +12,9 @@
<input type="hidden" name="balance" value="<?php echo $balance; ?>">
<div class="modal-body bg-white">
<div class="form-row">
<div class="col">
<div class="form-group">
<label>Date <strong class="text-danger">*</strong></label>
<div class="input-group">
@@ -22,6 +25,10 @@
</div>
</div>
</div>
<div class="col">
<div class="form-group">
<label>Amount <strong class="text-danger">*</strong></label>
<div class="input-group">
@@ -32,6 +39,10 @@
</div>
</div>
</div>
</div>
<div class="form-group">
<label>Account <strong class="text-danger">*</strong></label>
<div class="input-group">
@@ -104,11 +115,17 @@
<input type="text" class="form-control" name="reference" placeholder="Enter a reference">
</div>
</div>
<div class="form-group">
<label>Email Receipt</label>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_receipt" value="1" >
<label class="custom-control-label" for="customControlAutosizing">Email Reciept</label>
<label class="custom-control-label" for="customControlAutosizing"><?php echo $client_email; ?></label>
</div>
</div>
</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>
edit_invoice_item_modal.php
+84
View File
@@ -0,0 +1,84 @@
<div class="modal" id="editInvoiceItemModal<?php echo $item_id; ?>" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content bg-dark">
<div class="modal-header text-white">
<h5 class="modal-title"><i class="fa fa-fw fa-edit mr-2"></i>Edit Line Item: <?php echo $item_name; ?></h5>
<button type="button" class="close text-white" data-dismiss="modal">
<span aria-hidden="true">&times;</span>
</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; ?>">
<div class="modal-body bg-white">
<div class="form-group">
<label>Item <strong class="text-danger">*</strong></label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-box"></i></span>
</div>
<input type="text" class="form-control" name="name" value="<?php echo $item_name; ?>" required>
</div>
</div>
<div class="form-group">
<label>Description</label>
<div class="input-group">
<textarea class="form-control" rows="5" name="description"><?php echo $item_description; ?></textarea>
</div>
</div>
<div class="form-row">
<div class="col">
<div class="form-group">
<label>QTY <strong class="text-danger">*</strong></label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
</div>
<input type="number" class="form-control" step="0.01" min="0" name="qty" value="<?php echo $item_quantity; ?>" required>
</div>
</div>
</div>
<div class="col">
<div class="form-group">
<label>Price <strong class="text-danger">*</strong></label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
</div>
<input type="number" class="form-control" step="0.01" min="0" name="price" value="<?php echo $item_price; ?>" required>
</div>
</div>
</div>
</div>
<div class="form-group">
<label>Tax <strong class="text-danger">*</strong></label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
</div>
<select class="form-control select2" name="tax">
<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>
</div>
</div>
</div>
<div class="modal-footer bg-white">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
<button type="submit" name="edit_item" class="btn btn-primary">Save</button>
</div>
</form>
</div>
</div>
</div>
edit_item_modal.php
-71
View File
@@ -1,71 +0,0 @@
<div class="modal" id="editItemModal<?php echo $item_id; ?>" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content bg-dark">
<div class="modal-header text-white">
<h5 class="modal-title"><i class="fa fa-fw fa-edit mr-2"></i><?php echo $item_name; ?></h5>
<button type="button" class="close text-white" data-dismiss="modal">
<span aria-hidden="true">&times;</span>
</button>
</div>
<form action="post.php" method="post" autocomplete="off">
<input type="text" name="invoice_id" value="<?php echo $invoice_id; ?>">
<input type="text" name="item_id" value="<?php echo $item_id; ?>">
<input type="text" name="balance" value="<?php echo $balance; ?>">
<div class="modal-body bg-white">
<div class="form-group">
<label>Item <strong class="text-danger">*</strong></label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-box"></i></span>
</div>
<input type="text" class="form-control" name="item" value="<?php echo $item_name; ?>" required>
</div>
</div>
<div class="form-group">
<label>Description</label>
<div class="input-group">
<textarea class="form-control" name="description"><?php echo $item_description; ?></textarea>
</div>
</div>
<div class="form-group">
<label>QTY <strong class="text-danger">*</strong></label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
</div>
<input type="number" class="form-control" step="0.01" min="0" name="qty" value="<?php echo $item_quantity; ?>" required>
</div>
</div>
<div class="form-group">
<label>Price <strong class="text-danger">*</strong></label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
</div>
<input type="number" class="form-control" step="0.01" min="0" name="price" value="<?php echo $item_price; ?>" required>
</div>
</div>
<div class="form-group">
<label>Tax <strong class="text-danger">*</strong></label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
</div>
<input type="number" class="form-control" step="0.01" min="0" name="tax" value="<?php echo $item_tax; ?>" required>
</div>
</div>
</div>
<div class="modal-footer bg-white">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
<button type="submit" name="edit_item" class="btn btn-primary">Save</button>
</div>
</form>
</div>
</div>
</div>
guest_view_invoice.php
+1 -1
View File
@@ -184,7 +184,7 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
<div class="row mb-4">
<div class="col-md-12">
<div class="card">
<table class="table table-striped">
<table class="table">
<thead>
<tr>
<th>Product</th>
invoice.php
+70 -24
View File
@@ -92,16 +92,31 @@ if(isset($_GET['invoice_id'])){
<?php } ?>
</ol>
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
<div class="card">
<div class="card-header d-print-none">
<div class="row">
<div class="col-md-4">
<button class="btn btn-success btn-sm" type="submit" name="save_invoice"><i class="fa fa-fw fa-check"></i> Save</button>
<?php if($invoice_status == 'Draft'){ ?>
<button class="btn btn-success btn-sm dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fas fa-fw fa-paper-plane"></i> Send
</button>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item" href="post.php?email_invoice=<?php echo $invoice_id; ?>">Send Email</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="post.php?mark_invoice_sent=<?php echo $invoice_id; ?>">Mark Sent</a>
</div>
<?php } ?>
<?php if($invoice_status !== 'Paid' and $invoice_status !== 'Cancelled' and $invoice_status !== 'Draft'){ ?>
<a class="btn btn-success btn-sm" href="#" data-toggle="modal" data-target="#addPaymentModal"><i class="fa fa-fw fa-credit-card"></i> Pay</a>
<?php } ?>
</div>
<div class="col-md-8">
<div class="dropdown dropleft text-center">
<button class="btn btn-primary btn-sm float-right" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fas fa-fw fa-ellipsis-v"></i>
@@ -109,21 +124,24 @@ if(isset($_GET['invoice_id'])){
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#editInvoiceModal<?php echo $invoice_id; ?>">Edit</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addInvoiceCopyModal<?php echo $invoice_id; ?>">Copy</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addInvoiceRecurringModal<?php echo $invoice_id; ?>">Create Recurring</a>
<a class="dropdown-item" href="post.php?email_invoice=<?php echo $invoice_id; ?>">Send</a>
<?php if($invoice_status == 'Draft'){ ?><a class="dropdown-item" href="post.php?mark_invoice_sent=<?php echo $invoice_id; ?>">Mark Sent</a><?php } ?>
<?php if($invoice_status !== 'Paid' and $invoice_status !== 'Cancelled'){ ?><a class="dropdown-item" href="#" data-toggle="modal" data-target="#addPaymentModal">Add Payment</a><?php } ?>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addInvoiceRecurringModal<?php echo $invoice_id; ?>">Recurring</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#" onclick="window.print();">Print</a>
<a class="dropdown-item" href="guest_view_invoice.php?invoice_id=<?php echo "$invoice_id&url_key=$invoice_url_key"; ?>">Guest URL</a>
<a class="dropdown-item" href="post.php?pdf_invoice=<?php echo $invoice_id; ?>">PDF</a>
<?php if($invoice_status !== 'Cancelled' and $invoice_status !== 'Paid'){ ?>
<a class="dropdown-item" href="guest_view_invoice.php?invoice_id=<?php echo "$invoice_id&url_key=$invoice_url_key"; ?>">Guest URL</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="post.php?cancel_invoice=<?php echo $invoice_id; ?>">Cancel</a>
<?php } ?>
</div>
</div>
</div>
</div>
</div>
<div class="card-body">
<div class="row mb-4">
@@ -187,9 +205,9 @@ if(isset($_GET['invoice_id'])){
<thead>
<tr>
<th class="d-print-none"></th>
<th>Product</th>
<th>Item</th>
<th>Description</th>
<th class="text-center">Qty</th>
<th class="text-center">QTY</th>
<th class="text-right">Price</th>
<th class="text-right">Tax</th>
<th class="text-right">Total</th>
@@ -234,19 +252,25 @@ if(isset($_GET['invoice_id'])){
?>
<tr class="d-print-none">
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
<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="text" class="form-control" name="name" placeholder="Item"></td>
<td><textarea class="form-control" rows="2" 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="QTY"></td>
<td><input type="number" step="0.01" class="form-control" style="text-align: right;" name="price" placeholder="Price"></td>
<td>
<select dir="rtl" class="form-control" name="tax">
<select class="form-control select2" name="tax">
<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>
<td>
<button class="btn btn-link text-success" type="submit" name="add_invoice_line_item">
<i class="fa fa-fw fa-check"></i>
</button>
</td>
</form>
</tr>
</tbody>
</table>
@@ -256,12 +280,19 @@ if(isset($_GET['invoice_id'])){
<div class="row mb-4">
<div class="col-7">
<div class="card d-none d-print-block">
<div class="card">
<div class="card-header">
Notes
<div class="card-tools d-print-none">
<a href="#" class="btn btn-tool" data-toggle="modal" data-target="#invoiceNoteModal">
<i class="fas fa-edit"></i>
</a>
</div>
</div>
<div class="card-body">
<div><?php echo $invoice_note; ?></div>
</div>
</div>
<textarea rows="6" class="form-control mb-2 d-print-none" name="invoice_note" placeholder="Notes"><?php echo $invoice_note; ?></textarea>
</div>
<div class="col-3 offset-2">
<table class="table table-borderless">
@@ -297,8 +328,6 @@ if(isset($_GET['invoice_id'])){
</div>
</div>
</form>
<hr class="d-none d-print-block mt-5">
<center class="d-none d-print-block"><?php echo $config_invoice_footer; ?></center>
@@ -309,7 +338,15 @@ if(isset($_GET['invoice_id'])){
<div class="col-sm">
<div class="card">
<div class="card-header">
History
<i class="fa fa-fw fa-history"></i> History
<div class="card-tools">
<button type="button" class="btn btn-tool" data-card-widget="collapse">
<i class="fas fa-minus"></i>
</button>
<button type="button" class="btn btn-tool" data-card-widget="remove">
<i class="fas fa-times"></i>
</button>
</div>
</div>
<div class="card-body">
<table class="table">
@@ -346,7 +383,15 @@ if(isset($_GET['invoice_id'])){
<div class="col-sm d-print-none">
<div class="card">
<div class="card-header">
Payments
<i class="fa fa-fw fa-credit-card"></i> Payments
<div class="card-tools">
<button type="button" class="btn btn-tool" data-card-widget="collapse">
<i class="fas fa-minus"></i>
</button>
<button type="button" class="btn btn-tool" data-card-widget="remove">
<i class="fas fa-times"></i>
</button>
</div>
</div>
<div class="card-body">
<table class="table">
@@ -388,9 +433,10 @@ if(isset($_GET['invoice_id'])){
</div>
<?php include("add_payment_modal.php"); ?>
<?php include("edit_invoice_modal.php"); ?>
<?php include("edit_invoice_item_modal.php"); ?>
<?php include("add_invoice_copy_modal.php"); ?>
<?php include("add_invoice_recurring_modal.php"); ?>
<?php include("invoice_note_modal.php"); ?>
<?php
}
}
invoice_note_modal.php
+24
View File
@@ -0,0 +1,24 @@
<div class="modal" id="invoiceNoteModal" tabindex="-1">
<div class="modal-dialog modal-lg">
<div class="modal-content bg-dark">
<div class="modal-header">
<h5 class="modal-title text-white"><i class="fa fa-fw fa-edit mr-2"></i>Invoice Notes</h5>
<button type="button" class="close text-white" data-dismiss="modal">
<span aria-hidden="true">&times;</span>
</button>
</div>
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
<div class="modal-body bg-white">
<div class="form-group">
<textarea class="form-control" rows="8" name="note"><?php echo $invoice_note; ?></textarea>
</div>
</div>
<div class="modal-footer bg-white">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
<button type="submit" name="invoice_note" class="btn btn-primary">Save</button>
</div>
</form>
</div>
</div>
</div>
post.php
+7 -7
View File
@@ -2184,11 +2184,9 @@ if(isset($_GET['delete_invoice'])){
}
if(isset($_POST['save_invoice'])){
if(isset($_POST['add_invoice_line_item'])){
$invoice_id = intval($_POST['invoice_id']);
if(!empty($_POST['name'])){
$name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']));
$description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description']));
$qty = floatval($_POST['qty']);
@@ -2212,18 +2210,20 @@ if(isset($_POST['save_invoice'])){
$_SESSION['alert_message'] = "Item added";
header("Location: " . $_SERVER["HTTP_REFERER"]);
}
if(isset($_POST['invoice_note'])){
$invoice_note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['invoice_note']));
$invoice_id = intval($_POST['invoice_id']);
$note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['note']));
mysqli_query($mysqli,"UPDATE invoices SET invoice_note = '$invoice_note', invoice_updated_at = NOW() WHERE invoice_id = $invoice_id AND company_id = $session_company_id");
mysqli_query($mysqli,"UPDATE invoices SET invoice_note = '$note', invoice_updated_at = NOW() WHERE invoice_id = $invoice_id AND company_id = $session_company_id");
$_SESSION['alert_message'] = "Notes added";
}
header("Location: " . $_SERVER["HTTP_REFERER"]);
}
quote.php
+1 -1
View File
@@ -72,7 +72,7 @@ if(isset($_GET['quote_id'])){
<div class="row">
<div class="col-md-4">
<button class="btn btn-success btn-sm" type="submit" name="save_quote"><i class="fa fa-fw fa-check"></i> Save</button>
<a class="btn btn-success btn-sm" href="post.php?approve_quote=<?php echo $quote_id; ?>"><i class="fa fa-fw fa-check"></i> Approve</a>
</div>
<div class="col-md-8">
<div class="dropdown dropleft text-center">