mirror of
https://github.com/itflow-org/itflow
synced 2026-09-18 20:55:14 +00:00
Send Email and Mark Sent modals for invoices and quotes (db 2.7.7)
Send Email opens a contact picker instead of hardcoding the primary contact; Mark Sent asks how it went out and takes a note. Both log recipients / method / note to the document history. Handlers moved GET -> POST. Fixes two pre-existing bugs in the email path: archived contacts were still receiving billing copies, and every copy was addressed to the primary contact by name.
This commit is contained in:
johnnyq
131
agent/modals/invoice/invoice_email.php
Normal file
131
agent/modals/invoice/invoice_email.php
Normal file
@@ -0,0 +1,131 @@
|
||||
<?php
|
||||
|
||||
require_once '../../../includes/modal_header.php';
|
||||
|
||||
enforceUserPermission('module_sales', 2);
|
||||
|
||||
$invoice_id = intval($_GET['invoice_id']);
|
||||
|
||||
$sql = mysqli_query($mysqli, "SELECT invoice_client_id, invoice_number, invoice_prefix, invoice_status
|
||||
FROM invoices WHERE invoice_id = $invoice_id LIMIT 1");
|
||||
$row = mysqli_fetch_assoc($sql);
|
||||
$invoice_prefix = escapeHtml($row['invoice_prefix']);
|
||||
$invoice_number = intval($row['invoice_number']);
|
||||
$invoice_status = escapeHtml($row['invoice_status']);
|
||||
$client_id = intval($row['invoice_client_id']);
|
||||
|
||||
enforceClientAccess();
|
||||
|
||||
// Everyone at the client who can actually receive mail. Primary and billing
|
||||
// contacts lead because they are the ones checked by default below - that
|
||||
// pairing is the behaviour the old one-click Send Email link had baked in.
|
||||
$sql_contacts = mysqli_query(
|
||||
$mysqli,
|
||||
"SELECT contact_billing, contact_email, contact_id, contact_name, contact_primary, contact_title
|
||||
FROM contacts
|
||||
WHERE contact_client_id = $client_id
|
||||
AND contact_archived_at IS NULL
|
||||
AND contact_email IS NOT NULL
|
||||
AND contact_email != ''
|
||||
ORDER BY contact_primary DESC, contact_billing DESC, contact_name ASC"
|
||||
);
|
||||
|
||||
$contact_count = mysqli_num_rows($sql_contacts);
|
||||
|
||||
ob_start();
|
||||
|
||||
?>
|
||||
|
||||
<div class="modal-header bg-dark">
|
||||
<h5 class="modal-title text-white">
|
||||
<i class="fa fa-fw fa-paper-plane me-2"></i>Email Invoice <?= "$invoice_prefix$invoice_number" ?>
|
||||
</h5>
|
||||
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
|
||||
</div>
|
||||
<form action="post.php" method="post" autocomplete="off">
|
||||
<input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
|
||||
<input type="hidden" name="invoice_id" value="<?= $invoice_id ?>">
|
||||
|
||||
<div class="modal-body">
|
||||
|
||||
<?php if ($contact_count == 0) { ?>
|
||||
|
||||
<p class="text-muted mb-0">
|
||||
This client has no contacts with an email address, so there is nobody to send to.
|
||||
Add a contact with an email address, or use Mark Sent to record that the invoice
|
||||
went out some other way.
|
||||
</p>
|
||||
|
||||
<?php } else { ?>
|
||||
|
||||
<label class="mb-2">Send to <strong class="text-danger">*</strong></label>
|
||||
|
||||
<div class="list-group mb-3">
|
||||
|
||||
<?php
|
||||
|
||||
while ($row = mysqli_fetch_assoc($sql_contacts)) {
|
||||
$contact_id = intval($row['contact_id']);
|
||||
$contact_name = escapeHtml($row['contact_name']);
|
||||
$contact_email = escapeHtml($row['contact_email']);
|
||||
$contact_title = escapeHtml($row['contact_title']);
|
||||
$contact_primary = intval($row['contact_primary']);
|
||||
$contact_billing = intval($row['contact_billing']);
|
||||
|
||||
// Default selection reproduces the old link exactly: the
|
||||
// primary contact was the recipient and every billing
|
||||
// contact got a copy
|
||||
$contact_checked = ($contact_primary == 1 || $contact_billing == 1);
|
||||
|
||||
?>
|
||||
|
||||
<label class="list-group-item" for="invoiceEmailContact<?= $contact_id ?>">
|
||||
<input type="checkbox" class="form-check-input me-2" name="contacts[]"
|
||||
id="invoiceEmailContact<?= $contact_id ?>" value="<?= $contact_id ?>"
|
||||
<?php if ($contact_checked) { echo "checked"; } ?>>
|
||||
<strong><?= $contact_name ?></strong>
|
||||
<?php if ($contact_primary == 1) { ?>
|
||||
<span class="badge text-bg-primary ms-1">Primary</span>
|
||||
<?php } ?>
|
||||
<?php if ($contact_billing == 1) { ?>
|
||||
<span class="badge text-bg-success ms-1">Billing</span>
|
||||
<?php } ?>
|
||||
<?php if (!empty($contact_title)) { ?>
|
||||
<span class="text-muted ms-1"><?= $contact_title ?></span>
|
||||
<?php } ?>
|
||||
<br>
|
||||
<span class="text-muted ms-4"><?= $contact_email ?></span>
|
||||
</label>
|
||||
|
||||
<?php
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
</div>
|
||||
|
||||
<?php if ($invoice_status !== 'Draft') { ?>
|
||||
<p class="text-muted mb-0">
|
||||
<i class="fa fa-fw fa-info-circle me-1"></i>This invoice is
|
||||
<strong><?= $invoice_status ?></strong>, so sending it will not change its status.
|
||||
</p>
|
||||
<?php } ?>
|
||||
|
||||
<?php } ?>
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<?php if ($contact_count > 0) { ?>
|
||||
<button type="submit" name="email_invoice" class="btn btn-primary text-bold">
|
||||
<i class="fa fa-fw fa-paper-plane me-2"></i>Send
|
||||
</button>
|
||||
<?php } ?>
|
||||
<button type="button" class="btn btn-light" data-bs-dismiss="modal">
|
||||
<i class="fa fa-fw fa-times me-2"></i>Cancel
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<?php
|
||||
require_once '../../../includes/modal_footer.php';
|
||||
64
agent/modals/invoice/invoice_mark_sent.php
Normal file
64
agent/modals/invoice/invoice_mark_sent.php
Normal file
@@ -0,0 +1,64 @@
|
||||
<?php
|
||||
|
||||
require_once '../../../includes/modal_header.php';
|
||||
|
||||
enforceUserPermission('module_sales', 2);
|
||||
|
||||
$invoice_id = intval($_GET['invoice_id']);
|
||||
|
||||
$sql = mysqli_query($mysqli, "SELECT invoice_client_id, invoice_number, invoice_prefix
|
||||
FROM invoices WHERE invoice_id = $invoice_id LIMIT 1");
|
||||
$row = mysqli_fetch_assoc($sql);
|
||||
$invoice_prefix = escapeHtml($row['invoice_prefix']);
|
||||
$invoice_number = intval($row['invoice_number']);
|
||||
$client_id = intval($row['invoice_client_id']);
|
||||
|
||||
enforceClientAccess();
|
||||
|
||||
ob_start();
|
||||
|
||||
?>
|
||||
|
||||
<div class="modal-header bg-dark">
|
||||
<h5 class="modal-title text-white">
|
||||
<i class="fa fa-fw fa-check me-2"></i>Mark Invoice <?= "$invoice_prefix$invoice_number" ?> Sent
|
||||
</h5>
|
||||
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
|
||||
</div>
|
||||
<form action="post.php" method="post" autocomplete="off">
|
||||
<input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
|
||||
<input type="hidden" name="invoice_id" value="<?= $invoice_id ?>">
|
||||
|
||||
<div class="modal-body">
|
||||
|
||||
<div class="mb-3">
|
||||
<label>How was it sent? <strong class="text-danger">*</strong></label>
|
||||
<div class="input-group">
|
||||
<span class="input-group-text"><i class="fa fa-fw fa-paper-plane"></i></span>
|
||||
<select class="form-select" name="sent_method" required>
|
||||
<?php foreach (getSentMethods() as $sent_method) { ?>
|
||||
<option value="<?= escapeHtml($sent_method) ?>"><?= escapeHtml($sent_method) ?></option>
|
||||
<?php } ?>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label>Note</label>
|
||||
<textarea class="form-control" name="note" rows="3" maxlength="500"
|
||||
placeholder="Optional - tracking number, who it went to, anything worth keeping"></textarea>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="submit" name="mark_invoice_sent" class="btn btn-primary text-bold">
|
||||
<i class="fa fa-fw fa-check me-2"></i>Mark Sent
|
||||
</button>
|
||||
<button type="button" class="btn btn-light" data-bs-dismiss="modal">
|
||||
<i class="fa fa-fw fa-times me-2"></i>Cancel
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<?php
|
||||
require_once '../../../includes/modal_footer.php';
|
||||
129
agent/modals/quote/quote_email.php
Normal file
129
agent/modals/quote/quote_email.php
Normal file
@@ -0,0 +1,129 @@
|
||||
<?php
|
||||
|
||||
require_once '../../../includes/modal_header.php';
|
||||
|
||||
enforceUserPermission('module_sales', 2);
|
||||
|
||||
$quote_id = intval($_GET['quote_id']);
|
||||
|
||||
$sql = mysqli_query($mysqli, "SELECT quote_client_id, quote_number, quote_prefix, quote_status
|
||||
FROM quotes WHERE quote_id = $quote_id LIMIT 1");
|
||||
$row = mysqli_fetch_assoc($sql);
|
||||
$quote_prefix = escapeHtml($row['quote_prefix']);
|
||||
$quote_number = intval($row['quote_number']);
|
||||
$quote_status = escapeHtml($row['quote_status']);
|
||||
$client_id = intval($row['quote_client_id']);
|
||||
|
||||
enforceClientAccess();
|
||||
|
||||
$sql_contacts = mysqli_query(
|
||||
$mysqli,
|
||||
"SELECT contact_billing, contact_email, contact_id, contact_name, contact_primary, contact_title
|
||||
FROM contacts
|
||||
WHERE contact_client_id = $client_id
|
||||
AND contact_archived_at IS NULL
|
||||
AND contact_email IS NOT NULL
|
||||
AND contact_email != ''
|
||||
ORDER BY contact_primary DESC, contact_billing DESC, contact_name ASC"
|
||||
);
|
||||
|
||||
$contact_count = mysqli_num_rows($sql_contacts);
|
||||
|
||||
ob_start();
|
||||
|
||||
?>
|
||||
|
||||
<div class="modal-header bg-dark">
|
||||
<h5 class="modal-title text-white">
|
||||
<i class="fa fa-fw fa-paper-plane me-2"></i>Email Quote <?= "$quote_prefix$quote_number" ?>
|
||||
</h5>
|
||||
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
|
||||
</div>
|
||||
<form action="post.php" method="post" autocomplete="off">
|
||||
<input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
|
||||
<input type="hidden" name="quote_id" value="<?= $quote_id ?>">
|
||||
|
||||
<div class="modal-body">
|
||||
|
||||
<?php if ($contact_count == 0) { ?>
|
||||
|
||||
<p class="text-muted mb-0">
|
||||
This client has no contacts with an email address, so there is nobody to send to.
|
||||
Add a contact with an email address, or use Mark Sent to record that the quote
|
||||
went out some other way.
|
||||
</p>
|
||||
|
||||
<?php } else { ?>
|
||||
|
||||
<label class="mb-2">Send to <strong class="text-danger">*</strong></label>
|
||||
|
||||
<div class="list-group mb-3">
|
||||
|
||||
<?php
|
||||
|
||||
while ($row = mysqli_fetch_assoc($sql_contacts)) {
|
||||
$contact_id = intval($row['contact_id']);
|
||||
$contact_name = escapeHtml($row['contact_name']);
|
||||
$contact_email = escapeHtml($row['contact_email']);
|
||||
$contact_title = escapeHtml($row['contact_title']);
|
||||
$contact_primary = intval($row['contact_primary']);
|
||||
$contact_billing = intval($row['contact_billing']);
|
||||
|
||||
// Default selection reproduces the old link: quotes went to
|
||||
// the primary contact only. Billing contacts are listed and
|
||||
// one click away, but stay unchecked - a quote is a sales
|
||||
// conversation, not a bill
|
||||
$contact_checked = ($contact_primary == 1);
|
||||
|
||||
?>
|
||||
|
||||
<label class="list-group-item" for="quoteEmailContact<?= $contact_id ?>">
|
||||
<input type="checkbox" class="form-check-input me-2" name="contacts[]"
|
||||
id="quoteEmailContact<?= $contact_id ?>" value="<?= $contact_id ?>"
|
||||
<?php if ($contact_checked) { echo "checked"; } ?>>
|
||||
<strong><?= $contact_name ?></strong>
|
||||
<?php if ($contact_primary == 1) { ?>
|
||||
<span class="badge text-bg-primary ms-1">Primary</span>
|
||||
<?php } ?>
|
||||
<?php if ($contact_billing == 1) { ?>
|
||||
<span class="badge text-bg-success ms-1">Billing</span>
|
||||
<?php } ?>
|
||||
<?php if (!empty($contact_title)) { ?>
|
||||
<span class="text-muted ms-1"><?= $contact_title ?></span>
|
||||
<?php } ?>
|
||||
<br>
|
||||
<span class="text-muted ms-4"><?= $contact_email ?></span>
|
||||
</label>
|
||||
|
||||
<?php
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
</div>
|
||||
|
||||
<?php if ($quote_status !== 'Draft') { ?>
|
||||
<p class="text-muted mb-0">
|
||||
<i class="fa fa-fw fa-info-circle me-1"></i>This quote is
|
||||
<strong><?= $quote_status ?></strong>, so sending it will not change its status.
|
||||
</p>
|
||||
<?php } ?>
|
||||
|
||||
<?php } ?>
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<?php if ($contact_count > 0) { ?>
|
||||
<button type="submit" name="email_quote" class="btn btn-primary text-bold">
|
||||
<i class="fa fa-fw fa-paper-plane me-2"></i>Send
|
||||
</button>
|
||||
<?php } ?>
|
||||
<button type="button" class="btn btn-light" data-bs-dismiss="modal">
|
||||
<i class="fa fa-fw fa-times me-2"></i>Cancel
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<?php
|
||||
require_once '../../../includes/modal_footer.php';
|
||||
64
agent/modals/quote/quote_mark_sent.php
Normal file
64
agent/modals/quote/quote_mark_sent.php
Normal file
@@ -0,0 +1,64 @@
|
||||
<?php
|
||||
|
||||
require_once '../../../includes/modal_header.php';
|
||||
|
||||
enforceUserPermission('module_sales', 2);
|
||||
|
||||
$quote_id = intval($_GET['quote_id']);
|
||||
|
||||
$sql = mysqli_query($mysqli, "SELECT quote_client_id, quote_number, quote_prefix
|
||||
FROM quotes WHERE quote_id = $quote_id LIMIT 1");
|
||||
$row = mysqli_fetch_assoc($sql);
|
||||
$quote_prefix = escapeHtml($row['quote_prefix']);
|
||||
$quote_number = intval($row['quote_number']);
|
||||
$client_id = intval($row['quote_client_id']);
|
||||
|
||||
enforceClientAccess();
|
||||
|
||||
ob_start();
|
||||
|
||||
?>
|
||||
|
||||
<div class="modal-header bg-dark">
|
||||
<h5 class="modal-title text-white">
|
||||
<i class="fa fa-fw fa-check me-2"></i>Mark Quote <?= "$quote_prefix$quote_number" ?> Sent
|
||||
</h5>
|
||||
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
|
||||
</div>
|
||||
<form action="post.php" method="post" autocomplete="off">
|
||||
<input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
|
||||
<input type="hidden" name="quote_id" value="<?= $quote_id ?>">
|
||||
|
||||
<div class="modal-body">
|
||||
|
||||
<div class="mb-3">
|
||||
<label>How was it sent? <strong class="text-danger">*</strong></label>
|
||||
<div class="input-group">
|
||||
<span class="input-group-text"><i class="fa fa-fw fa-paper-plane"></i></span>
|
||||
<select class="form-select" name="sent_method" required>
|
||||
<?php foreach (getSentMethods() as $sent_method) { ?>
|
||||
<option value="<?= escapeHtml($sent_method) ?>"><?= escapeHtml($sent_method) ?></option>
|
||||
<?php } ?>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label>Note</label>
|
||||
<textarea class="form-control" name="note" rows="3" maxlength="500"
|
||||
placeholder="Optional - tracking number, who it went to, anything worth keeping"></textarea>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="submit" name="mark_quote_sent" class="btn btn-primary text-bold">
|
||||
<i class="fa fa-fw fa-check me-2"></i>Mark Sent
|
||||
</button>
|
||||
<button type="button" class="btn btn-light" data-bs-dismiss="modal">
|
||||
<i class="fa fa-fw fa-times me-2"></i>Cancel
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<?php
|
||||
require_once '../../../includes/modal_footer.php';
|
||||
Reference in New Issue
Block a user