Invoice Overhaul, added edit item, reorganized drop down menus etc
This commit is contained in:
johnny@pittpc.com
@@ -2,7 +2,7 @@
|
|||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
<div class="modal-content bg-dark">
|
<div class="modal-content bg-dark">
|
||||||
<div class="modal-header text-white">
|
<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">
|
<button type="button" class="close text-white" data-dismiss="modal">
|
||||||
<span aria-hidden="true">×</span>
|
<span aria-hidden="true">×</span>
|
||||||
</button>
|
</button>
|
||||||
@@ -12,24 +12,35 @@
|
|||||||
<input type="hidden" name="balance" value="<?php echo $balance; ?>">
|
<input type="hidden" name="balance" value="<?php echo $balance; ?>">
|
||||||
<div class="modal-body bg-white">
|
<div class="modal-body bg-white">
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-row">
|
||||||
<label>Date <strong class="text-danger">*</strong></label>
|
<div class="col">
|
||||||
<div class="input-group">
|
|
||||||
<div class="input-group-prepend">
|
<div class="form-group">
|
||||||
<span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
|
<label>Date <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-calendar"></i></span>
|
||||||
|
</div>
|
||||||
|
<input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
<div class="col">
|
||||||
<div class="form-group">
|
|
||||||
<label>Amount <strong class="text-danger">*</strong></label>
|
<div class="form-group">
|
||||||
<div class="input-group">
|
<label>Amount <strong class="text-danger">*</strong></label>
|
||||||
<div class="input-group-prepend">
|
<div class="input-group">
|
||||||
<span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
|
<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="amount" value="<?php echo $balance; ?>" required>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<input type="number" class="form-control" step="0.01" min="0" name="amount" value="<?php echo $balance; ?>" required>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
@@ -104,11 +115,17 @@
|
|||||||
<input type="text" class="form-control" name="reference" placeholder="Enter a reference">
|
<input type="text" class="form-control" name="reference" placeholder="Enter a reference">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="custom-control custom-checkbox">
|
|
||||||
<input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_receipt" value="1" >
|
<div class="form-group">
|
||||||
<label class="custom-control-label" for="customControlAutosizing">Email Reciept</label>
|
<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"><?php echo $client_email; ?></label>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="modal-footer bg-white">
|
<div class="modal-footer bg-white">
|
||||||
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
|
<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="add_payment" class="btn btn-primary">Save</button>
|
||||||
|
|||||||
84
edit_invoice_item_modal.php
Normal file
84
edit_invoice_item_modal.php
Normal 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">×</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>
|
||||||
@@ -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">×</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>
|
|
||||||
@@ -184,7 +184,7 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
|
|||||||
<div class="row mb-4">
|
<div class="row mb-4">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<table class="table table-striped">
|
<table class="table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Product</th>
|
<th>Product</th>
|
||||||
|
|||||||
408
invoice.php
408
invoice.php
@@ -91,213 +91,242 @@ if(isset($_GET['invoice_id'])){
|
|||||||
<span class="p-2 ml-2 badge badge-danger"><?php echo $invoice_overdue; ?></span>
|
<span class="p-2 ml-2 badge badge-danger"><?php echo $invoice_overdue; ?></span>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
</ol>
|
</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">
|
||||||
<div class="card-header d-print-none">
|
|
||||||
<div class="row">
|
<div class="card-header d-print-none">
|
||||||
<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>
|
<div class="row">
|
||||||
|
|
||||||
|
<div class="col-md-4">
|
||||||
|
<?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>
|
</div>
|
||||||
<div class="col-md-8">
|
<?php } ?>
|
||||||
<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">
|
<?php if($invoice_status !== 'Paid' and $invoice_status !== 'Cancelled' and $invoice_status !== 'Draft'){ ?>
|
||||||
<i class="fas fa-fw fa-ellipsis-v"></i>
|
<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>
|
||||||
</button>
|
<?php } ?>
|
||||||
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
|
</div>
|
||||||
<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>
|
<div class="col-md-8">
|
||||||
<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>
|
<div class="dropdown dropleft text-center">
|
||||||
<?php if($invoice_status == 'Draft'){ ?><a class="dropdown-item" href="post.php?mark_invoice_sent=<?php echo $invoice_id; ?>">Mark Sent</a><?php } ?>
|
<button class="btn btn-primary btn-sm float-right" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||||
<?php if($invoice_status !== 'Paid' and $invoice_status !== 'Cancelled'){ ?><a class="dropdown-item" href="#" data-toggle="modal" data-target="#addPaymentModal">Add Payment</a><?php } ?>
|
<i class="fas fa-fw fa-ellipsis-v"></i>
|
||||||
<a class="dropdown-item" href="#" onclick="window.print();">Print</a>
|
</button>
|
||||||
<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-menu" aria-labelledby="dropdownMenuButton">
|
||||||
<a class="dropdown-item" href="post.php?pdf_invoice=<?php echo $invoice_id; ?>">PDF</a>
|
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#editInvoiceModal<?php echo $invoice_id; ?>">Edit</a>
|
||||||
<?php if($invoice_status !== 'Cancelled' and $invoice_status !== 'Paid'){ ?>
|
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addInvoiceCopyModal<?php echo $invoice_id; ?>">Copy</a>
|
||||||
<a class="dropdown-item" href="post.php?cancel_invoice=<?php echo $invoice_id; ?>">Cancel</a>
|
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addInvoiceRecurringModal<?php echo $invoice_id; ?>">Recurring</a>
|
||||||
<?php } ?>
|
<div class="dropdown-divider"></div>
|
||||||
</div>
|
<a class="dropdown-item" href="#" onclick="window.print();">Print</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>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="card-body">
|
||||||
|
|
||||||
|
<div class="row mb-4">
|
||||||
|
<div class="col-sm-2">
|
||||||
|
<img class="img-fluid" src="<?php echo $config_invoice_logo; ?>">
|
||||||
|
</div>
|
||||||
|
<div class="col-sm-10">
|
||||||
|
<div class="ribbon-wrapper">
|
||||||
|
<div class="ribbon bg-<?php echo $invoice_badge_color; ?>">
|
||||||
|
<?php echo $invoice_status; ?>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<h3 class="text-right mt-5"><strong>Invoice</strong><br><small class="text-secondary"><?php echo $invoice_number; ?></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>
|
</div>
|
||||||
<div class="card-body">
|
<div class="row mb-4">
|
||||||
|
<div class="col-sm-8">
|
||||||
<div class="row mb-4">
|
|
||||||
<div class="col-sm-2">
|
|
||||||
<img class="img-fluid" src="<?php echo $config_invoice_logo; ?>">
|
|
||||||
</div>
|
|
||||||
<div class="col-sm-10">
|
|
||||||
<div class="ribbon-wrapper">
|
|
||||||
<div class="ribbon bg-<?php echo $invoice_badge_color; ?>">
|
|
||||||
<?php echo $invoice_status; ?>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<h3 class="text-right mt-5"><strong>Invoice</strong><br><small class="text-secondary"><?php echo $invoice_number; ?></small></h3>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="row mb-4">
|
<div class="col-sm-4">
|
||||||
<div class="col-sm">
|
<table class="table">
|
||||||
<ul class="list-unstyled">
|
<tr>
|
||||||
<li><h4><strong><?php echo $config_company_name; ?></strong></h4></li>
|
<td>Invoice Date</td>
|
||||||
<li><?php echo $config_company_address; ?></li>
|
<td class="text-right"><?php echo $invoice_date; ?></td>
|
||||||
<li><?php echo "$config_company_city $config_company_state $config_company_zip"; ?></li>
|
</tr>
|
||||||
<li>P: <?php echo $config_company_phone; ?></li>
|
<tr>
|
||||||
<li><?php echo $config_company_email; ?></li>
|
<td>Due Date</td>
|
||||||
</ul>
|
<td class="text-right"><div class="<?php echo $invoice_color; ?>"><?php echo $invoice_due; ?></div></td>
|
||||||
</div>
|
</tr>
|
||||||
<div class="col-sm">
|
</table>
|
||||||
<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>
|
||||||
<div class="row mb-4">
|
</div>
|
||||||
<div class="col-sm-8">
|
|
||||||
</div>
|
<?php $sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE invoice_id = $invoice_id ORDER BY item_id ASC"); ?>
|
||||||
<div class="col-sm-4">
|
|
||||||
|
<div class="row mb-4">
|
||||||
|
<div class="col-md-12">
|
||||||
|
<div class="card">
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<tr>
|
<thead>
|
||||||
<td>Invoice Date</td>
|
<tr>
|
||||||
<td class="text-right"><?php echo $invoice_date; ?></td>
|
<th class="d-print-none"></th>
|
||||||
</tr>
|
<th>Item</th>
|
||||||
<tr>
|
<th>Description</th>
|
||||||
<td>Due Date</td>
|
<th class="text-center">QTY</th>
|
||||||
<td class="text-right"><div class="<?php echo $invoice_color; ?>"><?php echo $invoice_due; ?></div></td>
|
<th class="text-right">Price</th>
|
||||||
</tr>
|
<th class="text-right">Tax</th>
|
||||||
</table>
|
<th class="text-right">Total</th>
|
||||||
</div>
|
</tr>
|
||||||
</div>
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<?php
|
||||||
|
|
||||||
|
while($row = mysqli_fetch_array($sql_invoice_items)){
|
||||||
|
$item_id = $row['item_id'];
|
||||||
|
$item_name = $row['item_name'];
|
||||||
|
$item_description = $row['item_description'];
|
||||||
|
$item_quantity = $row['item_quantity'];
|
||||||
|
$item_price = $row['item_price'];
|
||||||
|
$item_subtotal = $row['item_price'];
|
||||||
|
$item_tax = $row['item_tax'];
|
||||||
|
$item_total = $row['item_total'];
|
||||||
|
$total_tax = $item_tax + $total_tax;
|
||||||
|
$sub_total = $item_price * $item_quantity + $sub_total;
|
||||||
|
|
||||||
<?php $sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE invoice_id = $invoice_id ORDER BY item_id ASC"); ?>
|
?>
|
||||||
|
|
||||||
<div class="row mb-4">
|
<tr>
|
||||||
<div class="col-md-12">
|
<td class="text-center d-print-none">
|
||||||
<div class="card">
|
<a class="text-secondary" href="#" data-toggle="modal" data-target="#editItemModal<?php echo $item_id; ?>"><i class="fa fa-fw fa-edit"></i></a>
|
||||||
<table class="table">
|
<a class="text-danger" href="post.php?delete_invoice_item=<?php echo $item_id; ?>"><i class="fa fa-fw fa-trash-alt"></i></a>
|
||||||
<thead>
|
</td>
|
||||||
<tr>
|
<td><?php echo $item_name; ?></td>
|
||||||
<th class="d-print-none"></th>
|
<td><?php echo $item_description; ?></td>
|
||||||
<th>Product</th>
|
<td class="text-center"><?php echo $item_quantity; ?></td>
|
||||||
<th>Description</th>
|
<td class="text-right text-monospace">$<?php echo number_format($item_price,2); ?></td>
|
||||||
<th class="text-center">Qty</th>
|
<td class="text-right text-monospace">$<?php echo number_format($item_tax,2); ?></td>
|
||||||
<th class="text-right">Price</th>
|
<td class="text-right text-monospace">$<?php echo number_format($item_total,2); ?></td>
|
||||||
<th class="text-right">Tax</th>
|
</tr>
|
||||||
<th class="text-right">Total</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<?php
|
|
||||||
|
|
||||||
while($row = mysqli_fetch_array($sql_invoice_items)){
|
|
||||||
$item_id = $row['item_id'];
|
|
||||||
$item_name = $row['item_name'];
|
|
||||||
$item_description = $row['item_description'];
|
|
||||||
$item_quantity = $row['item_quantity'];
|
|
||||||
$item_price = $row['item_price'];
|
|
||||||
$item_subtotal = $row['item_price'];
|
|
||||||
$item_tax = $row['item_tax'];
|
|
||||||
$item_total = $row['item_total'];
|
|
||||||
$total_tax = $item_tax + $total_tax;
|
|
||||||
$sub_total = $item_price * $item_quantity + $sub_total;
|
|
||||||
|
|
||||||
?>
|
<?php
|
||||||
|
|
||||||
<tr>
|
include("edit_item_modal.php");
|
||||||
<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_invoice_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>
|
|
||||||
<td class="text-right text-monospace">$<?php echo number_format($item_price,2); ?></td>
|
|
||||||
<td class="text-right text-monospace">$<?php echo number_format($item_tax,2); ?></td>
|
|
||||||
<td class="text-right text-monospace">$<?php echo number_format($item_total,2); ?></td>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
<?php
|
}
|
||||||
|
|
||||||
include("edit_item_modal.php");
|
?>
|
||||||
|
|
||||||
}
|
<tr class="d-print-none">
|
||||||
|
<form action="post.php" method="post" autocomplete="off">
|
||||||
?>
|
<input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
|
||||||
|
|
||||||
<tr class="d-print-none">
|
|
||||||
|
|
||||||
<td></td>
|
<td></td>
|
||||||
<td><input type="text" class="form-control" name="name" placeholder="Product"></td>
|
<td><input type="text" class="form-control" name="name" placeholder="Item"></td>
|
||||||
<td><textarea class="form-control" rows="1" name="description" placeholder="Description"></textarea></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="Quantity"></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><input type="number" step="0.01" class="form-control" style="text-align: right;" name="price" placeholder="Price"></td>
|
||||||
<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.00'){ echo "selected"; } ?> value="0.00">None</option>
|
||||||
<option <?php if($item_tax == '0.07'){ echo "selected"; } ?> value="0.07">State Tax 7%</option>
|
<option <?php if($item_tax == '0.07'){ echo "selected"; } ?> value="0.07">State Tax 7%</option>
|
||||||
</select>
|
</select>
|
||||||
</td>
|
</td>
|
||||||
<td></td>
|
<td>
|
||||||
</tr>
|
<button class="btn btn-link text-success" type="submit" name="add_invoice_line_item">
|
||||||
</tbody>
|
<i class="fa fa-fw fa-check"></i>
|
||||||
</table>
|
</button>
|
||||||
</div>
|
</td>
|
||||||
</div>
|
</form>
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row mb-4">
|
|
||||||
<div class="col-7">
|
|
||||||
<div class="card d-none d-print-block">
|
|
||||||
<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">
|
|
||||||
<tbody>
|
|
||||||
<tr class="border-bottom">
|
|
||||||
<td>Subtotal</td>
|
|
||||||
<td class="text-right text-monospace">$<?php echo number_format($sub_total,2); ?></td>
|
|
||||||
</tr>
|
|
||||||
<?php if($discount > 0){ ?>
|
|
||||||
<tr class="border-bottom">
|
|
||||||
<td>Discount</td>
|
|
||||||
<td class="text-right text-monospace">$<?php echo number_format($invoice_discount,2); ?></td>
|
|
||||||
</tr>
|
|
||||||
<?php } ?>
|
|
||||||
<?php if($total_tax > 0){ ?>
|
|
||||||
<tr class="border-bottom">
|
|
||||||
<td>Tax</td>
|
|
||||||
<td class="text-right text-monospace">$<?php echo number_format($total_tax,2); ?></td>
|
|
||||||
</tr>
|
|
||||||
<?php } ?>
|
|
||||||
<?php if($amount_paid > 0){ ?>
|
|
||||||
<tr class="border-bottom">
|
|
||||||
<td><div class="text-success">Paid to Date</div></td>
|
|
||||||
<td class="text-right text-monospace text-success">$<?php echo number_format($amount_paid,2); ?></td>
|
|
||||||
</tr>
|
|
||||||
<?php } ?>
|
|
||||||
<tr class="border-bottom">
|
|
||||||
<td><strong>Balance Due</strong></td>
|
|
||||||
<td class="text-right text-monospace"><strong>$<?php echo number_format($balance,2); ?></strong></td>
|
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</form>
|
<div class="row mb-4">
|
||||||
|
<div class="col-7">
|
||||||
|
<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>
|
||||||
|
</div>
|
||||||
|
<div class="col-3 offset-2">
|
||||||
|
<table class="table table-borderless">
|
||||||
|
<tbody>
|
||||||
|
<tr class="border-bottom">
|
||||||
|
<td>Subtotal</td>
|
||||||
|
<td class="text-right text-monospace">$<?php echo number_format($sub_total,2); ?></td>
|
||||||
|
</tr>
|
||||||
|
<?php if($discount > 0){ ?>
|
||||||
|
<tr class="border-bottom">
|
||||||
|
<td>Discount</td>
|
||||||
|
<td class="text-right text-monospace">$<?php echo number_format($invoice_discount,2); ?></td>
|
||||||
|
</tr>
|
||||||
|
<?php } ?>
|
||||||
|
<?php if($total_tax > 0){ ?>
|
||||||
|
<tr class="border-bottom">
|
||||||
|
<td>Tax</td>
|
||||||
|
<td class="text-right text-monospace">$<?php echo number_format($total_tax,2); ?></td>
|
||||||
|
</tr>
|
||||||
|
<?php } ?>
|
||||||
|
<?php if($amount_paid > 0){ ?>
|
||||||
|
<tr class="border-bottom">
|
||||||
|
<td><div class="text-success">Paid to Date</div></td>
|
||||||
|
<td class="text-right text-monospace text-success">$<?php echo number_format($amount_paid,2); ?></td>
|
||||||
|
</tr>
|
||||||
|
<?php } ?>
|
||||||
|
<tr class="border-bottom">
|
||||||
|
<td><strong>Balance Due</strong></td>
|
||||||
|
<td class="text-right text-monospace"><strong>$<?php echo number_format($balance,2); ?></strong></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<hr class="d-none d-print-block mt-5">
|
<hr class="d-none d-print-block mt-5">
|
||||||
|
|
||||||
@@ -309,7 +338,15 @@ if(isset($_GET['invoice_id'])){
|
|||||||
<div class="col-sm">
|
<div class="col-sm">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-header">
|
<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>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<table class="table">
|
<table class="table">
|
||||||
@@ -346,7 +383,15 @@ if(isset($_GET['invoice_id'])){
|
|||||||
<div class="col-sm d-print-none">
|
<div class="col-sm d-print-none">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-header">
|
<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>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<table class="table">
|
<table class="table">
|
||||||
@@ -388,9 +433,10 @@ if(isset($_GET['invoice_id'])){
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<?php include("add_payment_modal.php"); ?>
|
<?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_copy_modal.php"); ?>
|
||||||
<?php include("add_invoice_recurring_modal.php"); ?>
|
<?php include("add_invoice_recurring_modal.php"); ?>
|
||||||
|
<?php include("invoice_note_modal.php"); ?>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
24
invoice_note_modal.php
Normal file
24
invoice_note_modal.php
Normal 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">×</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>
|
||||||
48
post.php
48
post.php
@@ -2184,45 +2184,45 @@ if(isset($_GET['delete_invoice'])){
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_POST['save_invoice'])){
|
if(isset($_POST['add_invoice_line_item'])){
|
||||||
|
|
||||||
$invoice_id = intval($_POST['invoice_id']);
|
$invoice_id = intval($_POST['invoice_id']);
|
||||||
|
$name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']));
|
||||||
|
$description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description']));
|
||||||
|
$qty = floatval($_POST['qty']);
|
||||||
|
$price = floatval($_POST['price']);
|
||||||
|
$tax = floatval($_POST['tax']);
|
||||||
|
|
||||||
if(!empty($_POST['name'])){
|
$subtotal = $price * $qty;
|
||||||
$name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']));
|
$tax = $subtotal * $tax;
|
||||||
$description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description']));
|
$total = $subtotal + $tax;
|
||||||
$qty = floatval($_POST['qty']);
|
|
||||||
$price = floatval($_POST['price']);
|
|
||||||
$tax = floatval($_POST['tax']);
|
|
||||||
|
|
||||||
$subtotal = $price * $qty;
|
|
||||||
$tax = $subtotal * $tax;
|
|
||||||
$total = $subtotal + $tax;
|
|
||||||
|
|
||||||
mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = '$price', item_subtotal = '$subtotal', item_tax = '$tax', item_total = '$total', item_created_at = NOW(), invoice_id = $invoice_id, company_id = $session_company_id");
|
mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = '$price', item_subtotal = '$subtotal', item_tax = '$tax', item_total = '$total', item_created_at = NOW(), invoice_id = $invoice_id, company_id = $session_company_id");
|
||||||
|
|
||||||
//Update Invoice Balances
|
//Update Invoice Balances
|
||||||
|
|
||||||
$sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id AND company_id = $session_company_id");
|
$sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_id = $invoice_id AND company_id = $session_company_id");
|
||||||
$row = mysqli_fetch_array($sql);
|
$row = mysqli_fetch_array($sql);
|
||||||
|
|
||||||
$new_invoice_amount = $row['invoice_amount'] + $total;
|
$new_invoice_amount = $row['invoice_amount'] + $total;
|
||||||
|
|
||||||
mysqli_query($mysqli,"UPDATE invoices SET invoice_amount = '$new_invoice_amount', invoice_updated_at = NOW() WHERE invoice_id = $invoice_id AND company_id = $session_company_id");
|
mysqli_query($mysqli,"UPDATE invoices SET invoice_amount = '$new_invoice_amount', invoice_updated_at = NOW() WHERE invoice_id = $invoice_id AND company_id = $session_company_id");
|
||||||
|
|
||||||
$_SESSION['alert_message'] = "Item added";
|
$_SESSION['alert_message'] = "Item added";
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if(isset($_POST['invoice_note'])){
|
header("Location: " . $_SERVER["HTTP_REFERER"]);
|
||||||
|
|
||||||
$invoice_note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['invoice_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");
|
if(isset($_POST['invoice_note'])){
|
||||||
|
|
||||||
$_SESSION['alert_message'] = "Notes added";
|
$invoice_id = intval($_POST['invoice_id']);
|
||||||
|
$note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['note']));
|
||||||
|
|
||||||
}
|
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"]);
|
header("Location: " . $_SERVER["HTTP_REFERER"]);
|
||||||
|
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ if(isset($_GET['quote_id'])){
|
|||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-4">
|
<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>
|
||||||
<div class="col-md-8">
|
<div class="col-md-8">
|
||||||
<div class="dropdown dropleft text-center">
|
<div class="dropdown dropleft text-center">
|
||||||
|
|||||||
Reference in New Issue
Block a user