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

Updated recurring as well as quote details to mimic invoice details overhaul

Browse Source
This commit is contained in:
johnny@pittpc.com
2020-02-07 01:51:49 -05:00
parent 377bf55210
commit 3036dbdab2
9 changed files with 744 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
edit_invoice_item_modal.php
+1 -1
View File
@@ -76,7 +76,7 @@
</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>
<button type="submit" name="edit_invoice_item" class="btn btn-primary">Save</button>
</div>
</form>
</div>
edit_quote_item_modal.php
+85
View File
@@ -0,0 +1,85 @@
<div class="modal" id="editQuoteItemModal<?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>&times;</span>
</button>
</div>
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="quote_id" value="<?php echo $quote_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_quote_item" class="btn btn-primary">Save</button>
</div>
</form>
</div>
</div>
</div>
edit_recurring_item_modal.php
+85
View File
@@ -0,0 +1,85 @@
<div class="modal" id="editRecurringItemModal<?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>&times;</span>
</button>
</div>
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="recurring_id" value="<?php echo $recurring_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_recurring_item" class="btn btn-primary">Save</button>
</div>
</form>
</div>
</div>
</div>
invoice.php
+2 -3
View File
@@ -232,7 +232,7 @@ if(isset($_GET['invoice_id'])){
<tr>
<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-secondary" href="#" data-toggle="modal" data-target="#editInvoiceItemModal<?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>
@@ -245,7 +245,7 @@ if(isset($_GET['invoice_id'])){
<?php
include("edit_item_modal.php");
include("edit_invoice_item_modal.php");
}
@@ -433,7 +433,6 @@ if(isset($_GET['invoice_id'])){
</div>
<?php include("add_payment_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"); ?>
post.php
+105 -24
View File
@@ -1551,11 +1551,10 @@ if(isset($_POST['add_quote_to_invoice'])){
}
if(isset($_POST['save_quote'])){
if(isset($_POST['add_quote_line_item'])){
$quote_id = intval($_POST['quote_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']);
@@ -1579,16 +1578,50 @@ if(isset($_POST['save_quote'])){
$_SESSION['alert_message'] = "Item added";
}
header("Location: " . $_SERVER["HTTP_REFERER"]);
}
if(isset($_POST['quote_note'])){
$quote_note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['quote_note']));
if(isset($_POST['quote_note'])){
mysqli_query($mysqli,"UPDATE quotes SET quote_note = '$quote_note', quote_updated_at = NOW() WHERE quote_id = $quote_id AND company_id = $session_company_id");
$quote_id = intval($_POST['quote_id']);
$note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['note']));
$_SESSION['alert_message'] = "Notes added";
}
mysqli_query($mysqli,"UPDATE quotes SET quote_note = '$note', quote_updated_at = NOW() WHERE quote_id = $quote_id AND company_id = $session_company_id");
$_SESSION['alert_message'] = "<i class='fa fa-2x fa-check-circle'></i> <strong>Notes added</strong>";
header("Location: " . $_SERVER["HTTP_REFERER"]);
}
header("Location: " . $_SERVER["HTTP_REFERER"]);
if(isset($_POST['edit_quote_item'])){
$quote_id = intval($_POST['quote_id']);
$item_id = intval($_POST['item_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']);
$subtotal = $price * $qty;
$tax = $subtotal * $tax;
$total = $subtotal + $tax;
mysqli_query($mysqli,"UPDATE invoice_items SET item_name = '$name', item_description = '$description', item_quantity = '$qty', item_price = '$price', item_subtotal = '$subtotal', item_tax = '$tax', item_total = '$total' WHERE item_id = $item_id");
//Update Invoice Balances by tallying up invoice items
$sql_quote_total = mysqli_query($mysqli,"SELECT SUM(item_total) AS quote_total FROM invoice_items WHERE quote_id = $quote_id AND company_id = $session_company_id");
$row = mysqli_fetch_array($sql_quote_total);
$new_quote_amount = $row['quote_total'];
mysqli_query($mysqli,"UPDATE quotes SET quote_amount = '$new_quote_amount', quote_updated_at = NOW() WHERE quote_id = $quote_id AND company_id = $session_company_id");
$_SESSION['alert_message'] = "<i class='fa fa-2x fa-check-circle'></i> Item updated";
header("Location: " . $_SERVER["HTTP_REFERER"]);
@@ -1667,6 +1700,23 @@ if(isset($_GET['delete_quote_item'])){
}
if(isset($_GET['mark_quote_sent'])){
$quote_id = intval($_GET['mark_quote_sent']);
mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Sent', quote_updated_at = NOW() WHERE quote_id = $quote_id AND company_id = $session_company_id");
mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Sent', history_description = 'QUOTE marked sent', history_created_at = NOW(), quote_id = $quote_id, company_id = $session_company_id");
//Logging
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Quote', log_action = 'Updated', log_description = '$quote_id marked sent', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
$_SESSION['alert_message'] = "<i class='fa fa-2x fa-check-circle'></i> Quote marked sent";
header("Location: " . $_SERVER["HTTP_REFERER"]);
}
if(isset($_GET['approve_quote'])){
$quote_id = intval($_GET['approve_quote']);
@@ -1678,7 +1728,7 @@ if(isset($_GET['approve_quote'])){
//Logging
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Quote', log_action = 'Modified', log_description = 'Approved Quote $quote_id', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
$_SESSION['alert_message'] = "Quote approved";
$_SESSION['alert_message'] = "<i class='fa fa-2x fa-check-circle'></i> Quote approved";
header("Location: " . $_SERVER["HTTP_REFERER"]);
@@ -2045,11 +2095,9 @@ if(isset($_GET['recurring_deactivate'])){
}
if(isset($_POST['save_recurring'])){
if(isset($_POST['add_recurring_line_item'])){
$recurring_id = intval($_POST['recurring_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']);
@@ -2071,22 +2119,55 @@ if(isset($_POST['save_recurring'])){
mysqli_query($mysqli,"UPDATE recurring SET recurring_amount = '$new_recurring_amount', recurring_updated_at = NOW() WHERE recurring_id = $recurring_id AND company_id = $session_company_id");
}
if(isset($_POST['recurring_note'])){
$recurring_note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['recurring_note']));
mysqli_query($mysqli,"UPDATE recurring SET recurring_note = '$recurring_note', recurring_updated_at = NOW() WHERE recurring_id = $recurring_id AND company_id = $session_company_id");
}
$_SESSION['alert_message'] = "Recurring Invoice Updated";
header("Location: " . $_SERVER["HTTP_REFERER"]);
}
if(isset($_POST['recurring_note'])){
$recurring_id = intval($_POST['recurring_id']);
$note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['note']));
mysqli_query($mysqli,"UPDATE recurring SET recurring_note = '$note', recurring_updated_at = NOW() WHERE recurring_id = $recurring_id AND company_id = $session_company_id");
$_SESSION['alert_message'] = "<i class='fa fa-2x fa-check-circle'></i> <strong>Notes added</strong>";
header("Location: " . $_SERVER["HTTP_REFERER"]);
}
if(isset($_POST['edit_recurring_item'])){
$recurring_id = intval($_POST['recurring_id']);
$item_id = intval($_POST['item_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']);
$subtotal = $price * $qty;
$tax = $subtotal * $tax;
$total = $subtotal + $tax;
mysqli_query($mysqli,"UPDATE invoice_items SET item_name = '$name', item_description = '$description', item_quantity = '$qty', item_price = '$price', item_subtotal = '$subtotal', item_tax = '$tax', item_total = '$total' WHERE item_id = $item_id");
//Update Invoice Balances by tallying up invoice items
$sql_recurring_total = mysqli_query($mysqli,"SELECT SUM(item_total) AS recurring_total FROM invoice_items WHERE recurring_id = $recurring_id AND company_id = $session_company_id");
$row = mysqli_fetch_array($sql_recurring_total);
$new_recurring_amount = $row['recurring_total'];
mysqli_query($mysqli,"UPDATE recurring SET recurring_amount = '$new_recurring_amount', recurring_updated_at = NOW() WHERE recurring_id = $recurring_id AND company_id = $session_company_id");
$_SESSION['alert_message'] = "Item updated";
header("Location: " . $_SERVER["HTTP_REFERER"]);
}
if(isset($_GET['delete_recurring_item'])){
$item_id = intval($_GET['delete_recurring_item']);
@@ -2184,7 +2265,7 @@ if(isset($_GET['delete_invoice'])){
}
if(isset($_POST['add_invoice_line_item'])){
if(isset($_POST['add_invoice_item'])){
$invoice_id = intval($_POST['invoice_id']);
$name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']));
@@ -2228,7 +2309,7 @@ if(isset($_POST['invoice_note'])){
}
if(isset($_POST['edit_item'])){
if(isset($_POST['edit_invoice_item'])){
$invoice_id = intval($_POST['invoice_id']);
$item_id = intval($_POST['item_id']);
quote.php
+71 -22
View File
@@ -65,15 +65,40 @@ if(isset($_GET['quote_id'])){
<span class="ml-3 p-2 badge badge-<?php echo $quote_badge_color; ?>"><?php echo $quote_status; ?></span>
</ol>
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="quote_id" value="<?php echo $quote_id; ?>">
<div class="card">
<div class="card">
<div class="card-header d-print-none">
<div class="row">
<div class="col-md-4">
<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>
<?php if($quote_status == 'Draft'){ ?>
<button class="btn btn-success btn-sm dropdown-toggle" type="button" data-toggle="dropdown">
<i class="fas fa-fw fa-paper-plane"></i> Send
</button>
<div class="dropdown-menu">
<a class="dropdown-item" href="post.php?email_quote=<?php echo $quote_id; ?>">Send Email</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="post.php?mark_quote_sent=<?php echo $quote_id; ?>">Mark Sent</a>
</div>
<?php } ?>
<?php if($quote_status == 'Sent'){ ?>
<button class="btn btn-success btn-sm dropdown-toggle" type="button" data-toggle="dropdown">
<i class="fas fa-fw fa-check"></i> Approve/Reject
</button>
<div class="dropdown-menu">
<a class="dropdown-item" href="post.php?approve_quote=<?php echo $quote_id; ?>">Approve</a>
<a class="dropdown-item" href="post.php?reject_quote=<?php echo $quote_id; ?>">Reject</a>
</div>
<?php } ?>
<?php if($quote_status == 'Approved'){ ?>
<a class="btn btn-success btn-sm" href="#" data-toggle="modal" data-target="#addQuoteToInvoiceModal<?php echo $quote_id; ?>"><i class="fas fa-fw fa-check"></i> Invoice</a>
<? } ?>
</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">
@@ -82,14 +107,11 @@ if(isset($_GET['quote_id'])){
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#editQuoteModal<?php echo $quote_id ?>">Edit</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addQuoteCopyModal<?php echo $quote_id; ?>">Copy</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addQuoteToInvoiceModal<?php echo $quote_id; ?>">Quote > Invoice</a>
<a class="dropdown-item" href="post.php?approve_quote=<?php echo $quote_id; ?>">Approve</a>
<a class="dropdown-item" href="post.php?reject_quote=<?php echo $quote_id; ?>">Reject</a>
<a class="dropdown-item" href="post.php?email_quote=<?php echo $quote_id; ?>">Send Email</a>
<?php if($quote_status == "Draft"){ ?><a class="dropdown-item" href="post.php?mark_quote_sent=<?php echo $quote_id; ?>">Mark Sent</a><?php } ?>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#" onclick="window.print();">Print</a>
<a class="dropdown-item" href="guest_view_quote.php?quote_id=<?php echo "$quote_id&url_key=$quote_url_key"; ?>">Guest URL</a>
<a class="dropdown-item" href="post.php?pdf_quote=<?php echo $quote_id; ?>">PDF</a>
<a class="dropdown-item" href="guest_view_quote.php?quote_id=<?php echo "$quote_id&url_key=$quote_url_key"; ?>">Guest URL</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#">Delete</a>
</div>
</div>
@@ -150,9 +172,9 @@ if(isset($_GET['quote_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>
@@ -176,7 +198,10 @@ if(isset($_GET['quote_id'])){
?>
<tr>
<td class="text-center d-print-none"><a class="text-danger" href="post.php?delete_quote_item=<?php echo $item_id; ?>"><i class="fa fa-trash-alt"></i></a></td>
<td class="text-center d-print-none">
<a class="text-secondary" href="#" data-toggle="modal" data-target="#editQuoteItemModal<?php echo $item_id; ?>"><i class="fa fa-fw fa-edit"></i></a>
<a class="text-danger" href="post.php?delete_quote_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>
@@ -187,23 +212,32 @@ if(isset($_GET['quote_id'])){
<?php
include("edit_quote_item_modal.php");
}
?>
<tr class="d-print-none">
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="quote_id" value="<?php echo $quote_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" required></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" min="0" 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 value="0.00">None</option>
<option value="0.07">State Tax 7%</option>
</select>
</td>
<td></td>
<td>
<button class="btn btn-link text-success" type="submit" name="add_quote_line_item">
<i class="fa fa-fw fa-check"></i>
</button>
</td>
</form>
</tr>
</tbody>
</table>
@@ -213,12 +247,19 @@ if(isset($_GET['quote_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="#quoteNoteModal">
<i class="fas fa-edit"></i>
</a>
</div>
</div>
<div class="card-body">
<div><?php echo $quote_note; ?></div>
</div>
</div>
<textarea rows="6" class="form-control mb-2 d-print-none" name="quote_note" placeholder="Notes"><?php echo $quote_note; ?></textarea>
</div>
<div class="col-3 offset-2">
@@ -248,7 +289,6 @@ if(isset($_GET['quote_id'])){
</table>
</div>
</div>
</form>
<hr class="d-none d-print-block mt-5">
@@ -260,7 +300,15 @@ if(isset($_GET['quote_id'])){
<div class="col-sm d-print-none">
<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">
@@ -299,6 +347,7 @@ if(isset($_GET['quote_id'])){
<?php include("edit_quote_modal.php"); ?>
<?php include("add_quote_to_invoice_modal.php"); ?>
<?php include("add_quote_copy_modal.php"); ?>
<?php include("quote_note_modal.php"); ?>
<?php } ?>
quote_note_modal.php
+24
View File
@@ -0,0 +1,24 @@
<div class="modal" id="quoteNoteModal" 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>Quote 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="quote_id" value="<?php echo $quote_id; ?>">
<div class="modal-body bg-white">
<div class="form-group">
<textarea class="form-control" rows="8" name="note"><?php echo $quote_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="quote_note" class="btn btn-primary">Save</button>
</div>
</form>
</div>
</div>
</div>
recurring_invoice.php
+45 -21
View File
@@ -61,27 +61,27 @@ if(isset($_GET['recurring_id'])){
<span class="ml-3 p-2 badge badge-<?php echo $status_badge_color; ?>"><?php echo $status; ?></span>
</ol>
<form action="post.php" method="post">
<input type="hidden" name="recurring_id" value="<?php echo $recurring_id; ?>">
<div class="card">
<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_recurring"><i class="fa fa-fw fa-check"></i> Save</button>
<?php if($recurring_status == 1){ ?>
<a class="btn btn-secondary btn-sm" href="post.php?recurring_deactivate=<?php echo $recurring_id; ?>"><i class='fa fa-fw fa-ban'></i> Deactivate</a>
<? }else{ ?>
<a class="btn btn-success btn-sm" href="post.php?recurring_activate=<?php echo $recurring_id; ?>"><i class='fa fa-fw fa-check'></i> Activate</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">
<button class="btn btn-primary btn-sm float-right" type="button" data-toggle="dropdown">
<i class="fas fa-ellipsis-h"></i>
</button>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#editRecurringModal<?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_id; ?>">Activate</a>
<?php } ?>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="post.php?force_recurring=<?php echo $recurring_id; ?>">Force Send</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="post.php?delete_recurring=<?php echo $recurring_id; ?>">Delete</a>
</div>
</div>
@@ -150,9 +150,9 @@ if(isset($_GET['recurring_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>
@@ -177,7 +177,7 @@ if(isset($_GET['recurring_id'])){
<tr>
<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-secondary" href="#" data-toggle="modal" data-target="#editRecurringItemModal<?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>
@@ -190,23 +190,32 @@ if(isset($_GET['recurring_id'])){
<?php
include("edit_recurring_item_modal.php");
}
?>
<tr class="d-print-none">
<form action="post.php" method="post">
<input type="hidden" name="recurring_id" value="<?php echo $recurring_id; ?>">
<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><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" min="0" 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_recurring_line_item">
<i class="fa fa-fw fa-check"></i>
</button>
</td>
</form>
</tr>
</tbody>
</table>
@@ -216,12 +225,19 @@ if(isset($_GET['recurring_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="#recurringNoteModal">
<i class="fas fa-edit"></i>
</a>
</div>
</div>
<div class="card-body">
<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">
@@ -250,7 +266,6 @@ if(isset($_GET['recurring_id'])){
</table>
</div>
</div>
</form>
</div>
</div>
@@ -258,7 +273,15 @@ if(isset($_GET['recurring_id'])){
<div class="col-sm d-print-none">
<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">
@@ -293,6 +316,7 @@ if(isset($_GET['recurring_id'])){
</div>
<?php include("edit_recurring_modal.php"); ?>
<?php include("recurring_note_modal.php"); ?>
<?php } ?>
recurring_note_modal.php
+24
View File
@@ -0,0 +1,24 @@
<div class="modal" id="recurringNoteModal" 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>Quote Notes</h5>
<button type="button" class="close text-white" data-dismiss="modal">
<span>&times;</span>
</button>
</div>
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="recurring_id" value="<?php echo $recurring_id; ?>">
<div class="modal-body bg-white">
<div class="form-group">
<textarea class="form-control" rows="8" name="note"><?php echo $recurring_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="recurring_note" class="btn btn-primary">Save</button>
</div>
</form>
</div>
</div>
</div>